[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17358] branches/blender2.5/blender: === SCons ===

Nathan Letwory jesterking at letwory.net
Fri Nov 7 20:21:52 CET 2008 

Revision: 17358
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17358
Author:   jesterking
Date:     2008-11-07 20:21:52 +0100 (Fri, 07 Nov 2008)

Log Message:
-----------
=== SCons ===
* merge the recent scons changes from trunk, so this means that the same rules now apply:
  - scons-local available
  - platform default configs updated
  - check your user-config.py if you have made a full copy of default config

Note: BGE and blenderplayer still not working, but that is normal ;) (so turn them off!)

Modified Paths:
--------------
    branches/blender2.5/blender/SConstruct
    branches/blender2.5/blender/config/darwin-config.py
    branches/blender2.5/blender/config/linux2-config.py
    branches/blender2.5/blender/config/linuxcross-config.py
    branches/blender2.5/blender/config/openbsd3-config.py
    branches/blender2.5/blender/config/sunos5-config.py
    branches/blender2.5/blender/config/win32-mingw-config.py
    branches/blender2.5/blender/config/win32-vc-config.py
    branches/blender2.5/blender/extern/verse/dist/SConstruct
    branches/blender2.5/blender/source/blender/makesdna/intern/SConscript
    branches/blender2.5/blender/source/blender/makesrna/intern/SConscript
    branches/blender2.5/blender/source/gameengine/Physics/Sumo/SConscript
    branches/blender2.5/blender/tools/Blender.py
    branches/blender2.5/blender/tools/bcolors.py
    branches/blender2.5/blender/tools/btools.py

Added Paths:
-----------
    branches/blender2.5/blender/scons/
    branches/blender2.5/blender/scons/scons-LICENSE
    branches/blender2.5/blender/scons/scons-README
    branches/blender2.5/blender/scons/scons-local-1.1.0/
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Action.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Builder.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/CacheDir.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Conftest.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Debug.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Defaults.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Environment.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Errors.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Executor.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Job.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Memoize.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Node/
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Node/Alias.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Node/FS.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Node/Python.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Node/__init__.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Options/
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Options/BoolOption.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Options/EnumOption.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Options/ListOption.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Options/PackageOption.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Options/PathOption.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Options/__init__.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/PathList.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Platform/
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Platform/__init__.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Platform/aix.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Platform/cygwin.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Platform/darwin.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Platform/hpux.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Platform/irix.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Platform/os2.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Platform/posix.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Platform/sunos.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Platform/win32.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/SConf.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/SConsign.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Scanner/
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Scanner/C.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Scanner/D.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Scanner/Dir.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Scanner/Fortran.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Scanner/IDL.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Scanner/LaTeX.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Scanner/Prog.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Scanner/RC.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Scanner/__init__.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Script/
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Script/Interactive.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Script/Main.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Script/SConsOptions.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Script/SConscript.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Script/__init__.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Sig.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Subst.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Taskmaster.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/386asm.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/BitKeeper.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/CVS.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/FortranCommon.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/JavaCommon.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/Perforce.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/PharLapCommon.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/RCS.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/SCCS.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/Subversion.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/__init__.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/aixc++.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/aixcc.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/aixf77.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/aixlink.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/applelink.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/ar.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/as.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/bcc32.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/c++.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/cc.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/cvf.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/default.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/dmd.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/dvi.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/dvipdf.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/dvips.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/f77.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/f90.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/f95.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/filesystem.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/fortran.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/g++.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/g77.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/gas.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/gcc.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/gfortran.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/gnulink.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/gs.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/hpc++.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/hpcc.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/hplink.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/icc.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/icl.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/ifl.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/ifort.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/ilink.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/ilink32.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/install.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/intelc.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/jar.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/javac.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/javah.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/latex.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/lex.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/link.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/linkloc.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/m4.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/masm.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/midl.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/mingw.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/mslib.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/mslink.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/msvc.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/msvs.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/mwcc.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/mwld.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/nasm.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/packaging/
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/packaging/__init__.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/packaging/ipk.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/packaging/msi.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/packaging/rpm.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/packaging/src_tarbz2.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/packaging/src_targz.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/packaging/src_zip.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/packaging/tarbz2.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/packaging/targz.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/packaging/zip.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/pdf.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/pdflatex.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/pdftex.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/qt.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/rmic.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/rpcgen.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/rpm.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/sgiar.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/sgic++.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/sgicc.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/sgilink.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/sunar.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/sunc++.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/suncc.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/sunf77.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/sunf90.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/sunf95.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/sunlink.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/swig.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/tar.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/tex.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/tlib.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/wix.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/yacc.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Tool/zip.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Util.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Variables/
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Variables/BoolVariable.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Variables/EnumVariable.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Variables/ListVariable.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Variables/PackageVariable.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Variables/PathVariable.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Variables/__init__.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/Warnings.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/__init__.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/compat/
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/compat/__init__.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/compat/_scons_UserString.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/compat/_scons_hashlib.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/compat/_scons_itertools.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/compat/_scons_optparse.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/compat/_scons_sets.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/compat/_scons_sets15.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/compat/_scons_shlex.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/compat/_scons_subprocess.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/compat/_scons_textwrap.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/compat/builtins.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/cpp.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/dblite.py
    branches/blender2.5/blender/scons/scons-local-1.1.0/SCons/exitfuncs.py
    branches/blender2.5/blender/scons/scons-time.py
    branches/blender2.5/blender/scons/scons.py
    branches/blender2.5/blender/scons/sconsign.py

Modified: branches/blender2.5/blender/SConstruct
===================================================================
--- branches/blender2.5/blender/SConstruct	2008-11-07 15:16:30 UTC (rev 17357)
+++ branches/blender2.5/blender/SConstruct	2008-11-07 19:21:52 UTC (rev 17358)
@@ -42,6 +42,8 @@
 import tools.btools
 import tools.bcolors
 
+EnsureSConsVersion(1,0,0)
+
 BlenderEnvironment = tools.Blender.BlenderEnvironment
 btools = tools.btools
 B = tools.Blender
@@ -122,6 +124,7 @@
 	print "Could not create a build environment"
 	Exit()
 
+
 cc = B.arguments.get('CC', None)
 cxx = B.arguments.get('CXX', None)
 if cc:
@@ -136,8 +139,6 @@
 
 env.SConscriptChdir(0)
 
-btools.MainEnv = env
-
 crossbuild = B.arguments.get('BF_CROSS', None)
 if crossbuild and platform!='win32':
 	platform = 'linuxcross'
@@ -173,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')
@@ -223,7 +227,7 @@
 			context.Result(result)
 			return result
 
-		env2 = env.Copy( LIBPATH = env['BF_OPENAL'] ) 
+		env2 = env.Clone( LIBPATH = env['BF_OPENAL'] ) 
 		sconf_temp = mkdtemp()
 		conf = Configure( env2, {'CheckFreeAlut' : CheckFreeAlut}, sconf_temp, '/dev/null' )
 		if conf.CheckFreeAlut( env2 ):
@@ -278,15 +282,16 @@
 	env['WITH_BF_BINRELOC'] = False
 	env['BF_BUILDINFO'] = False
 	env['BF_NO_ELBEEM'] = True
-	
+	env['WITH_BF_PYTHON'] = False
 
-
 # lastly we check for root_build_dir ( we should not do before, otherwise we might do wrong builddir
 #B.root_build_dir = B.arguments.get('BF_BUILDDIR', '..'+os.sep+'build'+os.sep+platform+os.sep)
 B.root_build_dir = env['BF_BUILDDIR']
-env['BUILDDIR'] = B.root_build_dir
+B.doc_build_dir = env['BF_DOCDIR']
 if not B.root_build_dir[-1]==os.sep:
 	B.root_build_dir += os.sep
+if not B.doc_build_dir[-1]==os.sep:
+	B.doc_build_dir += os.sep
 	
 # We do a shortcut for clean when no quicklist is given: just delete
 # builddir without reading in SConscripts
@@ -295,8 +300,18 @@
 	do_clean = True
 
 if not quickie and do_clean:
+	if os.path.exists(B.doc_build_dir):
+		print B.bc.HEADER+'Cleaning doc dir...'+B.bc.ENDC
+		dirs = os.listdir(B.doc_build_dir)
+		for entry in dirs:
+			if os.path.isdir(B.doc_build_dir + entry) == 1:
+				print "clean dir %s"%(B.doc_build_dir+entry)
+				shutil.rmtree(B.doc_build_dir+entry)
+			else: # remove file
+				print "remove file %s"%(B.doc_build_dir+entry)
+				os.remove(B.root_build_dir+entry)
 	if os.path.exists(B.root_build_dir):
-		print B.bc.HEADER+'Cleaning...'+B.bc.ENDC
+		print B.bc.HEADER+'Cleaning build dir...'+B.bc.ENDC
 		dirs = os.listdir(B.root_build_dir)
 		for entry in dirs:
 			if os.path.isdir(B.root_build_dir + entry) == 1:
@@ -322,6 +337,8 @@
 	os.makedirs ( B.root_build_dir + 'extern' )
 	os.makedirs ( B.root_build_dir + 'lib' )
 	os.makedirs ( B.root_build_dir + 'bin' )
+if not os.path.isdir(B.doc_build_dir):
+	os.makedirs ( B.doc_build_dir )
 
 Help(opts.GenerateHelpText(env))
 
@@ -364,7 +381,8 @@
 thestatlibs, thelibincs = B.setup_staticlibs(env)
 thesyslibs = B.setup_syslibs(env)
 
-env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist + thestatlibs, [], thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
+if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
+	env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist + thestatlibs, [], thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
 if env['WITH_BF_PLAYER']:
 	playerlist = B.create_blender_liblist(env, 'player')
 	env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist + thestatlibs, [], thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
@@ -535,6 +553,10 @@
 nsiscmd = env.Command('nsisinstaller', None, nsisaction)
 nsisalias = env.Alias('nsis', nsiscmd)
 
+if 'blender' in B.targets:
+	blenderexe= env.Alias('blender', B.program_list)
+	Depends(blenderexe,installtarget)
+
 if env['WITH_BF_PLAYER']:
 	blenderplayer = env.Alias('blenderplayer', B.program_list)
 	Depends(blenderplayer,installtarget)
@@ -561,5 +583,7 @@
 # TODO: build stubs and link into blenderplayer
 
 #------------ EPYDOC
-# TODO: run epydoc
+if env['WITH_BF_DOCS']:
+	SConscript('source/blender/python/api2_2x/doc/SConscript')
+	SConscript('source/gameengine/PyDoc/SConscript')
 

Modified: branches/blender2.5/blender/config/darwin-config.py
===================================================================
--- branches/blender2.5/blender/config/darwin-config.py	2008-11-07 15:16:30 UTC (rev 17357)
+++ branches/blender2.5/blender/config/darwin-config.py	2008-11-07 19:21:52 UTC (rev 17358)
@@ -1,21 +1,63 @@
-LCGDIR = '#../lib/darwin-6.1-powerpc'
+#
+# Note : if you want to alter this file
+# copy it as a whole in the upper folder
+# as user-config.py
+# dont create a new file with only some
+# vars changed.
+
+import commands
+
+# IMPORTANT NOTE : OFFICIAL BUILDS SHOULD BE DONE WITH SDKs
+USE_SDK=True
+
+BF_PYTHON_VERSION = '2.3'
+
+cmd = 'uname -p'
+MAC_PROC=commands.getoutput(cmd) 
+cmd = 'uname -r'
+cmd_res=commands.getoutput(cmd) 
+if cmd_res[0]=='7':
+	MAC_CUR_VER='10.3'
+elif cmd_res[0]=='8':
+	MAC_CUR_VER='10.4'
+else:
+	MAC_CUR_VER='10.5'
+
+if MAC_PROC == 'powerpc':
+	LCGDIR = '#../lib/darwin-6.1-powerpc'
+else :
+	LCGDIR = '#../lib/darwin-8.x.i386'
 LIBDIR = '${LCGDIR}'
 
+if MAC_PROC== 'powerpc' and BF_PYTHON_VERSION == '2.3':
+	MAC_MIN_VERS = '10.3'
+	MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk'
+else:
+	MAC_MIN_VERS = '10.4'
+	MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
+
+
 # enable ffmpeg  support
-WITH_BF_FFMPEG = 'true'  # -DWITH_FFMPEG
-BF_FFMPEG = LIBDIR +'/ffmpeg'
+WITH_BF_FFMPEG = True  # -DWITH_FFMPEG
+BF_FFMPEG = "#extern/ffmpeg"
 BF_FFMPEG_INC = '${BF_FFMPEG}/include'
-BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB = 'avformat.a avcodec.a avutil.a'
+if USE_SDK==True:
+	BF_FFMPEG_EXTRA = '-isysroot '+MACOSX_SDK+' -mmacosx-version-min='+MAC_MIN_VERS
+#BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
+#BF_FFMPEG_LIB = 'avformat.a avcodec.a avutil.a'
 
-WITH_BF_VERSE = 'false'
+WITH_BF_VERSE = False
 BF_VERSE = "#extern/verse/dist"
 BF_VERSE_LIBPATH = "${BF_BUILDDIR}/extern/verse/dist"
 BF_VERSE_INCLUDE = BF_VERSE
 BF_VERSE_LIBS = "libverse"
 
-# python.org libs install in /library 
-BF_PYTHON_VERSION = '2.3'
+# python.org libs install in /library we want to use that for 2.5 
+#
+# if you want py2.5 on leopard without installing
+# change value to BF_PYTHON = '/Library/Frameworks/Python.framework/Versions/'
+# BEWARE: in that case it will work only on leopard
+
 if BF_PYTHON_VERSION=='2.3':
 	BF_PYTHON = '/System/Library/Frameworks/Python.framework/Versions/'
 else:
@@ -25,43 +67,66 @@
 BF_PYTHON_BINARY = '${BF_PYTHON}${BF_PYTHON_VERSION}/bin/python${BF_PYTHON_VERSION}'
 BF_PYTHON_LIB = ''
 BF_PYTHON_LIBPATH = '${BF_PYTHON}${BF_PYTHON_VERSION}/lib/python${BF_PYTHON_VERSION}/config'
-BF_PYTHON_LINKFLAGS = '-u __dummy -u _PyMac_Error -framework System -framework Python'
+BF_PYTHON_LINKFLAGS = '-u _PyMac_Error -framework System -framework Python'
+if MAC_CUR_VER=='10.3' or  MAC_CUR_VER=='10.4':
+	BF_PYTHON_LINKFLAGS ='-u __dummy '+BF_PYTHON_LINKFLAGS
+	
+BF_QUIET = '1'
+WITH_BF_OPENMP = '0'
 
-WITH_BF_OPENAL = 'true'
+# Note : should be true, but openal simply dont work on intel
+if MAC_PROC == 'i386':
+	WITH_BF_OPENAL = False
+else:
+	WITH_BF_OPENAL = True
 #different lib must be used  following version of gcc
 # for gcc 3.3
 #BF_OPENAL = LIBDIR + '/openal'
-# for gcc 3.4
-BF_OPENAL = '#../lib/darwin-8.0.0-powerpc/openal'
+# for gcc 3.4 and ulterior
+if MAC_PROC == 'powerpc':
+	BF_OPENAL = '#../lib/darwin-8.0.0-powerpc/openal'
+else :
+	BF_OPENAL = LIBDIR + '/openal'
 
+WITH_BF_STATICOPENAL = False
 BF_OPENAL_INC = '${BF_OPENAL}/include'
 BF_OPENAL_LIB = 'openal'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
 
-WITH_BF_SDL = 'true'
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_CXX = '/usr'
+WITH_BF_STATICCXX = False
+BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
+WITH_BF_SDL = True
 BF_SDL = LIBDIR + '/sdl' #$(shell sdl-config --prefix)
 BF_SDL_INC = '${BF_SDL}/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
 BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
 BF_SDL_LIBPATH = '${BF_SDL}/lib'
 
-WITH_BF_FMOD = 'false'
+WITH_BF_FMOD = False
 BF_FMOD = LIBDIR + '/fmod'
 
-WITH_BF_OPENEXR = 'true'
+WITH_BF_OPENEXR = True
+WITH_BF_STATICOPENEXR = False
 BF_OPENEXR = '${LCGDIR}/openexr'
 BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'
 BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread'
 BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
 
-WITH_BF_DDS = 'true'
+WITH_BF_DDS = True
 
-WITH_BF_JPEG = 'true'
+WITH_BF_JPEG = True
 BF_JPEG = LIBDIR + '/jpeg'
 BF_JPEG_INC = '${BF_JPEG}/include'
 BF_JPEG_LIB = 'jpeg'
 BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
 
-WITH_BF_PNG = 'true'
+WITH_BF_PNG = True
 BF_PNG = LIBDIR + '/png'
 BF_PNG_INC = '${BF_PNG}/include'
 BF_PNG_LIB = 'png'
@@ -70,32 +135,32 @@
 BF_TIFF = LIBDIR + '/tiff'
 BF_TIFF_INC = '${BF_TIFF}/include'
 
-WITH_BF_ZLIB = 'true'
+WITH_BF_ZLIB = True
 BF_ZLIB = '/usr'
 BF_ZLIB_INC = '${BF_ZLIB}/include'
 BF_ZLIB_LIB = 'z'
 
-WITH_BF_INTERNATIONAL = 'true'
+WITH_BF_INTERNATIONAL = True
 
 BF_GETTEXT = LIBDIR + '/gettext'
 BF_GETTEXT_INC = '${BF_GETTEXT}/include'
 BF_GETTEXT_LIB = 'intl'
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
-WITH_BF_FTGL = 'true'
+WITH_BF_FTGL = True
 BF_FTGL = '#extern/bFTGL'
 BF_FTGL_INC = '${BF_FTGL}/include'
 BF_FTGL_LIB = 'extern_ftgl'
 
-WITH_BF_GAMEENGINE='true'
-WITH_BF_PLAYER='true'
+WITH_BF_GAMEENGINE=True
+WITH_BF_PLAYER=True
 
-WITH_BF_ODE = 'false'
+WITH_BF_ODE = False
 BF_ODE = LIBDIR + '/ode'
 BF_ODE_INC = '${BF_ODE}/include'
 BF_ODE_LIB = '${BF_ODE}/lib/libode.a'
 
-WITH_BF_BULLET = 'true'
+WITH_BF_BULLET = True
 BF_BULLET = '#extern/bullet2/src'
 BF_BULLET_INC = '${BF_BULLET}'
 BF_BULLET_LIB = 'extern_bullet'
@@ -104,9 +169,9 @@
 BF_SOLID_INC = '${BF_SOLID}'
 BF_SOLID_LIB = 'extern_solid'
 

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list