[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52290] trunk/blender: quiet scons deprecation warnings and correct --with_filesystem --> --with-filesystem in install_deps.sh

Campbell Barton ideasman42 at gmail.com
Sat Nov 17 06:17:03 CET 2012


Revision: 52290
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52290
Author:   campbellbarton
Date:     2012-11-17 05:16:54 +0000 (Sat, 17 Nov 2012)
Log Message:
-----------
quiet scons deprecation warnings and correct --with_filesystem --> --with-filesystem in install_deps.sh

Modified Paths:
--------------
    trunk/blender/SConstruct
    trunk/blender/build_files/build_environment/install_deps.sh

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2012-11-17 04:47:33 UTC (rev 52289)
+++ trunk/blender/SConstruct	2012-11-17 05:16:54 UTC (rev 52290)
@@ -582,11 +582,11 @@
 
 Export('env')
 
-BuildDir(B.root_build_dir+'/source', 'source', duplicate=0)
+VariantDir(B.root_build_dir+'/source', 'source', duplicate=0)
 SConscript(B.root_build_dir+'/source/SConscript')
-BuildDir(B.root_build_dir+'/intern', 'intern', duplicate=0)
+VariantDir(B.root_build_dir+'/intern', 'intern', duplicate=0)
 SConscript(B.root_build_dir+'/intern/SConscript')
-BuildDir(B.root_build_dir+'/extern', 'extern', duplicate=0)
+VariantDir(B.root_build_dir+'/extern', 'extern', duplicate=0)
 SConscript(B.root_build_dir+'/extern/SConscript')
 
 # now that we have read all SConscripts, we know what

Modified: trunk/blender/build_files/build_environment/install_deps.sh
===================================================================
--- trunk/blender/build_files/build_environment/install_deps.sh	2012-11-17 04:47:33 UTC (rev 52289)
+++ trunk/blender/build_files/build_environment/install_deps.sh	2012-11-17 05:16:54 UTC (rev 52290)
@@ -216,7 +216,7 @@
     if [ ! -f $_src/b2 ]; then
       ./bootstrap.sh
     fi
-    ./b2 -j$THREADS -a --with-system --with_filesystem --with-thread --with-regex --with-locale --with-date_time \
+    ./b2 -j$THREADS -a --with-system --with-filesystem --with-thread --with-regex --with-locale --with-date_time \
          --prefix=$_inst --disable-icu boost.locale.icu=off install
     ./b2 --clean
 




More information about the Bf-blender-cvs mailing list