Commit: 67b1979c91d8608f078efc138c96afd0f6014579 Author: Bastien Montagne Date: Tue Nov 22 16:04:43 2016 +0100 Branches: master https://developer.blender.org/rB67b1979c91d8608f078efc138c96afd0f6014579
Install_deps: fix warning message not showing up in case build fails. Kinda stupid, but big nice warning about need to try clean build if something fails was only showing in case install_deps completed successfully... :P =================================================================== M build_files/build_environment/install_deps.sh =================================================================== diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 5a02a96..573ea45 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -713,6 +713,21 @@ if [ "$WITH_ALL" = true -a "$OPENCOLLADA_SKIP" = false ]; then fi +WARNING "****WARNING****" +PRINT "If you are experiencing issues building Blender, _*TRY A FRESH, CLEAN BUILD FIRST*_!" +PRINT "The same goes for install_deps itself, if you encounter issues, please first erase everything in $SRC and $INST" +PRINT "(provided obviously you did not add anything yourself in those dirs!), and run install_deps.sh again!" +PRINT "Often, changes in the libs built by this script, or in your distro package, cannot be handled simply, so..." +PRINT "" +PRINT "You may also try to use the '--build-foo' options to bypass your distribution's packages" +PRINT "for some troublesome/buggy libraries..." +PRINT "" +PRINT "" +PRINT "Ran with:" +PRINT " install_deps.sh $COMMANDLINE" +PRINT "" +PRINT "" + # This has to be done here, because user might force some versions... PYTHON_SOURCE=( "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tgz"; ) @@ -785,6 +800,8 @@ However, if you are experiencing linking errors (also when building Blender itse Please note that until the transition to C++11-built libraries if completed in your distribution, situation will remain fuzzy and incompatibilities may happen..." + PRINT "" + PRINT "" CXXFLAGS="$CXXFLAGS -std=c++11" export CXXFLAGS fi @@ -4164,16 +4181,6 @@ print_info_ffmpeglink() { print_info() { PRINT "" PRINT "" - WARNING "****WARNING****" - PRINT "If you are experiencing issues building Blender, _*TRY A FRESH, CLEAN BUILD FIRST*_!" - PRINT "The same goes for install_deps itself, if you encounter issues, please first erase everything in $SRC and $INST" - PRINT "(provided obviously you did not add anything yourself in those dirs!), and run install_deps.sh again!" - PRINT "Often, changes in the libs built by this script, or in your distro package, cannot be handled simply, so..." - PRINT "" - PRINT "You may also try to use the '--build-foo' options to bypass your distribution's packages" - PRINT "for some troublesome/buggy libraries..." - PRINT "" - PRINT "" PRINT "Ran with:" PRINT " install_deps.sh $COMMANDLINE" PRINT "" _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
