Commit 4bd4a381 authored by multrus's avatar multrus
Browse files

add section 'Start DEVELOPMENT switches' to options.h, clean up prepare delivery script

parent 57072643

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ 
/* keep as part of options.h */

#define BASOP_NOGLOB                                    /* Disable global symbols in BASOPs, Overflow/Carry in BASOPs disabled, additional BASOPs in case of Overflow */



/* ################## Start DEVELOPMENT switches ######################### */



/* ################### Start BE switches ################################# */

/* only BE switches wrt selection floating point code */

scripts/prepare_delivery.sh

+2 −54
Original line number Diff line number Diff line
@@ -150,11 +150,6 @@ if [ $STRIP_SPLITREND -ne 0 ]; then 
  # strip macros

  declare -a sr_macros=(

      "SPLIT_REND_WITH_HEAD_ROT"

      "SPLIT_REND_PRED_QUANT_63_PNTS"

      "SPLIT_REND_WITH_HEAD_ROT_PARAMBIN"

      "FIX_658_SPLIT_REND_MASA"

      "FIX_658_SPLIT_REND_MASA"

      "OSBA_SPLIT_RENDERING"

  )



  if coan_exists; then
@@ -200,7 +195,7 @@ tmpfile=`mktemp` 
rm -f $tmpfile

touch $tmpfile



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

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



if coan_exists; then
@@ -210,12 +205,6 @@ if coan_exists; then 


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



  # sanity check, whether any CR_ switches were parsed

  numCRs=`grep -c CR_ $COAN_LIST`

  if [ $numCRs -lt 0 ]; then

    echo "Warning: CR_-switches within DEVELOPMENT section!"

  fi



  # 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]
@@ -340,47 +329,6 @@ else 
fi







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

#                        #

# CR Switches for 1st    #

# delivery               #

#                        #

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



# # rename switches from CR_ to NONBE_

# tmpfile=`mktemp`

# rm -f $tmpfile

# touch $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



# ${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



# 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







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

#                        #

# Patch code             #
@@ -419,7 +367,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 switches/,/End DEVELOPMENT switches/d" $OUTDIR/lib_com/options.h

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



# clean-up *.bak-files

find $OUTDIR -name "*.bak" -exec rm \{\} \;