[Bf-blender-cvs] [9e924c8] master: OSX/scons: cp needs the targetdir to be created ( ditto does it itself ), changing the order of commands let us use cp again

Jens Verwiebe noreply at git.blender.org
Mon Feb 24 12:10:03 CET 2014


Commit: 9e924c8ffed40ff1419f3321c87da725023d4708
Author: Jens Verwiebe
Date:   Mon Feb 24 12:09:46 2014 +0100
https://developer.blender.org/rB9e924c8ffed40ff1419f3321c87da725023d4708

OSX/scons: cp needs the targetdir to be created ( ditto does it itself ),
changing the order of commands let us use cp again

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

M	build_files/scons/tools/Blender.py

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

diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py
index cc0bfa8..cc60b88 100644
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -676,12 +676,12 @@ def AppIt(target=None, source=None, env=None):
         commands.getoutput(cmd)
         cmd = 'cp -R %s/release/datafiles/fonts %s/%s.app/Contents/MacOS/%s/datafiles/'%(bldroot,installdir,binary,VERSION)
         commands.getoutput(cmd)
-        cmd = 'ditto %s/release/datafiles/locale/languages %s/%s.app/Contents/MacOS/%s/datafiles/locale/'%(bldroot, installdir, binary, VERSION)
-        commands.getoutput(cmd)
         mo_dir = os.path.join(builddir[:-4], "locale")
         for f in os.listdir(mo_dir):
             cmd = 'ditto %s/%s %s/%s.app/Contents/MacOS/%s/datafiles/locale/%s/LC_MESSAGES/blender.mo'%(mo_dir, f, installdir, binary, VERSION, f[:-3])
             commands.getoutput(cmd)
+        cmd = 'cp %s/release/datafiles/locale/languages %s/%s.app/Contents/MacOS/%s/datafiles/locale/'%(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)




More information about the Bf-blender-cvs mailing list