[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31645] trunk/blender: Finally change SConscript tabs to spaces.
Nathan Letwory
nathan at letworyinteractive.com
Sun Aug 29 22:52:05 CEST 2010
Revision: 31645
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31645
Author: jesterking
Date: 2010-08-29 22:52:05 +0200 (Sun, 29 Aug 2010)
Log Message:
-----------
Finally change SConscript tabs to spaces.
Modified Paths:
--------------
trunk/blender/SConstruct
trunk/blender/build_files/scons/tools/Blender.py
trunk/blender/extern/SConscript
trunk/blender/extern/libopenjpeg/SConscript
trunk/blender/intern/audaspace/SConscript
trunk/blender/intern/ghost/SConscript
trunk/blender/source/SConscript
trunk/blender/source/blender/blenfont/SConscript
trunk/blender/source/blender/blenkernel/SConscript
trunk/blender/source/blender/blenpluginapi/SConscript
trunk/blender/source/blender/collada/SConscript
trunk/blender/source/blender/editors/SConscript
trunk/blender/source/blender/editors/interface/SConscript
trunk/blender/source/blender/editors/object/SConscript
trunk/blender/source/blender/editors/screen/SConscript
trunk/blender/source/blender/editors/sculpt_paint/SConscript
trunk/blender/source/blender/editors/space_console/SConscript
trunk/blender/source/blender/editors/space_file/SConscript
trunk/blender/source/blender/editors/space_image/SConscript
trunk/blender/source/blender/editors/space_logic/SConscript
trunk/blender/source/blender/editors/space_node/SConscript
trunk/blender/source/blender/editors/space_script/SConscript
trunk/blender/source/blender/editors/space_text/SConscript
trunk/blender/source/blender/editors/space_view3d/SConscript
trunk/blender/source/blender/imbuf/SConscript
trunk/blender/source/blender/imbuf/intern/dds/SConscript
trunk/blender/source/blender/imbuf/intern/openexr/SConscript
trunk/blender/source/blender/makesdna/intern/SConscript
trunk/blender/source/blender/makesrna/SConscript
trunk/blender/source/blender/makesrna/intern/SConscript
trunk/blender/source/blender/modifiers/SConscript
trunk/blender/source/blender/nodes/SConscript
trunk/blender/source/blender/python/SConscript
trunk/blender/source/blender/quicktime/SConscript
trunk/blender/source/blender/windowmanager/SConscript
trunk/blender/source/blenderplayer/bad_level_call_stubs/SConscript
trunk/blender/source/creator/SConscript
trunk/blender/source/gameengine/BlenderRoutines/SConscript
trunk/blender/source/gameengine/Converter/SConscript
trunk/blender/source/gameengine/Expressions/SConscript
trunk/blender/source/gameengine/GameLogic/SConscript
trunk/blender/source/gameengine/GamePlayer/common/SConscript
trunk/blender/source/gameengine/GamePlayer/ghost/SConscript
trunk/blender/source/gameengine/Ketsji/KXNetwork/SConscript
trunk/blender/source/gameengine/Ketsji/SConscript
trunk/blender/source/gameengine/Physics/Bullet/SConscript
trunk/blender/source/gameengine/Rasterizer/SConscript
trunk/blender/source/gameengine/VideoTexture/SConscript
trunk/blender/source/icons/SConscript
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2010-08-29 19:47:26 UTC (rev 31644)
+++ trunk/blender/SConstruct 2010-08-29 20:52:05 UTC (rev 31645)
@@ -33,9 +33,9 @@
# Need a better way to do this. Automagical maybe is not the best thing, maybe it is.
if pltfrm.architecture()[0] == '64bit':
- bitness = 64
+ bitness = 64
else:
- bitness = 32
+ bitness = 32
import sys
import os
@@ -79,15 +79,15 @@
# XX cheating for BF_FANCY, we check for BF_FANCY before args are validated
use_color = ARGUMENTS.get('BF_FANCY', '1')
if platform=='win32':
- use_color = None
+ use_color = None
if not use_color=='1':
- B.bc.disable()
-
+ B.bc.disable()
+
#on defaut white Os X terminal, some colors are totally unlegible
if platform=='darwin':
- B.bc.OKGREEN = '\033[34m'
- B.bc.WARNING = '\033[36m'
+ B.bc.OKGREEN = '\033[34m'
+ B.bc.WARNING = '\033[36m'
# arguments
print B.bc.HEADER+'Command-line arguments'+B.bc.ENDC
@@ -110,100 +110,100 @@
quickdebug = B.arguments.get('BF_QUICKDEBUG', None)
if quickdebug:
- B.quickdebug=string.split(quickdebug, ',')
+ B.quickdebug=string.split(quickdebug, ',')
else:
- B.quickdebug=[]
+ B.quickdebug=[]
if quickie:
- B.quickie=string.split(quickie,',')
+ B.quickie=string.split(quickie,',')
else:
- B.quickie=[]
-
+ B.quickie=[]
+
toolset = B.arguments.get('BF_TOOLSET', None)
if toolset:
- print "Using " + toolset
- if toolset=='mstoolkit':
- env = BlenderEnvironment(ENV = os.environ)
- env.Tool('mstoolkit', [toolpath])
- else:
- env = BlenderEnvironment(tools=[toolset], ENV = os.environ)
- # xxx commented out, as was supressing warnings under mingw..
- #if env:
- # btools.SetupSpawn(env)
+ print "Using " + toolset
+ if toolset=='mstoolkit':
+ env = BlenderEnvironment(ENV = os.environ)
+ env.Tool('mstoolkit', [toolpath])
+ else:
+ env = BlenderEnvironment(tools=[toolset], ENV = os.environ)
+ # xxx commented out, as was supressing warnings under mingw..
+ #if env:
+ # btools.SetupSpawn(env)
else:
- if bitness==64 and platform=='win32':
- env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64')
- else:
- env = BlenderEnvironment(ENV = os.environ)
+ if bitness==64 and platform=='win32':
+ env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64')
+ else:
+ env = BlenderEnvironment(ENV = os.environ)
if not env:
- print "Could not create a build environment"
- Exit()
+ print "Could not create a build environment"
+ Exit()
cc = B.arguments.get('CC', None)
cxx = B.arguments.get('CXX', None)
if cc:
- env['CC'] = cc
+ env['CC'] = cc
if cxx:
- env['CXX'] = cxx
+ env['CXX'] = cxx
if env['CC'] in ['cl', 'cl.exe'] and sys.platform=='win32':
- if bitness == 64:
- platform = 'win64-vc'
- else:
- platform = 'win32-vc'
+ if bitness == 64:
+ platform = 'win64-vc'
+ else:
+ platform = 'win32-vc'
elif env['CC'] in ['gcc'] and sys.platform=='win32':
- platform = 'win32-mingw'
+ platform = 'win32-mingw'
env.SConscriptChdir(0)
crossbuild = B.arguments.get('BF_CROSS', None)
if crossbuild and platform not in ('win32-vc', 'win64-vc'):
- platform = 'linuxcross'
+ platform = 'linuxcross'
env['OURPLATFORM'] = platform
configfile = os.path.join("build_files", "scons", "config", platform + "-config.py")
if os.path.exists(configfile):
- print B.bc.OKGREEN + "Using config file: " + B.bc.ENDC + configfile
+ print B.bc.OKGREEN + "Using config file: " + B.bc.ENDC + configfile
else:
- print B.bc.FAIL + configfile + " doesn't exist" + B.bc.ENDC
+ print B.bc.FAIL + configfile + " doesn't exist" + B.bc.ENDC
if crossbuild and env['PLATFORM'] != 'win32':
- print B.bc.HEADER+"Preparing for crossbuild"+B.bc.ENDC
- env.Tool('crossmingw', [toolpath])
- # todo: determine proper libs/includes etc.
- # Needed for gui programs, console programs should do without it
+ print B.bc.HEADER+"Preparing for crossbuild"+B.bc.ENDC
+ env.Tool('crossmingw', [toolpath])
+ # todo: determine proper libs/includes etc.
+ # Needed for gui programs, console programs should do without it
- # Now we don't need this option to have console window
- # env.Append(LINKFLAGS=['-mwindows'])
+ # Now we don't need this option to have console window
+ # env.Append(LINKFLAGS=['-mwindows'])
userconfig = B.arguments.get('BF_CONFIG', 'user-config.py')
# first read platform config. B.arguments will override
optfiles = [configfile]
if os.path.exists(userconfig):
- print B.bc.OKGREEN + "Using user-config file: " + B.bc.ENDC + userconfig
- optfiles += [userconfig]
+ print B.bc.OKGREEN + "Using user-config file: " + B.bc.ENDC + userconfig
+ optfiles += [userconfig]
else:
- print B.bc.WARNING + userconfig + " not found, no user overrides" + B.bc.ENDC
+ print B.bc.WARNING + userconfig + " not found, no user overrides" + B.bc.ENDC
opts = btools.read_opts(env, optfiles, B.arguments)
opts.Update(env)
if not env['BF_FANCY']:
- B.bc.disable()
+ B.bc.disable()
# remove install dir so old and new files are not mixed.
# NOTE: only do the scripts directory for now, otherwise is too disruptive for developers
# TODO: perhaps we need an option (off by default) to not do this altogether...
if not env['WITHOUT_BF_INSTALL'] and not env['WITHOUT_BF_OVERWRITE_INSTALL']:
- scriptsDir = os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts')
- if os.path.isdir(scriptsDir):
- print B.bc.OKGREEN + "Clearing installation directory%s: %s" % (B.bc.ENDC, os.path.abspath(scriptsDir))
- shutil.rmtree(scriptsDir)
+ scriptsDir = os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts')
+ if os.path.isdir(scriptsDir):
+ print B.bc.OKGREEN + "Clearing installation directory%s: %s" % (B.bc.ENDC, os.path.abspath(scriptsDir))
+ shutil.rmtree(scriptsDir)
SetOption('num_jobs', int(env['BF_NUMJOBS']))
@@ -211,158 +211,158 @@
print B.bc.OKGREEN + "Build with debug symbols%s: %s" % (B.bc.ENDC, env['BF_DEBUG'])
if 'blenderlite' in B.targets:
- target_env_defs = {}
- target_env_defs['WITH_BF_GAMEENGINE'] = False
- target_env_defs['WITH_BF_OPENAL'] = False
- target_env_defs['WITH_BF_OPENEXR'] = False
- target_env_defs['WITH_BF_OPENMP'] = False
- target_env_defs['WITH_BF_ICONV'] = False
- target_env_defs['WITH_BF_INTERNATIONAL'] = False
- target_env_defs['WITH_BF_OPENJPEG'] = False
- target_env_defs['WITH_BF_FFMPEG'] = False
- target_env_defs['WITH_BF_QUICKTIME'] = False
- target_env_defs['WITH_BF_REDCODE'] = False
- target_env_defs['WITH_BF_DDS'] = False
- target_env_defs['WITH_BF_CINEON'] = False
- target_env_defs['WITH_BF_HDR'] = False
- target_env_defs['WITH_BF_ZLIB'] = False
- target_env_defs['WITH_BF_SDL'] = False
- target_env_defs['WITH_BF_JPEG'] = False
- target_env_defs['WITH_BF_PNG'] = False
- target_env_defs['WITH_BF_BULLET'] = False
- target_env_defs['WITH_BF_BINRELOC'] = False
- target_env_defs['BF_BUILDINFO'] = False
- target_env_defs['BF_NO_ELBEEM'] = True
- target_env_defs['WITH_BF_PYTHON'] = False
-
- # Merge blenderlite, let command line to override
- for k,v in target_env_defs.iteritems():
- if k not in B.arguments:
- env[k] = v
+ target_env_defs = {}
+ target_env_defs['WITH_BF_GAMEENGINE'] = False
+ target_env_defs['WITH_BF_OPENAL'] = False
+ target_env_defs['WITH_BF_OPENEXR'] = False
+ target_env_defs['WITH_BF_OPENMP'] = False
+ target_env_defs['WITH_BF_ICONV'] = False
+ target_env_defs['WITH_BF_INTERNATIONAL'] = False
+ target_env_defs['WITH_BF_OPENJPEG'] = False
+ target_env_defs['WITH_BF_FFMPEG'] = False
+ target_env_defs['WITH_BF_QUICKTIME'] = False
+ target_env_defs['WITH_BF_REDCODE'] = False
+ target_env_defs['WITH_BF_DDS'] = False
+ target_env_defs['WITH_BF_CINEON'] = False
+ target_env_defs['WITH_BF_HDR'] = False
+ target_env_defs['WITH_BF_ZLIB'] = False
+ target_env_defs['WITH_BF_SDL'] = False
+ target_env_defs['WITH_BF_JPEG'] = False
+ target_env_defs['WITH_BF_PNG'] = False
+ target_env_defs['WITH_BF_BULLET'] = False
+ target_env_defs['WITH_BF_BINRELOC'] = False
+ target_env_defs['BF_BUILDINFO'] = False
+ target_env_defs['BF_NO_ELBEEM'] = True
+ target_env_defs['WITH_BF_PYTHON'] = False
+
+ # Merge blenderlite, let command line to override
+ for k,v in target_env_defs.iteritems():
+ if k not in B.arguments:
+ env[k] = v
if env['WITH_BF_OPENMP'] == 1:
- if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
- env['CCFLAGS'].append('/openmp')
- env['CPPFLAGS'].append('/openmp')
- env['CXXFLAGS'].append('/openmp')
- else:
- if env['CC'].endswith('icc'): # to be able to handle CC=/opt/bla/icc case
- env.Append(LINKFLAGS=['-openmp', '-static-intel'])
- env['CCFLAGS'].append('-openmp')
- env['CPPFLAGS'].append('-openmp')
- env['CXXFLAGS'].append('-openmp')
- else:
- env.Append(CCFLAGS=['-fopenmp'])
- env.Append(CPPFLAGS=['-fopenmp'])
- env.Append(CXXFLAGS=['-fopenmp'])
+ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
+ env['CCFLAGS'].append('/openmp')
+ env['CPPFLAGS'].append('/openmp')
+ env['CXXFLAGS'].append('/openmp')
+ else:
+ if env['CC'].endswith('icc'): # to be able to handle CC=/opt/bla/icc case
+ env.Append(LINKFLAGS=['-openmp', '-static-intel'])
+ env['CCFLAGS'].append('-openmp')
+ env['CPPFLAGS'].append('-openmp')
+ env['CXXFLAGS'].append('-openmp')
+ else:
+ env.Append(CCFLAGS=['-fopenmp'])
+ env.Append(CPPFLAGS=['-fopenmp'])
+ env.Append(CXXFLAGS=['-fopenmp'])
if env['WITH_GHOST_COCOA'] == True:
- env.Append(CFLAGS=['-DGHOST_COCOA'])
- env.Append(CXXFLAGS=['-DGHOST_COCOA'])
- env.Append(CPPFLAGS=['-DGHOST_COCOA'])
+ env.Append(CFLAGS=['-DGHOST_COCOA'])
+ env.Append(CXXFLAGS=['-DGHOST_COCOA'])
+ env.Append(CPPFLAGS=['-DGHOST_COCOA'])
if env['USE_QTKIT'] == True:
- env.Append(CFLAGS=['-DUSE_QTKIT'])
- env.Append(CXXFLAGS=['-DUSE_QTKIT'])
- env.Append(CPPFLAGS=['-DUSE_QTKIT'])
+ env.Append(CFLAGS=['-DUSE_QTKIT'])
+ env.Append(CXXFLAGS=['-DUSE_QTKIT'])
+ env.Append(CPPFLAGS=['-DUSE_QTKIT'])
#check for additional debug libnames
if env.has_key('BF_DEBUG_LIBS'):
- B.quickdebug += env['BF_DEBUG_LIBS']
+ B.quickdebug += env['BF_DEBUG_LIBS']
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list