[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35893] trunk/blender/build_files/scons/ tools/Blender.py: Apply patch [#26660] Scons build on OSX fails to create Info.plist file fix

[Nathan Letwory]

Revision: 35893
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35893
Author:   jesterking
Date:     2011-03-30 05:44:01 +0000 (Wed, 30 Mar 2011)
Log Message:
-----------
Apply patch [#26660] Scons build on OSX fails to create Info.plist file fix
provided by Mike Sloman

from the patch report:

When building on Mac OSX with SCONS the Info.plist file is zero length and thus OSX cannot identify icons and file type associations.

The problems was in the execution of the "date" command to add times in the modified bundle name strings passed to sed. This failed and thus the info.plist file was overwritten with 0 length file.

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-03-30 05:08:52 UTC (rev 35892)
+++ trunk/blender/build_files/scons/tools/Blender.py	2011-03-30 05:44:01 UTC (rev 35893)
@@ -489,7 +489,7 @@
         shutil.rmtree(cmd)
     shutil.copytree(sourcedir, cmd)
     cmd = "cat %s | sed s/\$\{MACOSX_BUNDLE_SHORT_VERSION_STRING\}/%s/ | "%(sourceinfo,VERSION)
-    cmd += "sed s/\$\{MACOSX_BUNDLE_LONG_VERSION_STRING\}/%s,\ `date +'%%Y-%%b-%%d'`/ > %s"%(VERSION,targetinfo)
+    cmd += "sed s/\$\{MACOSX_BUNDLE_LONG_VERSION_STRING\}/%s,\ %s/g > %s"%(VERSION,time.strftime("%Y-%b-%d"),targetinfo)
     commands.getoutput(cmd)
     cmd = 'cp %s/%s %s/%s.app/Contents/MacOS/%s'%(builddir, binary,installdir, binary, binary)
     commands.getoutput(cmd)