Revision: 40403
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40403
Author: blendix
Date: 2011-09-20 15:55:28 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
Internationalization: fix OS X scons install to copy font and language files
correctly.
Modified Paths:
--------------
trunk/blender/build_files/scons/tools/Blender.py
Modified: trunk/blender/build_files/scons/tools/Blender.py
===================================================================
--- trunk/blender/build_files/scons/tools/Blender.py 2011-09-20 15:30:18 UTC
(rev 40402)
+++ trunk/blender/build_files/scons/tools/Blender.py 2011-09-20 15:55:28 UTC
(rev 40403)
@@ -564,12 +564,12 @@
# print cmd
commands.getoutput(cmd)
cmd = installdir + '/%s.app/Contents/MacOS/%s'%(binary,VERSION)
- shutil.copy(bldroot + '/release/bin/.blender/.bfont.ttf', cmd)
- shutil.copy(bldroot + '/release/bin/.blender/.Blanguages', cmd)
- cmd = 'cp -R %s/release/bin/%s/locale
%s/%s.app/Contents/Resources/'%(bldroot,VERSION,installdir,binary)
+ cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/datafiles'%(installdir, binary,
VERSION)
commands.getoutput(cmd)
- cmd = 'cp -R %s/release/bin/%s/locale
%s/%s.app/Contents/MacOS/%s/'%(bldroot,VERSION,installdir,binary,VERSION)
+ cmd = 'cp -R %s/release/bin/.blender/locale
%s/%s.app/Contents/MacOS/%s/datafiles/'%(bldroot,installdir,binary,VERSION)
commands.getoutput(cmd)
+ cmd = 'cp -R %s/release/bin/.blender/fonts
%s/%s.app/Contents/MacOS/%s/datafiles/'%(bldroot,installdir,binary,VERSION)
+ commands.getoutput(cmd)
cmd = 'cp %s/release/bin/%s/.Blanguages
%s/%s.app/Contents/Resources/'%(bldroot,VERSION,installdir,binary)
commands.getoutput(cmd)
if env['WITH_OSX_STATICPYTHON']:
@@ -581,10 +581,6 @@
if binary == 'blender':#not copy everything for blenderplayer
cmd = 'cp -R %s/release/scripts
%s/%s.app/Contents/MacOS/%s/'%(bldroot,installdir,binary,VERSION)
commands.getoutput(cmd)
- cmd = 'cp -R %s/release/ui
%s/%s.app/Contents/MacOS/%s/'%(bldroot,installdir,binary,VERSION)
- commands.getoutput(cmd)
- cmd = 'cp -R %s/release/io
%s/%s.app/Contents/MacOS/%s/'%(bldroot,installdir,binary,VERSION)
- commands.getoutput(cmd)
cmd = 'chmod +x %s/%s.app/Contents/MacOS/%s'%(installdir,binary, binary)
commands.getoutput(cmd)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
