From ec2c52c9c87550d2e551956e0b558e14e8264213 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 2 Aug 2010 16:27:41 +0000 Subject: SCons - remove scons option WITH_BF_FHS, its not needed anymore. - comment WITH_BF_DOCS, was using epydocs which we dont use now. - blenderlite target was broken, always using openmp. - building without python wasnt working. - fixed some warnings. --- build_files/scons/config/win64-vc-config.py | 2 -- build_files/scons/tools/Blender.py | 7 +++---- build_files/scons/tools/btools.py | 6 ++---- 3 files changed, 5 insertions(+), 10 deletions(-) (limited to 'build_files/scons') diff --git a/build_files/scons/config/win64-vc-config.py b/build_files/scons/config/win64-vc-config.py index 46b9034823c..0a4b05a28bf 100644 --- a/build_files/scons/config/win64-vc-config.py +++ b/build_files/scons/config/win64-vc-config.py @@ -194,8 +194,6 @@ CXX_WARN = [] LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid'] -WITH_BF_DOCS=False - BF_DEBUG=False BF_BSC=False diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index 1c2fccec322..546f1e540cf 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -570,10 +570,9 @@ def UnixPyBundle(target=None, source=None, env=None): def run(cmd): print 'Install command:', cmd commands.getoutput(cmd) - - if env['WITH_BF_FHS']: dir = os.path.join(env['BF_INSTALLDIR'], 'share', 'blender', env['BF_VERSION']) # BLENDERPATH - else: dir = os.path.join(env['BF_INSTALLDIR'], VERSION) - + + dir = os.path.join(env['BF_INSTALLDIR'], VERSION) + py_src = env.subst( env['BF_PYTHON_LIBPATH'] + '/python'+env['BF_PYTHON_VERSION'] ) py_target = env.subst( dir + '/python/lib/python'+env['BF_PYTHON_VERSION'] ) diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 5647ef0ebaa..93f3795b916 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -78,7 +78,6 @@ def validate_arguments(args, bc): 'WITH_BF_DOCS', 'BF_NUMJOBS', 'BF_MSVS', - 'WITH_BF_FHS', 'BF_VERSION', 'BF_GHOST_DEBUG', 'WITH_BF_RAYOPTIMIZATION', @@ -428,13 +427,12 @@ def read_opts(env, cfg, args): ('BF_X264_CONFIG', 'configuration flags for x264', ''), ('BF_XVIDCORE_CONFIG', 'configuration flags for xvidcore', ''), - (BoolVariable('WITH_BF_DOCS', 'Generate API documentation', False)), +# (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_MSVS', 'Generate MSVS project files and solution', False), - - (BoolVariable('WITH_BF_FHS', 'Use the Unix "Filesystem Hierarchy Standard" rather then a redistributable directory layout', False)), + ('BF_VERSION', 'The root path for Unix (non-apple)', '2.5'), (BoolVariable('BF_UNIT_TEST', 'Build with unit test support.', False)), -- cgit v1.2.3