[Python-checkins] r70745 - in python/branches/py3k: Mac/Makefile.in Mac/Resources/app/Info.plist.in
ronald.oussoren
python-checkins at python.org
Mon Mar 30 22:00:00 CEST 2009
Author: ronald.oussoren
Date: Mon Mar 30 22:00:00 2009
New Revision: 70745
Log:
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
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Mac/Makefile.in
python/branches/py3k/Mac/Resources/app/Info.plist.in
Modified: python/branches/py3k/Mac/Makefile.in
==============================================================================
--- python/branches/py3k/Mac/Makefile.in (original)
+++ python/branches/py3k/Mac/Makefile.in Mon Mar 30 22:00:00 2009
@@ -14,6 +14,7 @@
LDFLAGS=@LDFLAGS@
FRAMEWORKUNIXTOOLSPREFIX=@FRAMEWORKUNIXTOOLSPREFIX@
PYTHONFRAMEWORK=@PYTHONFRAMEWORK@
+PYTHONFRAMEWORKIDENTIFIER=@PYTHONFRAMEWORKIDENTIFIER@
# These are normally glimpsed from the previous set
@@ -206,6 +207,12 @@
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)"
Modified: python/branches/py3k/Mac/Resources/app/Info.plist.in
==============================================================================
--- python/branches/py3k/Mac/Resources/app/Info.plist.in (original)
+++ python/branches/py3k/Mac/Resources/app/Info.plist.in Mon Mar 30 22:00:00 2009
@@ -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 at .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>
More information about the Python-checkins
mailing list