diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2011-02-28 16:18:00 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2011-02-28 16:18:00 +0300 |
| commit | 9234cb6e30ed36dfcfae794824fcbb88618e060f (patch) | |
| tree | 4408766fd9e90290a2d4d733cfa1282f66fbe8d1 /build_files/scons/tools | |
| parent | a40bb7e2056c78760d4b73631ea1efa23e12e4f4 (diff) | |
Make sure python.zip is extracted only once. This prevents erroring build on the unzip stage.
Diffstat (limited to 'build_files/scons/tools')
| -rw-r--r-- | build_files/scons/tools/Blender.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index 64d0a3f0caa..726b7ac6c22 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -680,6 +680,8 @@ def bsc(env, target, source): class BlenderEnvironment(SConsEnvironment): + PyBundleActionAdded = False + def BlenderRes(self=None, libname=None, source=None, libtype=['core'], priority=[100]): global libs if not self or not libname or not source: @@ -823,12 +825,14 @@ class BlenderEnvironment(SConsEnvironment): lenv.AddPostAction(prog,Action(AppIt,strfunction=my_appit_print)) elif os.sep == '/' and lenv['OURPLATFORM'] != 'linuxcross': # any unix (except cross-compilation) if lenv['WITH_BF_PYTHON']: - if not lenv['WITHOUT_BF_INSTALL'] and not lenv['WITHOUT_BF_PYTHON_INSTALL']: + if not lenv['WITHOUT_BF_INSTALL'] and not lenv['WITHOUT_BF_PYTHON_INSTALL'] and not BlenderEnvironment.PyBundleActionAdded: lenv.AddPostAction(prog,Action(UnixPyBundle,strfunction=my_unixpybundle_print)) + BlenderEnvironment.PyBundleActionAdded = True elif lenv['OURPLATFORM'].startswith('win') or lenv['OURPLATFORM'] == 'linuxcross': # windows or cross-compilation if lenv['WITH_BF_PYTHON']: - if not lenv['WITHOUT_BF_PYTHON_INSTALL']: + if not lenv['WITHOUT_BF_PYTHON_INSTALL'] and not BlenderEnvironment.PyBundleActionAdded: lenv.AddPostAction(prog,Action(WinPyBundle,strfunction=my_winpybundle_print)) + BlenderEnvironment.PyBundleActionAdded = True return prog def Glob(lenv, pattern): |