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:
authorNathan Letwory <nathan@letworyinteractive.com>2009-06-12 19:37:23 +0400
committerNathan Letwory <nathan@letworyinteractive.com>2009-06-12 19:37:23 +0400
commitdee188df166ed4f5eb5c4bb72793afd5e81142a4 (patch)
tree9484b73ee815d720cbf3b6da53a43247ba16c3c1 /tools/btools.py
parent1c2ce9535caa7ef0ed70aea5bd25c0f281322cf6 (diff)
=== SCons ===
* make the nsis installer script automatically use the Python version we build against * bump Python version used
Diffstat (limited to 'tools/btools.py')
-rwxr-xr-xtools/btools.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/btools.py b/tools/btools.py
index 96048a545ff..77a50179122 100755
--- a/tools/btools.py
+++ b/tools/btools.py
@@ -68,6 +68,7 @@ def validate_arguments(args, bc):
'BF_XVIDCORE_CONFIG',
'WITH_BF_DOCS',
'BF_NUMJOBS',
+ 'BF_MSVS',
]
# Have options here that scons expects to be lists
@@ -379,7 +380,8 @@ def read_opts(cfg, args):
(BoolVariable('WITH_BF_DOCS', 'Generate API documentation', False)),
('BF_CONFIG', 'SCons python config file used to set default options', 'user_config.py'),
- ('BF_NUMJOBS', 'Number of build processes to spawn', '1')
+ ('BF_NUMJOBS', 'Number of build processes to spawn', '1'),
+ ('BF_MSVS', 'Generate MSVS project files and solution', False)
) # end of opts.AddOptions()
@@ -419,9 +421,13 @@ def NSIS_Installer(target=None, source=None, env=None):
ns = open("00.sconsblender.nsi","r")
+
ns_cnt = str(ns.read())
ns.close()
+ # set Python version we compile against
+ ns_cnt = string.replace(ns_cnt, "[PYTHON_VERSION]", env['BF_PYTHON_VERSION'])
+
# do root
rootlist = []
rootdir = os.listdir(inst_dir+"\\")