Commit d6a1229e authored by vaclav's avatar vaclav
Browse files

Merge branch '660-lc3plus-folder' of... 

Merge branch '660-lc3plus-folder' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into 660-lc3plus-folder
parents dc41a4a3 de5c265d

scripts/prepare_delivery.sh

+1 −58
Original line number Diff line number Diff line
@@ -141,56 +141,7 @@ if [ $STRIP_SPLITREND -ne 0 ]; then 


  echo "Stripping Split Rendering"

  

  # remove complete lc3plus folder

  rm -R $OUTDIR/lc3plus

  

  # remove other split rendering files

  declare -a sr_files_rend=(

      "lib_rend/ivas_lcld_decoder.c"

      "lib_rend/ivas_lcld_encoder.c"

      "lib_rend/ivas_MSPred.c"

      "lib_rend/ivas_NoiseGen.c"

      "lib_rend/ivas_PerceptualModel.c"

      "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"

      "lib_rend/ivas_lc3plus_dec.h"

      "lib_rend/ivas_lc3plus_enc.c"

      "lib_rend/ivas_lc3plus_enc.h"

      "lib_rend/ivas_lcld_rom_tables.c"

      "lib_rend/ivas_lcld_rom_tables.h"

      "lib_rend/ivas_splitRend_lcld_dec.c"

      "lib_rend/ivas_splitRend_lcld_enc.c"

      "lib_rend/ivas_splitRendererPLC.c"

      "lib_rend/ivas_splitRendererPost.c"

      "lib_rend/ivas_splitRendererPre.c"

      "lib_rend/ivas_splitRenderer_utils.c"

  )



  for file in ${sr_files_rend[@]}; do

    rm $OUTDIR/$file

    file_windows=${file//\//'\\'}

    sed -i.bak -e "/${file_windows}/d" ${OUTDIR}/Workspace_msvc/lib_rend.vcxproj

  done



  declare -a sr_files_util=(

      "lib_util/split_rend_bfi_file_reader.c"

      "lib_util/split_rend_bfi_file_reader.h"

      "lib_util/split_render_file_read_write.c"

      "lib_util/split_render_file_read_write.h"

  )



  for file in ${sr_files_util[@]}; do

    rm $OUTDIR/$file

    file_windows=${file//\//'\\'}

    sed -i.bak -e "/${file_windows}/d" ${OUTDIR}/Workspace_msvc/lib_util.vcxproj

  done



  ${ROOT}/scripts/strip_split_rendering.sh ${OUTDIR}



  # strip macros

  declare -a sr_macros=(
@@ -220,14 +171,6 @@ if [ $STRIP_SPLITREND -ne 0 ]; then 
  # patch Makefile

  patch ${OUTDIR}/Makefile < ${ROOT}/scripts/makefile_noSR.patch



  # delete project file

  rm ${OUTDIR}/Workspace_msvc/lib_LC3plus.vcxproj 



  # patch project/solution files

  sed -i.bak "/lib_LC3plus.vcxproj/,+1d" ${OUTDIR}/Workspace_msvc/Workspace_msvc.sln

  find ${OUTDIR}/Workspace_msvc -name "*.vcxproj" -exec sed -i.bak -e "s/..\\lib_lc3plus\;//g" \{\} \;

  sed -i.bak "/lib_LC3plus.vcxproj/,+3d" ${OUTDIR}/Workspace_msvc/lib_rend.vcxproj # patch dependency



  # delete readme_split_rendering

  rm ${OUTDIR}/readme_split_rendering.txt

scripts/strip_split_rendering.sh

+10 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ OUTDIR=$1 




# remove complete lc3plus folder

rm -R $OUTDIR/lc3plus

rm -R $OUTDIR/lib_lc3plus



# remove other split rendering files

declare -a sr_files_rend=(
@@ -82,3 +82,11 @@ for file in ${sr_files_util[@]}; do 
    file_windows=${file//\//'\\'}

    sed -i.bak -e "/${file_windows}/d" ${OUTDIR}/Workspace_msvc/lib_util.vcxproj

done



# delete project file

rm ${OUTDIR}/Workspace_msvc/lib_lc3plus.vcxproj



# patch project/solution files

sed -i.bak "/lib_lc3plus.vcxproj/,+1d" ${OUTDIR}/Workspace_msvc/Workspace_msvc.sln

find ${OUTDIR}/Workspace_msvc -name "*.vcxproj" -exec sed -i.bak -e "s/..\\lib_lc3plus\;//g" \{\} \;

sed -i.bak "/lib_lc3plus.vcxproj/,+3d" ${OUTDIR}/Workspace_msvc/lib_rend.vcxproj # patch dependency
 
 No newline at end of file