[Bf-blender-cvs] [c239baa] master: OSX/scons: small reorder and spelling

Jens Verwiebe noreply at git.blender.org
Sat Nov 16 22:14:06 CET 2013


Commit: c239baa0badfdc0170159d2bd45c05618f6ed8f9
Author: Jens Verwiebe
Date:   Sat Nov 16 22:13:51 2013 +0100
http://developer.blender.org/rBc239baa0badfdc0170159d2bd45c05618f6ed8f9

OSX/scons: small reorder and spelling

===================================================================

M	build_files/scons/tools/Blender.py
M	intern/locale/SConscript

===================================================================

diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py
index 45b65b5..77d2072 100644
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -643,6 +643,8 @@ def AppIt(target=None, source=None, env=None):
         commands.getoutput(cmd)
         cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/datafiles/locale'%(installdir, binary, VERSION)
         commands.getoutput(cmd)
+        cmd = 'cp -R %s/release/datafiles/fonts %s/%s.app/Contents/MacOS/%s/datafiles/'%(bldroot,installdir,binary,VERSION)
+        commands.getoutput(cmd)
         mo_dir = os.path.join(builddir[:-4], "locale")
         for f in os.listdir(mo_dir):
             cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/datafiles/locale/%s'%(installdir, binary, VERSION, f[:-3])
@@ -653,8 +655,6 @@ def AppIt(target=None, source=None, env=None):
             commands.getoutput(cmd)
         cmd = 'cp -R %s/release/datafiles/locale/languages %s/%s.app/Contents/MacOS/%s/datafiles/locale/'%(bldroot, installdir, binary, VERSION)
         commands.getoutput(cmd)
-        cmd = 'cp -R %s/release/datafiles/fonts %s/%s.app/Contents/MacOS/%s/datafiles/'%(bldroot,installdir,binary,VERSION)
-        commands.getoutput(cmd)
         if env['WITH_BF_OCIO']:
             cmd = 'cp -R %s/release/datafiles/colormanagement %s/%s.app/Contents/MacOS/%s/datafiles/'%(bldroot,installdir,binary,VERSION)
             commands.getoutput(cmd)
diff --git a/intern/locale/SConscript b/intern/locale/SConscript
index 3fb3e1f..42941e2 100644
--- a/intern/locale/SConscript
+++ b/intern/locale/SConscript
@@ -60,7 +60,7 @@ if env['WITH_BF_INTERNATIONAL']:
         msgfmt_tool = env.Clone()
         targetpath = root_build_dir + '/msgfmt'
         if env['OURPLATFORM'] == 'darwin':
-            msgfmt_tool.Replace( LINKFLAGS = '/usr/lib/libgcc_s.1.dylib /usr/lib/libstdc++.6.dylib /usr/lib/libSystem.B.dylib') # only need this dependencies
+            msgfmt_tool.Replace( LINKFLAGS = '/usr/lib/libgcc_s.1.dylib /usr/lib/libstdc++.6.dylib /usr/lib/libSystem.B.dylib') # only need these dependencies
 
         msgfmt_target = msgfmt_tool.Program(target = targetpath, source = ['msgfmt.cc'])




More information about the Bf-blender-cvs mailing list