New scons option (WITHOUT_BF_PYTHON_INSTALL) to disable copying python files from...
authorMartin Poirier <theeth@yahoo.com>
Wed, 19 Aug 2009 01:03:34 +0000 (01:03 +0000)
committerMartin Poirier <theeth@yahoo.com>
Wed, 19 Aug 2009 01:03:34 +0000 (01:03 +0000)
tools/Blender.py
tools/btools.py

index 0d2671dbfac0d0a5f029865eded1ed9c65a53bf8..789a69815581b73f52e7913e3725efcff6a085b0 100644 (file)
@@ -587,7 +587,7 @@ class BlenderEnvironment(SConsEnvironment):
                        lenv.AddPostAction(prog,Action(AppIt,strfunction=my_appit_print))
                elif os.sep == '/': # any unix
                        if lenv['WITH_BF_PYTHON']:
                        lenv.AddPostAction(prog,Action(AppIt,strfunction=my_appit_print))
                elif os.sep == '/': # any unix
                        if lenv['WITH_BF_PYTHON']:
-                               if not lenv['WITHOUT_BF_INSTALL']:
+                               if not lenv['WITHOUT_BF_INSTALL'] and not lenv['WITHOUT_BF_PYTHON_INSTALL']:
                                        lenv.AddPostAction(prog,Action(PyInstall,strfunction=my_pyinst_print))
                
                return prog
                                        lenv.AddPostAction(prog,Action(PyInstall,strfunction=my_pyinst_print))
                
                return prog
index 0314aba25b58bdaacad83c9e2c8d117063206a8b..3e80ac453ce5beece028da0bd47b0a95b1dc20fb 100755 (executable)
@@ -59,8 +59,8 @@ def validate_arguments(args, bc):
                        'BF_CXX', 'WITH_BF_STATICCXX', 'BF_CXX_LIB_STATIC',
                        'BF_TWEAK_MODE', 'BF_SPLIT_SRC',
                        'WITHOUT_BF_INSTALL',
                        'BF_CXX', 'WITH_BF_STATICCXX', 'BF_CXX_LIB_STATIC',
                        'BF_TWEAK_MODE', 'BF_SPLIT_SRC',
                        'WITHOUT_BF_INSTALL',
+                       'WITHOUT_BF_PYTHON_INSTALL',
                        'WITH_BF_OPENMP',
                        'WITH_BF_OPENMP',
-                       'WITHOUT_BF_INSTALL',
                        'BF_FANCY', 'BF_QUIET',
                        'BF_X264_CONFIG',
                        'BF_XVIDCORE_CONFIG',
                        'BF_FANCY', 'BF_QUIET',
                        'BF_X264_CONFIG',
                        'BF_XVIDCORE_CONFIG',
@@ -363,6 +363,7 @@ def read_opts(cfg, args):
                (BoolVariable('BF_TWEAK_MODE', 'Enable tweak mode if true', False)),
                (BoolVariable('BF_SPLIT_SRC', 'Split src lib into several chunks if true', False)),
                (BoolVariable('WITHOUT_BF_INSTALL', 'dont install if true', False)),
                (BoolVariable('BF_TWEAK_MODE', 'Enable tweak mode if true', False)),
                (BoolVariable('BF_SPLIT_SRC', 'Split src lib into several chunks if true', False)),
                (BoolVariable('WITHOUT_BF_INSTALL', 'dont install if true', False)),
+               (BoolVariable('WITHOUT_BF_PYTHON_INSTALL', 'dont install Python modules if true', False)),
                (BoolVariable('BF_FANCY', 'Enable fancy output if true', True)),
                (BoolVariable('BF_QUIET', 'Enable silent output if true', True)),
                (BoolVariable('WITH_BF_BINRELOC', 'Enable relocatable binary (linux only)', False)),
                (BoolVariable('BF_FANCY', 'Enable fancy output if true', True)),
                (BoolVariable('BF_QUIET', 'Enable silent output if true', True)),
                (BoolVariable('WITH_BF_BINRELOC', 'Enable relocatable binary (linux only)', False)),