Commit a0162b63 authored by multrus's avatar multrus
Browse files

Merge branch '1429-fixes-to-delivery-scripts' into 'main' 

Resolve "Fixes to delivery scripts"

See merge request !2389
parents 1f0bb580 3dcd9196

scripts/patch_code_headers.sh

+26 −6
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ fi 


#date="Nov 11, 2025"

date=`date "+%b %d, %Y"`

version="IVAS-FL-3.0"

version="IVAS-FL-3.0-RC01"



##########################

#                        #
@@ -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.0-RC01"

fi



#
@@ -157,13 +157,13 @@ c_header_patch=\ 
# Strip everying between beginning and ending of block

#



find $WORKDIR -name "*.[ch]" -not -name "wmc_auto.[ch]" -exec sed -i.bak -e "1,/\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\//d" \{\} \;

sed -i.bak -e "1,/\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\//d" $WORKDIR/readme.txt

#find $WORKDIR -name "*.[ch]" -not -name "wmc_auto.[ch]" -exec sed -i.bak -e "1,/\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\//d" \{\} \;

#sed -i.bak -e "1,/\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\//d" $WORKDIR/readme.txt



# or

#

# find $WORKDIR -name "*.[ch]" -not -name "wmc_auto.[ch]" -exec sed -i.bak -e "/^\/\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*/,/\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\//d" \{\} \;

#

find $WORKDIR -name "*.[ch]" -not -name "wmc_auto.[ch]" -exec sed -i.bak -e "/^\/\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*/,/\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\//d" \{\} \;

sed -i.bak -e "/^\/\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*/,/\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\*\//d" $WORKDIR/readme.txt



# add new header

tmpfile=`mktemp`
@@ -255,6 +255,26 @@ sed -i.bak -e "1 e cat $tmpfile" $WORKDIR/scripts/binauralRenderer_interface/REA 
sed -i.bak -e "1 e cat $tmpfile" $WORKDIR/scripts/td_object_renderer/modeling_tool/README.md

rm -f $tmpfile





# 

# Python files

#



sed -i.bak -e "1,2d" $WORKDIR/scripts/reverb/generate_acoustic_environments_metadata.py

sed -i.bak -e "1,2d" $WORKDIR/scripts/reverb/text_to_binary_payload.py 

sed -i.bak -e '/"""/,/"""/d' $WORKDIR/scripts/reverb/generate_acoustic_environments_metadata.py

sed -i.bak -e '/"""/,/"""/d' $WORKDIR/scripts/reverb/text_to_binary_payload.py 

rm -f $tmpfile

touch $tmpfile

echo "#!/usr/bin/env python3" >> $tmpfile

echo "" >> $tmpfile

echo '"""' >> $tmpfile

echo "$c_header_new" >> $tmpfile

echo '"""' >> $tmpfile

sed -i.bak -e "1 e cat $tmpfile" $WORKDIR/scripts/reverb/generate_acoustic_environments_metadata.py

sed -i.bak -e "1 e cat $tmpfile" $WORKDIR/scripts/reverb/text_to_binary_payload.py 

rm -f $tmpfile



fi



#

scripts/prepare_delivery.sh

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ if [ $BASOP -ne 1 ]; then 
    mkdir $OUTDIR/scripts

    cp -R ${ROOT}/scripts/binauralRenderer_interface $OUTDIR/scripts

    cp -R ${ROOT}/scripts/td_object_renderer $OUTDIR/scripts

    cp -R ${ROOT}/scripts/reverb $OUTDIR/scripts

fi



# readme