diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2010-07-05 11:06:19 +0400 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2010-07-05 11:06:19 +0400 |
commit | 1c3512121357c37cf6a7b8b22e627a77c8cf02e5 (patch) | |
tree | 7dcb6a54afc05e3858532d92327db7bb24e7dc5a /tools | |
parent | b5043c7dd552731a15376c63927e0371b709212a (diff) |
== SCons ==
Updated to comply with datafiles filepath patch.
I've tried to do some changes for OSX too, but I'm not sure if they're correct,
so OSX people, please test and report.
Diffstat (limited to 'tools')
-rw-r--r-- | tools/Blender.py | 40 | ||||
-rw-r--r-- | tools/btools.py | 3 |
2 files changed, 23 insertions, 20 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index cd6e4652754..9d4dab65770 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -31,6 +31,8 @@ import SCons.Builder import SCons.Tool import bcolors bc = bcolors.bcolors() +import btools +VERSION = btools.VERSION Split = SCons.Util.Split Action = SCons.Action.Action @@ -466,7 +468,7 @@ def WinPyBundle(target=None, source=None, env=None): py_target = env.subst( env['BF_INSTALLDIR'] ) if py_target[0]=='#': py_target=py_target[1:] - py_target+= '/.blender/python/lib/' + py_target = os.path.join(py_target, VERSION, 'python', 'lib') def printexception(func,path,ex): if os.path.exists(path): #do not report if path does not exist. eg on a fresh build. print str(func) + ' failed on ' + str(path) @@ -521,27 +523,27 @@ def AppIt(target=None, source=None, env=None): commands.getoutput(cmd) cmd = 'cp %s/%s %s/%s.app/Contents/MacOS/%s'%(builddir, binary,builddir, binary, binary) commands.getoutput(cmd) - cmd = 'mkdir %s/%s.app/Contents/MacOS/.blender/'%(builddir, binary) + cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/'%(builddir, binary, VERSION) # print cmd commands.getoutput(cmd) - cmd = builddir + '/%s.app/Contents/MacOS/.blender'%binary - shutil.copy(bldroot + '/bin/.blender/.bfont.ttf', cmd) - shutil.copy(bldroot + '/bin/.blender/.Blanguages', cmd) - cmd = 'cp -R %s/bin/.blender/locale %s/%s.app/Contents/Resources/'%(bldroot,builddir,binary) - commands.getoutput(cmd) - cmd = 'cp -R %s/bin/.blender/locale %s/%s.app/Contents/MacOS/.blender/'%(bldroot,builddir,binary) - commands.getoutput(cmd) - cmd = 'cp %s/bin/.blender/.Blanguages %s/%s.app/Contents/Resources/'%(bldroot,builddir,binary) - commands.getoutput(cmd) - cmd = 'mkdir %s/%s.app/Contents/MacOS/.blender/python/'%(builddir,binary) - commands.getoutput(cmd) - cmd = 'unzip -q %s/release/%s -d %s/%s.app/Contents/MacOS/.blender/python/'%(libdir,python_zip,builddir,binary) + cmd = builddir + '/%s.app/Contents/MacOS/VERSION'%(binary,VERSION) + shutil.copy(bldroot + '/bin/'+VERSION+'/.bfont.ttf', cmd) + shutil.copy(bldroot + '/bin/'+VERSION+'/.Blanguages', cmd) + cmd = 'cp -R %s/bin/%s/locale %s/%s.app/Contents/Resources/'%(bldroot,VERSION,builddir,binary) + commands.getoutput(cmd) + cmd = 'cp -R %s/bin/%s/locale %s/%s.app/Contents/MacOS/%s/'%(bldroot,VERSION,builddir,binary,VERSION) + commands.getoutput(cmd) + cmd = 'cp %s/bin/%s/.Blanguages %s/%s.app/Contents/Resources/'%(bldroot,VERSION,builddir,binary) + commands.getoutput(cmd) + cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/python/'%(builddir,binary, VERSION) + commands.getoutput(cmd) + cmd = 'unzip -q %s/release/%s -d %s/%s.app/Contents/MacOS/%s/python/'%(libdir,python_zip,builddir,binary,VERSION) commands.getoutput(cmd) - cmd = 'cp -R %s/release/scripts %s/%s.app/Contents/MacOS/.blender/'%(bldroot,builddir,binary) + cmd = 'cp -R %s/release/scripts %s/%s.app/Contents/MacOS/%s/'%(bldroot,builddir,binary,VERSION) commands.getoutput(cmd) - cmd = 'cp -R %s/release/ui %s/%s.app/Contents/MacOS/.blender/'%(bldroot,builddir,binary) + cmd = 'cp -R %s/release/ui %s/%s.app/Contents/MacOS/%s/'%(bldroot,builddir,binary,VERSION) commands.getoutput(cmd) - cmd = 'cp -R %s/release/io %s/%s.app/Contents/MacOS/.blender/'%(bldroot,builddir,binary) + cmd = 'cp -R %s/release/io %s/%s.app/Contents/MacOS/%s/'%(bldroot,builddir,binary,VERSION) commands.getoutput(cmd) cmd = 'chmod +x %s/%s.app/Contents/MacOS/%s'%(builddir,binary, binary) commands.getoutput(cmd) @@ -559,7 +561,7 @@ def my_unixpybundle_print(target, source, env): def UnixPyBundle(target=None, source=None, env=None): # Any Unix except osx - #-- .blender/python/lib/python3.1 + #-- VERSION/python/lib/python3.1 import commands @@ -568,7 +570,7 @@ def UnixPyBundle(target=None, source=None, env=None): 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'], '.blender') + else: 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/tools/btools.py b/tools/btools.py index a703103c59c..cb3ccd3ba03 100644 --- a/tools/btools.py +++ b/tools/btools.py @@ -1,4 +1,3 @@ - import os import os.path import SCons.Options @@ -16,6 +15,8 @@ import sys Variables = SCons.Variables BoolVariable = SCons.Variables.BoolVariable +VERSION = '2.52' # This is used in creating the local config directories + def print_arguments(args, bc): if len(args): for k,v in args.iteritems(): |