traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged revisions 70741 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70741 | ronald.oussoren | 2009-03-30 14:56:25 -0500 (Mon, 30 Mar 2009) | 2 lines

  Fixes issue 5270
........
This commit is contained in:
Ronald Oussoren 2009-03-30 20:00:00 +00:00
parent 8593a75688
commit f29b6b4b77
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Mac/Makefile.in
View File

@ -14,6 +14,7 @@ DESTDIR=
LDFLAGS=@LDFLAGS@
FRAMEWORKUNIXTOOLSPREFIX=@FRAMEWORKUNIXTOOLSPREFIX@
PYTHONFRAMEWORK=@PYTHONFRAMEWORK@
PYTHONFRAMEWORKIDENTIFIER=@PYTHONFRAMEWORKIDENTIFIER@
# These are normally glimpsed from the previous set
@ -206,6 +207,12 @@ install_Python:
done; \
done
$(INSTALL_PROGRAM) $(STRIPFLAG) $(BUILDPYTHON) "$(DESTDIR)$(APPINSTALLDIR)/Contents/MacOS/$(PYTHONFRAMEWORK)"
sed -e "s!%bundleid%!$(PYTHONFRAMEWORKIDENTIFIER)!g" \
-e "s!%version%!`$(RUNSHARED) $(BUILDPYTHON) \
-c 'import platform; print(platform.python_version())'`!g" \
< "$(DESTDIR)$(APPINSTALLDIR)/Contents/Info.plist.in" \
> "$(DESTDIR)$(APPINSTALLDIR)/Contents/Info.plist"
rm "$(DESTDIR)$(APPINSTALLDIR)/Contents/Info.plist.in"
install_Python4way: install_Python
lipo -extract i386 -extract ppc7400 -output "$(DESTDIR)$(APPINSTALLDIR)/Contents/MacOS/$(PYTHONFRAMEWORK)-32" "$(DESTDIR)$(APPINSTALLDIR)/Contents/MacOS/$(PYTHONFRAMEWORK)"

10
Mac/Resources/app/Info.plist.in
View File

@ -20,7 +20,7 @@
<key>CFBundleExecutable</key>
<string>Python</string>
<key>CFBundleGetInfoString</key>
<string>@VERSION@, (c) 2004 Python Software Foundation.</string>
<string>%version%, (c) 2004-2009 Python Software Foundation.</string>
<key>CFBundleHelpBookFolder</key>
<array>
<string>Documentation</string>
@ -33,21 +33,21 @@
<key>CFBundleIconFile</key>
<string>PythonInterpreter.icns</string>
<key>CFBundleIdentifier</key>
<string>@PYTHONFRAMEWORKIDENTIFIER@.app</string>
<string>%bundleid%</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
<string>@VERSION@, (c) 2004-2008 Python Software Foundation.</string>
<string>%version%, (c) 2004-2009 Python Software Foundation.</string>
<key>CFBundleName</key>
<string>Python</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>@VERSION@</string>
<string>%version%</string>
<key>CFBundleSignature</key>
<string>PytX</string>
<key>CFBundleVersion</key>
<string>@VERSION@</string>
<string>%version%</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSRequiresCarbon</key>