Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Selten <michel@mselten.demon.nl>2004-04-04 17:57:28 +0400
committerMichel Selten <michel@mselten.demon.nl>2004-04-04 17:57:28 +0400
commit64c127d742d2bae94b9972fc1c4244191bc31991 (patch)
tree6c1ec60e78f2c038984aa918779729dc0487a8e1 /SConstruct
parentb298ecbfacb9b546bed39a4565bf405e169ccc13 (diff)
SCons update.
* Bug fix for latest commit. SCons would choke when the <root_build_dir> did not exist. First action now is to create the root_build_dir.
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct9
1 files changed, 8 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct
index faa75ff0c08..7ba53d4bf60 100644
--- a/SConstruct
+++ b/SConstruct
@@ -7,6 +7,13 @@ from distutils import sysconfig
# Build directory.
root_build_dir = '..' + os.sep + 'build' + os.sep + sys.platform + os.sep
+# Create the build directory. SCons does this automatically, but since we
+# don't want to put scons-generated .sconsign files in the source tree, but in
+# the root_build_dir, we have to create that dir ourselves before SCons tries
+# to access/create the file containing .sconsign data.
+if os.path.isdir (root_build_dir) == False:
+ os.makedirs (root_build_dir)
+
# User configurable options file. This can be controlled by the user by running
# scons with the following argument: CONFIG=user_config_options_file
config_file = ARGUMENTS.get('CONFIG', 'config.opts')
@@ -818,7 +825,7 @@ library_env.Replace (AR = user_options_dict['TARGET_AR'])
library_env.Append (CCFLAGS = cflags)
library_env.Append (CXXFLAGS = cxxflags)
library_env.Append (CPPDEFINES = defines)
-library_env.SConsignFile (root_build_dir+'/scons-signatures')
+library_env.SConsignFile (root_build_dir+'scons-signatures')
#-----------------------------------------------------------------------------
# Settings to be exported to other SConscript files