diff options
Diffstat (limited to 'build_files')
8 files changed, 30 insertions, 15 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index c1b2fd96c97..a5acbe9b612 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -25,10 +25,12 @@ ARGS=$( \ getopt \ -o s:i:t:h \ ---long source:,install:,tmp:,threads:,help,no-sudo,with-all,with-opencollada,ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,\ +--long source:,install:,tmp:,info:,threads:,help,no-sudo,with-all,with-opencollada,\ +ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,\ force-all,force-python,force-numpy,force-boost,force-ocio,force-oiio,force-llvm,force-osl,force-opencollada,\ -force-ffmpeg,skip-python,skip-numpy,skip-boost,skip-ocio,skip-oiio,skip-llvm,skip-osl,skip-ffmpeg,\ -skip-opencollada,required-numpy: \ +force-ffmpeg,\ +skip-python,skip-numpy,skip-boost,skip-ocio,skip-openexr,skip-oiio,skip-llvm,skip-osl,skip-ffmpeg,skip-opencollada,\ +required-numpy: \ -- "$@" \ ) @@ -38,6 +40,7 @@ SRC="$HOME/src/blender-deps" INST="/opt/lib" TMP="/tmp" CWD=$PWD +INFO_PATH=$CWD # Do not install some optional, potentially conflicting libs by default... WITH_ALL=false @@ -74,6 +77,9 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS: --tmp=<path> Use a specific temp path (defaults to '\$TMP'). + --info=<path> + Use a specific info path (to store BUILD_NOTES.txt, defaults to '\$INFO_PATH'). + -t n, --threads=n Use a specific number of threads when building the libraries (auto-detected as '\$THREADS'). @@ -320,6 +326,9 @@ while true; do --tmp) TMP="$2"; shift; shift; continue ;; + --info) + INFO_PATH="$2"; shift; shift; continue + ;; -t|--threads) THREADS="$2"; shift; shift; continue ;; @@ -3098,9 +3107,9 @@ else exit 1 fi -print_info | tee BUILD_NOTES.txt +print_info | tee $INFO_PATH/BUILD_NOTES.txt PRINT "" -PRINT "This information has been written to BUILD_NOTES.txt" +PRINT "This information has been written to $INFO_PATH/BUILD_NOTES.txt" PRINT "" # Switch back to user language. diff --git a/build_files/buildbot/config/user-config-glibc211-i686.py b/build_files/buildbot/config/user-config-glibc211-i686.py index d7a1439e003..0971735f641 100644 --- a/build_files/buildbot/config/user-config-glibc211-i686.py +++ b/build_files/buildbot/config/user-config-glibc211-i686.py @@ -49,7 +49,7 @@ BF_CXX_LIB_STATIC = '/usr/lib/gcc/i486-linux-gnu/4.7.1/libstdc++.a' WITH_BF_OPENAL = True WITH_BF_STATICOPENAL = True BF_OPENAL = '/opt/lib/openal' -BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a' +BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a /opt/lib/openal/lib/libcommon.a' WITH_BF_GETTEXT_STATIC = True diff --git a/build_files/buildbot/config/user-config-glibc211-x86_64.py b/build_files/buildbot/config/user-config-glibc211-x86_64.py index f07c447bf29..748d1004850 100644 --- a/build_files/buildbot/config/user-config-glibc211-x86_64.py +++ b/build_files/buildbot/config/user-config-glibc211-x86_64.py @@ -49,7 +49,7 @@ BF_CXX_LIB_STATIC = '/usr/lib/gcc/x86_64-linux-gnu/4.7.1/libstdc++.a' WITH_BF_OPENAL = True WITH_BF_STATICOPENAL = True BF_OPENAL = '/opt/lib/openal' -BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a' +BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a /opt/lib/openal/lib/libcommon.a' WITH_BF_GETTEXT_STATIC = True diff --git a/build_files/buildbot/config/user-config-player-glibc211-i686.py b/build_files/buildbot/config/user-config-player-glibc211-i686.py index 641dbe082ad..384da4070eb 100644 --- a/build_files/buildbot/config/user-config-player-glibc211-i686.py +++ b/build_files/buildbot/config/user-config-player-glibc211-i686.py @@ -34,7 +34,7 @@ BF_CXX_LIB_STATIC = '/usr/lib/gcc/i486-linux-gnu/4.7.1/libstdc++.a' WITH_BF_OPENAL = True WITH_BF_STATICOPENAL = True BF_OPENAL = '/opt/lib/openal' -BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a' +BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a /opt/lib/openal/lib/libcommon.a' WITH_BF_GETTEXT_STATIC = True diff --git a/build_files/buildbot/config/user-config-player-glibc211-x86_64.py b/build_files/buildbot/config/user-config-player-glibc211-x86_64.py index 80503268b44..5176d59d5a0 100644 --- a/build_files/buildbot/config/user-config-player-glibc211-x86_64.py +++ b/build_files/buildbot/config/user-config-player-glibc211-x86_64.py @@ -34,7 +34,7 @@ BF_CXX_LIB_STATIC = '/usr/lib/gcc/x86_64-linux-gnu/4.7.1/libstdc++.a' WITH_BF_OPENAL = True WITH_BF_STATICOPENAL = True BF_OPENAL = '/opt/lib/openal' -BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a' +BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a /opt/lib/openal/lib/libcommon.a' WITH_BF_GETTEXT_STATIC = True diff --git a/build_files/cmake/cmake_consistency_check.py b/build_files/cmake/cmake_consistency_check.py index c2044fcc21d..2e0eeb1e067 100755 --- a/build_files/cmake/cmake_consistency_check.py +++ b/build_files/cmake/cmake_consistency_check.py @@ -174,7 +174,7 @@ def cmake_get_src(f): elif is_c(new_file): sources_c.append(new_file) global_refs.setdefault(new_file, []).append((f, i)) - elif l in ("PARENT_SCOPE", ): + elif l in {"PARENT_SCOPE", }: # cmake var, ignore pass elif new_file.endswith(".list"): diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index b7bd27dea03..12cbbb1618a 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -178,7 +178,7 @@ def validate_arguments(args, bc): 'WITH_BF_OIIO', 'WITH_BF_STATICOIIO', 'BF_OIIO', 'BF_OIIO_INC', 'BF_OIIO_LIB', 'BF_OIIO_LIB_STATIC', 'BF_OIIO_LIBPATH', 'WITH_BF_OCIO', 'WITH_BF_STATICOCIO', 'BF_OCIO', 'BF_OCIO_INC', 'BF_OCIO_LIB', 'BF_OCIO_LIB_STATIC', 'BF_OCIO_LIBPATH', 'WITH_BF_BOOST', 'WITH_BF_STATICBOOST', 'BF_BOOST', 'BF_BOOST_INC', 'BF_BOOST_LIB', 'BF_BOOST_LIB_INTERNATIONAL', 'BF_BOOST_LIB_STATIC', 'BF_BOOST_LIBPATH', - 'WITH_BF_LIBMV', + 'WITH_BF_LIBMV', 'WITH_BF_LIBMV_SCHUR_SPECIALIZATIONS', 'WITH_BF_CYCLES_OSL', 'WITH_BF_STATICOSL', 'BF_OSL', 'BF_OSL_INC', 'BF_OSL_LIB', 'BF_OSL_LIBPATH', 'BF_OSL_LIB_STATIC', 'BF_OSL_COMPILER', 'WITH_BF_LLVM', 'WITH_BF_STATICLLVM', 'BF_LLVM', 'BF_LLVM_LIB', 'BF_LLVM_LIBPATH', 'BF_LLVM_LIB_STATIC', 'BF_PROGRAM_LINKFLAGS' ] @@ -195,7 +195,8 @@ def validate_arguments(args, bc): 'BF_DEBUG_CFLAGS', 'BF_DEBUG_CCFLAGS', 'BF_DEBUG_CXXFLAGS', 'C_WARN', 'CC_WARN', 'CXX_WARN', 'LLIBS', 'PLATFORM_LINKFLAGS', 'MACOSX_ARCHITECTURE', 'MACOSX_SDK', 'XCODE_CUR_VER', 'C_COMPILER_ID', - 'BF_CYCLES_CUDA_BINARIES_ARCH', 'BF_PROGRAM_LINKFLAGS', 'MACOSX_DEPLOYMENT_TARGET' + 'BF_CYCLES_CUDA_BINARIES_ARCH', 'BF_PROGRAM_LINKFLAGS', 'MACOSX_DEPLOYMENT_TARGET', + 'WITH_BF_CYCLES_DEBUG' ] @@ -571,6 +572,7 @@ def read_opts(env, cfg, args): (BoolVariable('WITH_BF_LZMA', 'Enable best LZMA pointcache compression', True)), (BoolVariable('WITH_BF_LIBMV', 'Enable libmv structure from motion library', True)), + (BoolVariable('WITH_BF_LIBMV_SCHUR_SPECIALIZATIONS', 'Enable fixed-size schur specializations', True)), (BoolVariable('WITH_BF_COMPOSITOR', 'Enable the tile based nodal compositor', True)), ) # end of opts.AddOptions() @@ -600,6 +602,7 @@ def read_opts(env, cfg, args): ('BF_CYCLES_CUDA_NVCC', 'CUDA nvcc compiler path', ''), ('BF_CYCLES_CUDA_ENV', 'preset environement nvcc will execute in', ''), ('BF_CYCLES_CUDA_BINARIES_ARCH', 'CUDA architectures to compile binaries for', []), + (BoolVariable('WITH_BF_CYCLES_DEBUG', 'Build Cycles engine with extra debugging capabilities', False)), (BoolVariable('WITH_BF_OIIO', 'Build with OpenImageIO', False)), (BoolVariable('WITH_BF_STATICOIIO', 'Statically link to OpenImageIO', False)), diff --git a/build_files/utils/build_tgz.sh b/build_files/utils/build_tgz.sh index b0ff8ea2aa8..409c738e9f8 100755 --- a/build_files/utils/build_tgz.sh +++ b/build_files/utils/build_tgz.sh @@ -22,15 +22,18 @@ TARBALL="blender-$VERSION.tar.gz" cd "$blender_srcdir" +# not so nice, but works +FILTER_FILES_PY="import os, sys; [print(l[:-1]) for l in sys.stdin.readlines() if os.path.isfile(l[:-1])]" + # Build master list echo -n "Building manifest of files: \"$BASE_DIR/$MANIFEST\" ..." -git ls-files > $BASE_DIR/$MANIFEST +git ls-files | python3 -c "$FILTER_FILES_PY" > $BASE_DIR/$MANIFEST # Enumerate submodules -for lcv in $(git submodule | cut -f2 -d" "); do +for lcv in $(git submodule | awk '{print $2}'); do cd "$BASE_DIR" cd "$blender_srcdir/$lcv" - git ls-files | awk '$0="'"$lcv"/'"$0' >> $BASE_DIR/$MANIFEST + git ls-files | python3 -c "$FILTER_FILES_PY" | awk '$0="'"$lcv"/'"$0' >> $BASE_DIR/$MANIFEST cd "$BASE_DIR" done echo "OK" |