Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Letwory <nathan@letworyinteractive.com>2011-03-30 09:44:01 +0400
committerNathan Letwory <nathan@letworyinteractive.com>2011-03-30 09:44:01 +0400
commit5b19ec3559bb552550b12f7f2fb3dc16a3278621 (patch)
tree02f6369eb308820712c4ac372506a09c8278a6c0 /build_files
parentf8b42877b0fe07883d5ccb83189d638e83eee9e9 (diff)
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.
Diffstat (limited to 'build_files')
-rw-r--r--build_files/scons/tools/Blender.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py
index 1d276d77466..ad4df1a60c1 100644
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -489,7 +489,7 @@ def AppIt(target=None, source=None, env=None):
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)