[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17234] trunk/blender: * Minimum SCons version is now 1.0.0
Nathan Letwory
jesterking at letwory.net
Fri Oct 31 00:55:07 CET 2008
Revision: 17234
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17234
Author: jesterking
Date: 2008-10-31 00:55:07 +0100 (Fri, 31 Oct 2008)
Log Message:
-----------
* Minimum SCons version is now 1.0.0
- Code has been changed to reflect this (ie. deprecated functions are not anymore used)
* clean up the C and C++ compiler flags mess.
- in the environment construction of BlenderLib all the compile flag governing options have been split in the *C*, *CC* and *CXX* containing equivalents.
C is for C compiler only flags. CC is for C and C++ compiler flags and CXX is for C++ compiler only flags.
All the platform default config files need to be double checked and fixed wherever it looks necessary. Either DIY, or send me a note with needed changes.
- a start for the BlenderLib parameter list has been made - all the SConscripts need to be checked and modified to hand in flags properly.
* A theeth request: make -jN settable in the config file.
- I give you BF_NUMJOBS, which is set to 1 by default. In your user-config.py, set BF_NUMJOBS=4 to have 4 parallel jobs handled. Yay.
Modified Paths:
--------------
trunk/blender/SConstruct
trunk/blender/config/win32-vc-config.py
trunk/blender/extern/verse/dist/SConstruct
trunk/blender/source/blender/makesdna/intern/SConscript
trunk/blender/source/gameengine/Physics/Sumo/SConscript
trunk/blender/tools/Blender.py
trunk/blender/tools/btools.py
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2008-10-30 19:58:11 UTC (rev 17233)
+++ trunk/blender/SConstruct 2008-10-30 23:55:07 UTC (rev 17234)
@@ -42,6 +42,8 @@
import tools.btools
import tools.bcolors
+EnsureSConsVersion(1,0,0)
+
BlenderEnvironment = tools.Blender.BlenderEnvironment
btools = tools.btools
B = tools.Blender
@@ -172,6 +174,9 @@
if not env['BF_FANCY']:
B.bc.disable()
+SetOption('num_jobs', int(env['BF_NUMJOBS']))
+print "Build with %d parallel jobs" % (GetOption('num_jobs'))
+
# disable elbeem (fluidsim) compilation?
if env['BF_NO_ELBEEM'] == 1:
env['CPPFLAGS'].append('-DDISABLE_ELBEEM')
Modified: trunk/blender/config/win32-vc-config.py
===================================================================
--- trunk/blender/config/win32-vc-config.py 2008-10-30 19:58:11 UTC (rev 17233)
+++ trunk/blender/config/win32-vc-config.py 2008-10-30 23:55:07 UTC (rev 17234)
@@ -162,13 +162,16 @@
CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT']
-BF_DEBUG_FLAGS = ['/Zi', '/FR${TARGET}.sbr']
+BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-DFTGL_LIBRARY_STATIC', '-D_CRT_SECURE_NO_DEPRECATE']
REL_CFLAGS = ['-O2', '-DNDEBUG']
REL_CCFLAGS = ['-O2', '-DNDEBUG']
+REL_CXXFLAGS = ['-O2', '-DNDEBUG']
+
C_WARN = []
CC_WARN = []
+CXX_WARN = []
LLIBS = 'ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid'
Modified: trunk/blender/extern/verse/dist/SConstruct
===================================================================
--- trunk/blender/extern/verse/dist/SConstruct 2008-10-30 19:58:11 UTC (rev 17233)
+++ trunk/blender/extern/verse/dist/SConstruct 2008-10-30 23:55:07 UTC (rev 17234)
@@ -56,7 +56,7 @@
platform_linkflags += ['/DEBUG','/PDB:verse.pdb']
-verse_env = env.Copy()
+verse_env = env.Clone()
cmd_gen_files = (['v_cmd_gen.c',
'v_cmd_def_a.c',
@@ -71,7 +71,7 @@
cmd_gen_deps = (['v_gen_pack_init.c'])
-proto_env = env.Copy()
+proto_env = env.Clone()
proto_env.Append(CPPDEFINES=['V_GENERATE_FUNC_MODE'])
mkprot_tool = proto_env.Program(target = 'mkprot', source = cmd_gen_files)
@@ -130,10 +130,10 @@
'vs_node_text.c'
])
-verselib_env = verse_env.Copy()
+verselib_env = verse_env.Clone()
verselib_env.Append(CPPDEFINES = defines)
-verseserver_env = verse_env.Copy()
+verseserver_env = verse_env.Clone()
verseserver_env.Append(CPPDEFINES = defines)
verseserver_env.Append (LIBPATH = ['.'])
verseserver_env.Append (LIBS= ['verse'])
Modified: trunk/blender/source/blender/makesdna/intern/SConscript
===================================================================
--- trunk/blender/source/blender/makesdna/intern/SConscript 2008-10-30 19:58:11 UTC (rev 17233)
+++ trunk/blender/source/blender/makesdna/intern/SConscript 2008-10-30 23:55:07 UTC (rev 17234)
@@ -10,8 +10,8 @@
source_files = ['makesdna.c']
header_files = env.Glob('../*.h')
-makesdna_tool = env.Copy()
-dna = env.Copy()
+makesdna_tool = env.Clone()
+dna = env.Clone()
makesdna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesdna/\\"" ')
makesdna_tool.Append (CPPPATH = ['#/intern/guardedalloc',
Modified: trunk/blender/source/gameengine/Physics/Sumo/SConscript
===================================================================
--- trunk/blender/source/gameengine/Physics/Sumo/SConscript 2008-10-30 19:58:11 UTC (rev 17233)
+++ trunk/blender/source/gameengine/Physics/Sumo/SConscript 2008-10-30 23:55:07 UTC (rev 17234)
@@ -1,7 +1,6 @@
#!/usr/bin/python
Import ('env')
-sumoenv = env.Copy()
sources = ['SumoPHYCallbackBridge.cpp',
'SumoPhysicsController.cpp',
'SumoPhysicsEnvironment.cpp',
@@ -16,7 +15,7 @@
'Fuzzics/include',
'#/intern/moto/include'
]
-incs += [sumoenv['BF_SOLID_INC']]
+incs += [env['BF_SOLID_INC']]
cflags = []
if env['OURPLATFORM']=='win32-vc':
Modified: trunk/blender/tools/Blender.py
===================================================================
--- trunk/blender/tools/Blender.py 2008-10-30 19:58:11 UTC (rev 17233)
+++ trunk/blender/tools/Blender.py 2008-10-30 23:55:07 UTC (rev 17234)
@@ -394,13 +394,13 @@
self.Exit()
print bc.HEADER+'Configuring resource '+bc.ENDC+bc.OKGREEN+libname+bc.ENDC
- lenv = self.Copy()
+ lenv = self.Clone()
res = lenv.RES('#'+root_build_dir+'lib/'+libname, source)
SConsEnvironment.Default(self, res)
resources.append(res)
- def BlenderLib(self=None, libname=None, sources=None, includes=[], defines=[], libtype='common', priority = 100, compileflags=None):
+ def BlenderLib(self=None, libname=None, sources=None, includes=[], defines=[], libtype='common', priority = 100, compileflags=None, cc_compileflags=None, cxx_compileflags=None):
if not self or not libname or not sources:
print bc.FAIL+'Cannot continue. Missing argument for BuildBlenderLib '+libname+bc.ENDC
self.Exit()
@@ -409,7 +409,7 @@
print bc.HEADER+'Configuring library '+bc.ENDC+bc.OKGREEN+libname +bc.ENDC+bc.OKBLUE+ " (debug mode)" + bc.ENDC
else:
print bc.HEADER+'Configuring library '+bc.ENDC+bc.OKGREEN+libname + bc.ENDC
- lenv = self.Copy()
+ lenv = self.Clone()
lenv.Append(CPPPATH=includes)
lenv.Append(CPPDEFINES=defines)
if lenv['WITH_BF_GAMEENGINE']:
@@ -419,21 +419,28 @@
# debug or not
# CXXFLAGS defaults to CCFLAGS, therefore
# we Replace() rather than Append() to CXXFLAGS the first time
- lenv.Replace(CXXFLAGS = lenv['CCFLAGS'])
+ #lenv.Replace(CXXFLAGS = lenv['CCFLAGS'])
if lenv['BF_DEBUG'] or (libname in quickdebug):
- lenv.Append(CCFLAGS = Split(lenv['BF_DEBUG_FLAGS']))
- lenv.Append( CXXFLAGS = Split(lenv['BF_DEBUG_FLAGS']))
+ lenv.Append(CFLAGS = Split(lenv['BF_DEBUG_CFLAGS']))
+ lenv.Append(CCFLAGS = Split(lenv['BF_DEBUG_CCFLAGS']))
+ lenv.Append(CXXFLAGS = Split(lenv['BF_DEBUG_CXXFLAGS']))
else:
- lenv.Append(CCFLAGS = lenv['REL_CFLAGS'])
- lenv.Append(CXXFLAGS = lenv['REL_CCFLAGS'])
+ lenv.Append(CFLAGS = lenv['REL_CFLAGS'])
+ lenv.Append(CCFLAGS = lenv['REL_CCFLAGS'])
+ lenv.Append(CXXFLAGS = lenv['REL_CXXFLAGS'])
if lenv['BF_PROFILE']:
- lenv.Append(CCFLAGS = Split(lenv['BF_PROFILE_FLAGS']),
- CXXFLAGS = Split(lenv['BF_PROFILE_FLAGS']))
+ lenv.Append(CFLAGS = lenv['BF_PROFILE_CFLAGS'])
+ lenv.Append(CCFLAGS = lenv['BF_PROFILE_CCFLAGS'])
+ lenv.Append(CXXFLAGS = lenv['BF_PROFILE_CXXFLAGS'])
if compileflags:
- lenv.Append(CCFLAGS = compileflags)
- lenv.Append(CXXFLAGS = compileflags)
- lenv.Append(CCFLAGS = Split(lenv['C_WARN']))
- lenv.Append(CXXFLAGS = Split(lenv['CC_WARN']))
+ lenv.Append(CFLAGS = compileflags)
+ if cc_compileflags:
+ lenv.Append(CCFLAGS = cc_compileflags)
+ if cxx_compileflags:
+ lenv.Append(CXXFLAGS = cxx_compileflags)
+ lenv.Append(CFLAGS = lenv['C_WARN'])
+ lenv.Append(CXXFLAGS = lenv['CC_WARN'])
+ lenv.Append(CXXFLAGS = lenv['CXX_WARN'])
lib = lenv.Library(target= '#'+root_build_dir+'lib/'+libname, source=sources)
SConsEnvironment.Default(self, lib) # we add to default target, because this way we get some kind of progress info during build
else:
@@ -443,7 +450,7 @@
def BlenderProg(self=None, builddir=None, progname=None, sources=None, includes=None, libs=None, libpath=None, binarykind=''):
print bc.HEADER+'Configuring program '+bc.ENDC+bc.OKGREEN+progname+bc.ENDC
- lenv = self.Copy()
+ lenv = self.Clone()
if lenv['OURPLATFORM'] in ['win32-vc', 'cygwin']:
lenv.Append(LINKFLAGS = Split(lenv['PLATFORM_LINKFLAGS']))
if lenv['BF_DEBUG']:
Modified: trunk/blender/tools/btools.py
===================================================================
--- trunk/blender/tools/btools.py 2008-10-30 19:58:11 UTC (rev 17233)
+++ trunk/blender/tools/btools.py 2008-10-30 23:55:07 UTC (rev 17234)
@@ -2,11 +2,9 @@
import os
import os.path
import SCons.Options
+
+import SCons.Variables
try:
- import SCons.Options.BoolOption
-except ImportError:
- pass
-try:
import subprocess
except ImportError:
pass
@@ -15,8 +13,8 @@
import shutil
import sys
-Options = SCons.Options
-BoolOption = SCons.Options.BoolOption
+Variables = SCons.Variables
+BoolVariable = SCons.Variables.BoolVariable
def print_arguments(args, bc):
if len(args):
@@ -54,10 +52,13 @@
'WITH_BF_PLAYER',
'WITH_BF_NOBLENDER',
'WITH_BF_BINRELOC',
- 'CFLAGS', 'CCFLAGS', 'CPPFLAGS',
- 'REL_CFLAGS', 'REL_CCFLAGS',
- 'C_WARN', 'CC_WARN', 'LLIBS', 'PLATFORM_LINKFLAGS',
- 'BF_PROFILE_FLAGS', 'LCGDIR',
+ 'CFLAGS', 'CCFLAGS', 'CXXFLAGS', 'CPPFLAGS',
+ 'REL_CFLAGS', 'REL_CCFLAGS', 'REL_CXXFLAGS',
+ 'BF_PROFILE_FLAGS', 'BF_PROFILE_FLAGS', 'BF_PROFILE_CXXFLAGS',
+ 'BF_DEBUG_CFLAGS', 'BF_DEBUG_CCFLAGS', 'BF_DEBUG_CXXFLAGS',
+ 'C_WARN', 'CC_WARN', 'CXX_WARN',
+ 'LLIBS', 'PLATFORM_LINKFLAGS',
+ 'LCGDIR',
'BF_CXX', 'WITH_BF_STATICCXX', 'BF_CXX_LIB_STATIC'
'WITH_BF_VERSE', 'BF_VERSE_INCLUDE',
'VERSE_BUILD_BINARY', 'VERSE_BUILD_DIR', 'VERSE_REGEN_PROTO',
@@ -69,12 +70,13 @@
'BF_X264_CONFIG',
'BF_XVIDCORE_CONFIG',
'WITH_BF_DOCS',
+ 'BF_NUMJOBS',
]
arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE',
'BF_INSTALLDIR', 'BF_TOOLSET', 'BF_BINNAME',
'BF_BUILDDIR', 'BF_FANCY', 'BF_QUICK', 'BF_PROFILE',
- 'BF_DEBUG_FLAGS', 'BF_BSC', 'BF_CONFIG',
+ 'BF_BSC', 'BF_CONFIG',
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list