From 5d9252fa44b813934507fd5a3d8af0ef93821e88 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Fri, 1 May 2026 20:06:12 +0200 Subject: [PATCH] various fixes to release scripts, pump version number --- lib_com/disclaimer.c | 2 +- scripts/patch_code_headers.sh | 4 ++-- scripts/prepare_delivery.sh | 29 ++++++++--------------------- 3 files changed, 11 insertions(+), 24 deletions(-) diff --git a/lib_com/disclaimer.c b/lib_com/disclaimer.c index aeca085e8..533f98831 100644 --- a/lib_com/disclaimer.c +++ b/lib_com/disclaimer.c @@ -48,7 +48,7 @@ int16_t print_disclaimer( FILE *fPtr ) fprintf( fPtr, "\n==================================================================================================\n" ); fprintf( fPtr, "\n" ); - fprintf( fPtr, " 3GPP TS26.258 IVAS Codec Version IVAS-FL-3.0 (floating-point C-Code)\n" ); + fprintf( fPtr, " 3GPP TS26.258 IVAS Codec Version IVAS-FL-3.1 (floating-point C-Code)\n" ); fprintf( fPtr, "\n" ); fprintf( fPtr, " Based on EVS Codec (Floating Point) 3GPP TS26.443 Nov 04, 2021,\n" ); fprintf( fPtr, " Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0\n" ); diff --git a/scripts/patch_code_headers.sh b/scripts/patch_code_headers.sh index 6185fa541..055c02e71 100755 --- a/scripts/patch_code_headers.sh +++ b/scripts/patch_code_headers.sh @@ -58,7 +58,7 @@ fi #date="Nov 11, 2025" date=`date "+%b %d, %Y"` -version="IVAS-FL-3.0" +version="IVAS-FL-3.1RC01" ########################## # # @@ -72,7 +72,7 @@ if [ -d ${WORKDIR}/lib_basop ]; then fi if [ $BASOP -eq 1 ]; then - version="IVAS-FX-3.0" + version="IVAS-FX-3.1RC01" fi # diff --git a/scripts/prepare_delivery.sh b/scripts/prepare_delivery.sh index ef684ee2d..64de31b12 100755 --- a/scripts/prepare_delivery.sh +++ b/scripts/prepare_delivery.sh @@ -139,11 +139,13 @@ fi # readme cp ${ROOT}/readme.txt ${OUTDIR} -recode lat1..ibmpc ${OUTDIR}/readme.txt # unix2dos ... +#recode lat1..ibmpc ${OUTDIR}/readme.txt # unix2dos ... +flip -mb ${OUTDIR}/readme.txt # license cp ${ROOT}/LICENSE.md ${OUTDIR} -recode lat1..ibmpc ${OUTDIR}/readme.txt # unix2dos ... +#recode lat1..ibmpc ${OUTDIR}/LICENSE.md # unix2dos ... +flip -mb ${OUTDIR}/LICENSE.md ########################## # # @@ -156,9 +158,7 @@ tmpfile=`mktemp` rm -f $tmpfile touch $tmpfile -cat $OUTDIR/lib_com/options.h | sed -n '/Start DEVELOPMENT switches/,/End DEVELOPMENT switches/p' >> $tmpfile -cat $OUTDIR/lib_com/options.h | sed -n '/Start FIXES switches/,/End FIXES switches/p' >> $tmpfile -cat $OUTDIR/lib_com/options.h | sed -n '/Start BASOP porting switches/,/End BASOP porting switches/p' >> $tmpfile +cat $OUTDIR/lib_com/options.h | sed -n '/Start MAINTENANCE switches/,/End MAINTENANCE switches/p' >> $tmpfile if coan_exists; then @@ -271,17 +271,6 @@ if coan_exists; then echo "-USUPPORT_FORCE_TCX10_TCX20" >> $COAN_LIST echo "-UBITSTERAM_ANALYSIS" >> $COAN_LIST - - # Remove current development switches from the code by parsing options.h - tmpfile=`mktemp` - rm -f $tmpfile - touch $tmpfile - cat $OUTDIR/lib_com/options.h | sed -n '/Start BE switches/,/End DEVELOPMENT switches/p' >> $tmpfile - cat $OUTDIR/lib_com/options.h | sed -n '/Start FIXES switches/,/End FIXES switches/p' >> $tmpfile - cat $OUTDIR/lib_com/options.h | sed -n '/Start BASOP porting switches/,/End BASOP porting switches/p' >> $tmpfile - ${ROOT}/scripts/parse_options_h.sh -c $tmpfile >> $COAN_LIST - rm -f $tmpfile - # apply coan coan source --replace --no-transients -K --file $COAN_LIST $OUTDIR/lib_{com,dec,enc,util,rend,isar}/*.[hc] coan source --replace --no-transients -K --file $COAN_LIST $OUTDIR/apps/*.[hc] @@ -345,11 +334,9 @@ fi # END skip block # remove comments after switches sed -i.bak "/keep as part of options.h/d" $OUTDIR/lib_com/options.h -sed -i.bak "s/\(\/\*\ #define\ *\CR[a-zA-Z0-9_]*\ *\*\/\)\(.*\)/\1/g" $OUTDIR/lib_com/options.h -sed -i.bak "s/\(\#define\ *\CR[a-zA-Z0-9_]*\ *\)\(\/\*.*\)/\1/g" $OUTDIR/lib_com/options.h -sed -i.bak "/Start DEVELOPMENT switches/,/End DEVELOPMENT switches/d" $OUTDIR/lib_com/options.h -sed -i.bak "/Start FIXES switches/,/End FIXES switches/d" $OUTDIR/lib_com/options.h -sed -i.bak "/Start BASOP porting switches/,/End BASOP porting switches/d" $OUTDIR/lib_com/options.h +#sed -i.bak "s/\(\/\*\ #define\ *\CR[a-zA-Z0-9_]*\ *\*\/\)\(.*\)/\1/g" $OUTDIR/lib_com/options.h +#sed -i.bak "s/\(\#define\ *\CR[a-zA-Z0-9_]*\ *\)\(\/\*.*\)/\1/g" $OUTDIR/lib_com/options.h +sed -i.bak "/Start MAINTENANCE switches/,/End MAINTENANCE switches/d" $OUTDIR/lib_com/options.h # clean-up *.bak-files find $OUTDIR -name "*.bak" -exec rm \{\} \; -- GitLab