[Bf-blender-cvs] [b201d36] soc-2013-paint: Further tweaks to SCons's auto tests

Sergey Sharybin noreply at git.blender.org
Sat Jul 12 12:44:37 CEST 2014


Commit: b201d36307dfcef0e594e4c509c73a32f39a00e7
Author: Sergey Sharybin
Date:   Thu Jul 10 03:53:37 2014 +0600
https://developer.blender.org/rBb201d36307dfcef0e594e4c509c73a32f39a00e7

Further tweaks to SCons's auto tests

We should do autotests only after setting path to sconsign,
otherwise using the same working directory and different
build directories will eventually break.

===================================================================

M	SConstruct

===================================================================

diff --git a/SConstruct b/SConstruct
index 153f40d..0d66cfd 100644
--- a/SConstruct
+++ b/SConstruct
@@ -595,16 +595,6 @@ if not os.path.isdir ( B.root_build_dir):
 # if not os.path.isdir(B.doc_build_dir) and env['WITH_BF_DOCS']:
 #     os.makedirs ( B.doc_build_dir )
 
-# Put all auto configuration run-time tests here
-
-from FindSharedPtr import FindSharedPtr
-from FindUnorderedMap import FindUnorderedMap
-
-conf = Configure(env)
-conf.env.Append(LINKFLAGS=env['PLATFORM_LINKFLAGS'])
-FindSharedPtr(conf)
-FindUnorderedMap(conf)
-env = conf.Finish()
 
 ###################################
 # Ensure all data files are valid #
@@ -789,6 +779,19 @@ B.init_lib_dict()
 
 ##### END SETUP ##########
 
+# Put all auto configuration run-time tests here
+
+from FindSharedPtr import FindSharedPtr
+from FindUnorderedMap import FindUnorderedMap
+
+conf = Configure(env)
+conf.env.Append(LINKFLAGS=env['PLATFORM_LINKFLAGS'])
+FindSharedPtr(conf)
+FindUnorderedMap(conf)
+env = conf.Finish()
+
+# End of auto configuration
+
 Export('env')
 
 VariantDir(B.root_build_dir+'/source', 'source', duplicate=0)




More information about the Bf-blender-cvs mailing list