Commit a7fb48e7 authored by norvell's avatar norvell
Browse files

Fix i prepare_delivery.sh to clean out all development switches

parent cdc3b6b9

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ VPATH = $(SRC_DIRS) 
# Split rendering files

SRCS_SPLIT_REND = ivas_CQMFDecoder.c ivas_CQMFEncoder.c ivas_PerceptualModel.c ivas_PredDecoder.c \

                  ivas_PredEncoder.c ivas_RMSEnvGrouping.c ivas_MSPred.c ivas_NoiseGen.c \

                  ivas_cldfb_codec_bitstream.c ivas_splitRend_lcld_dec.c ivas_splitRend_lcld_enc.c \

                  ivas_splitRend_lcld_dec.c ivas_splitRend_lcld_enc.c \

                  ivas_splitRendererPLC.c ivas_splitRendererPost.c ivas_splitRendererPre.c \

                  ivas_splitRenderer_utils.c split_rend_bfi_file_reader.c split_render_file_read_write.c \

                  ivas_lcld_tables.c

scripts/makefile_noSR.patch

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
-# Split rendering files

-SRCS_SPLIT_REND = ivas_CQMFDecoder.c ivas_CQMFEncoder.c ivas_PerceptualModel.c ivas_PredDecoder.c \

-                  ivas_PredEncoder.c ivas_RMSEnvGrouping.c ivas_MSPred.c ivas_NoiseGen.c \

-                  ivas_cldfb_codec_bitstream.c ivas_splitRend_lcld_dec.c ivas_splitRend_lcld_enc.c \

-                  ivas_splitRend_lcld_dec.c ivas_splitRend_lcld_enc.c \

-                  ivas_splitRendererPLC.c ivas_splitRendererPost.c ivas_splitRendererPre.c \

-                  ivas_splitRenderer_utils.c split_rend_bfi_file_reader.c split_render_file_read_write.c \

-                  ivas_lcld_tables.c

scripts/prepare_delivery.sh

+46 −32
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ OUTDIR=c-code 
TMPCLEANDIR=clean-c-code

ROOT=$(dirname $0)/..

STRIP_SPLITREND=0

PREPARE_ZIP=1



# check, whether coan exists

coan_exists () {
@@ -58,6 +59,9 @@ while getopts "$ALL_OPTS" OPTION; do 
                strip_sr)

                    STRIP_SPLITREND=1

                    ;;

                no_zip)

                    PREPARE_ZIP=0

                    ;;

               *)

                    if [ "$OPTERR" = 1 ] && [ "${ALL_OPTS:0:1}" != ":" ]; then

                        echo "Unknown option --${OPTARG}" >&2
@@ -65,7 +69,7 @@ while getopts "$ALL_OPTS" OPTION; do 
                    ;;

            esac;;

        h)

            echo "usage: $0 [--strip_sr]" >&2

            echo "usage: $0 [--strip_sr] [--no_zip]" >&2

            exit -1

            ;;

        *)
@@ -304,6 +308,14 @@ if coan_exists; then 
  echo "-USPLIT_POSE_CORRECTION_DEBUG"         >> $COAN_LIST

  echo "-USPLIT_MD_CODING_DEBUG"               >> $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

  ${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}/*.[hc]

  coan source --replace --no-transients -K --file $COAN_LIST $OUTDIR/apps/*.[hc]
@@ -336,36 +348,36 @@ fi 
#                        #

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



# rename switches from CR_ to NONBE_

tmpfile=`mktemp`

rm -f $tmpfile

touch $tmpfile

# # rename switches from CR_ to NONBE_

# tmpfile=`mktemp`

# rm -f $tmpfile

# touch $tmpfile



cat $OUTDIR/lib_com/options.h  | sed -n '/Start NON-BE CR switches/,/End NON-BE CR switches/p' >> $tmpfile

sed -i.bak "s/^-D//g" $tmpfile

# cat $OUTDIR/lib_com/options.h  | sed -n '/Start BE switches/,/End DEVELOPMENT switches/p' >> $tmpfile

# sed -i.bak "s/^-D//g" $tmpfile



nonbe_list=nonbe_list_delivery.txt

rm -f $nonbe_list

touch $nonbe_list

# nonbe_list=nonbe_list_delivery.txt

# rm -f $nonbe_list

# touch $nonbe_list



${ROOT}/scripts/parse_options_h.sh -c $tmpfile >> $nonbe_list

# ${ROOT}/scripts/parse_options_h.sh -c $tmpfile >> $nonbe_list



# rename switches

while read line

do

  macro=`echo $line | grep '\-D' | sed -e "s/\-D//g"`

  if [[ ! $macro =~ [^[:space:]] ]] ; then

    continue

  fi

  macro_new=${macro/CR_/NONBE_}

  find $OUTDIR -name "*.[ch]" -exec sed -i.bak -e "s/${macro}/${macro_new}/g" \{\} \;

done < $nonbe_list

# # rename switches

# while read line

# do

  # macro=`echo $line | grep '\-D' | sed -e "s/\-D//g"`

  # if [[ ! $macro =~ [^[:space:]] ]] ; then

    # continue

  # fi

  # macro_new=${macro/CR_/NONBE_}

  # find $OUTDIR -name "*.[ch]" -exec sed -i.bak -e "s/${macro}/${macro_new}/g" \{\} \;

# done < $nonbe_list



rm -f $nonbe_list

rm -f $tmpfile

# rm -f $nonbe_list

# rm -f $tmpfile



sed -i.bak -e "s/NON-BE CR switches/NON-BE switches/g" $OUTDIR/lib_com/options.h

sed -i.bak -e "/all switches in this category should start with \"CR_\"/d" $OUTDIR/lib_com/options.h

# sed -i.bak -e "s/NON-BE CR switches/NON-BE switches/g" $OUTDIR/lib_com/options.h

# sed -i.bak -e "/all switches in this category should start with \"CR_\"/d" $OUTDIR/lib_com/options.h
@@ -407,7 +419,7 @@ fi # END skip block 
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 BE DEVELOPMENT switches/,/End BE DEVELOPMENT switches/d" $OUTDIR/lib_com/options.h

sed -i.bak "/Start BE switches/,/End DEVELOPMENT switches/d" $OUTDIR/lib_com/options.h



# clean-up *.bak-files

find $OUTDIR -name "*.bak" -exec rm \{\} \;
@@ -420,12 +432,14 @@ find $OUTDIR -name "coan_*" -exec rm \{\} \; 
#                        #

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



zip -r9 IVAS_Float_C__rev${REV}_${DATE}.zip $OUTDIR 

if [ $PREPARE_ZIP -eq 1 ]; then



    zip -r9 IVAS_Float_C__rev${REV}_${DATE}.zip $OUTDIR 



    echo done



    echo now build the Windows executable manually and insert it to the zip with the following commands:

    echo zip -r9 IVAS_Float_C__rev${REV}_${DATE}.zip $OUTDIR c-code/IVAS_cod.exe c-code/IVAS_dec.exe c-code/IVAS_rend.exe



else

    echo done

fi

scripts/strip_split_rendering.py

+0 −2
Original line number Diff line number Diff line
@@ -43,8 +43,6 @@ sr_files_rend=[ 
  "lib_rend\\ivas_PredDecoder.c",

  "lib_rend\\ivas_PredEncoder.c",

  "lib_rend\\ivas_RMSEnvGrouping.c",

  "lib_rend\\ivas_cldfb_codec_bitstream.c",

  "lib_rend\\ivas_cldfb_codec_bitstream.h",

  "lib_rend\\ivas_lc3plus_common.c",

  "lib_rend\\ivas_lc3plus_common.h",

  "lib_rend\\ivas_lc3plus_dec.c",

scripts/strip_split_rendering.sh

+0 −2
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ declare -a sr_files_rend=( 
  "lib_rend/ivas_PredDecoder.c"

  "lib_rend/ivas_PredEncoder.c"

  "lib_rend/ivas_RMSEnvGrouping.c"

  "lib_rend/ivas_cldfb_codec_bitstream.c"

  "lib_rend/ivas_cldfb_codec_bitstream.h"

  "lib_rend/ivas_lc3plus_common.c"

  "lib_rend/ivas_lc3plus_common.h"

  "lib_rend/ivas_lc3plus_dec.c"