From bcee2343ead4dd2d737ca8add4d9264f111da0bc Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 16 Mar 2011 15:44:17 +0000 Subject: Mac OS X cmake changes and bundle fixes For cmake users, you should now use "make install" instead of "make". This was already changed for Linux and Windows. Same for Xcode, use the install target. Changes: * CMake install mechanism, resulting bundle was verified to be indentical here. * For cmake, include Info.plist in bundle using builtin mechanism for that. There was some code in packaging.cmake, but it wasn't correct as these properties need to be set on the executable. * For scons, fix app bundle version, was still using removed release/VERSION. * Remove unused blendercreator.app and blenderpublisher.app. * Fix Info.plist being set as a binary file in svn, should be plain text. --- build_files/scons/tools/Blender.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'build_files/scons') diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index c1b0a10d284..1d276d77466 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -488,7 +488,8 @@ def AppIt(target=None, source=None, env=None): if os.path.isdir(cmd): shutil.rmtree(cmd) shutil.copytree(sourcedir, cmd) - cmd = "cat %s | sed s/VERSION/`cat release/VERSION`/ | sed s/DATE/`date +'%%Y-%%b-%%d'`/ > %s"%(sourceinfo,targetinfo) + 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) commands.getoutput(cmd) cmd = 'cp %s/%s %s/%s.app/Contents/MacOS/%s'%(builddir, binary,installdir, binary, binary) commands.getoutput(cmd) -- cgit v1.2.3