diff options
| author | Sebastián Barschkis <sebbas@sebbas.org> | 2020-07-17 16:58:13 +0300 |
|---|---|---|
| committer | Sebastián Barschkis <sebbas@sebbas.org> | 2020-07-17 16:58:13 +0300 |
| commit | 0cdc75ccd28c607677c302014cd40df542d85d35 (patch) | |
| tree | 3417016bb60d5a326c8eca4de14141c7b62bfd89 /extern/mantaflow/UPDATE.sh | |
| parent | e3f8768d8a60b750d98bf976b6c1489d606b7891 (diff) | |
Fluid: Cleanup build system for extern mantaflow
No longer including unused dependencies. Should numpy IO be needed at some point, the Manta source update script can be configured so that the required dependencies are included again.
Diffstat (limited to 'extern/mantaflow/UPDATE.sh')
| -rw-r--r-- | extern/mantaflow/UPDATE.sh | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/extern/mantaflow/UPDATE.sh b/extern/mantaflow/UPDATE.sh index 3feb1ba9226..62395fde7cd 100644 --- a/extern/mantaflow/UPDATE.sh +++ b/extern/mantaflow/UPDATE.sh @@ -13,6 +13,9 @@ BLENDER_INSTALLATION=/Users/sebbas/Developer/Blender/fluid-mantaflow # Try to check out Mantaflow repository before building? CLEAN_REPOSITORY=0 +# Skip copying dependency files? +WITH_DEPENDENCIES=0 + # Choose which multithreading platform to use for Mantaflow preprocessing USE_OMP=0 USE_TBB=1 @@ -50,17 +53,21 @@ fi MANTA_BUILD_PATH=$MANTA_INSTALLATION/build_blender/ mkdir -p $MANTA_BUILD_PATH cd $MANTA_BUILD_PATH -cmake ../mantaflowgit -DGUI=OFF -DOPENMP=$USE_OMP -DTBB=$USE_TBB -DBLENDER=ON -DPREPDEBUG=ON && make -j8 +cmake ../mantaflowgit -DGUI=0 -DOPENMP=$USE_OMP -DTBB=$USE_TBB -DBLENDER=1 -DPREPDEBUG=1 && make -j8 # ==================== 3) COPY MANTAFLOW FILES TO BLENDER ROOT =========================== -mkdir -p $BLENDER_INSTALLATION/blender/tmp/dependencies/ && cp -Rf $MANTA_INSTALLATION/mantaflowgit/dependencies/cnpy "$_" +if [[ "$WITH_DEPENDENCIES" -eq "1" ]]; then + mkdir -p $BLENDER_INSTALLATION/blender/tmp/dependencies/ && cp -Rf $MANTA_INSTALLATION/mantaflowgit/dependencies/cnpy "$_" +fi mkdir -p $BLENDER_INSTALLATION/blender/tmp/helper/ && cp -Rf $MANTA_INSTALLATION/mantaflowgit/source/util "$_" mkdir -p $BLENDER_INSTALLATION/blender/tmp/helper/ && cp -Rf $MANTA_INSTALLATION/mantaflowgit/source/pwrapper "$_" mkdir -p $BLENDER_INSTALLATION/blender/tmp/preprocessed/ && cp -Rf $MANTA_INSTALLATION/build_blender/pp/source/. "$_" # Remove some files that are not need in Blender -rm $BLENDER_INSTALLATION/blender/tmp/dependencies/cnpy/example1.cpp +if [[ "$WITH_DEPENDENCIES" -eq "1" ]]; then + rm $BLENDER_INSTALLATION/blender/tmp/dependencies/cnpy/example1.cpp +fi rm $BLENDER_INSTALLATION/blender/tmp/helper/pwrapper/pymain.cpp rm $BLENDER_INSTALLATION/blender/tmp/preprocessed/*.reg rm $BLENDER_INSTALLATION/blender/tmp/preprocessed/python/*.reg @@ -82,8 +89,13 @@ BLENDER_TMP_DEP=$BLENDER_TMP/dependencies BLENDER_TMP_HLP=$BLENDER_TMP/helper BLENDER_TMP_PP=$BLENDER_TMP/preprocessed +# Before moving new files, delete all existing file in the Blender repository +rm -Rf $BLENDER_MANTA_EXTERN/dependencies $BLENDER_MANTA_EXTERN/helper $BLENDER_MANTA_EXTERN/preprocessed + # Move files from tmp dir to extern/ -cp -Rf $BLENDER_TMP_DEP $BLENDER_MANTA_EXTERN +if [[ "$WITH_DEPENDENCIES" -eq "1" ]]; then + cp -Rf $BLENDER_TMP_DEP $BLENDER_MANTA_EXTERN +fi cp -Rf $BLENDER_TMP_HLP $BLENDER_MANTA_EXTERN cp -Rf $BLENDER_TMP_PP $BLENDER_MANTA_EXTERN |