diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-06-13 15:09:13 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-06-13 15:09:13 +0400 |
| commit | eed13b43b19c619ccdcda67b17c0da65ad44879c (patch) | |
| tree | aa759322ad2b18becaf237671dd71ffbda9c2076 /tools/btools.py | |
| parent | e10e1ac04e63ed04a5712e515ed28eb92a78fd62 (diff) | |
| parent | 2f1e118c30946bd3117c59cd45f13d79e4b612ec (diff) | |
merged from trunk 20741:20848
* Missing changes to release/windows/installer
* Sequencer fixes in source/blender/src/seqaudio.c dont apply to 2.5
* brechts fix for #18855 r20763 wasnt merged, does this apply to 2.5?
Diffstat (limited to 'tools/btools.py')
| -rwxr-xr-x | tools/btools.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/btools.py b/tools/btools.py index 7a71e1b678d..377a389941f 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -65,6 +65,7 @@ def validate_arguments(args, bc): 'WITH_BF_LCMS', 'BF_LCMS_LIB', 'WITH_BF_DOCS', 'BF_NUMJOBS', + 'BF_MSVS', ] # Have options here that scons expects to be lists @@ -363,7 +364,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() @@ -403,9 +405,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+"\\") |