From 750e92043e0811fe990291d113ecca9650ac767c Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Wed, 7 Jun 2006 19:38:53 +0000 Subject: - Patch the correct version of python in the Info.plists at build time, instead of relying on a maintainer to update them before releases. - Remove the now empty Mac/OSX directory --- Mac/IDLE/Info.plist | 55 ---------------------------------- Mac/IDLE/Info.plist.in | 55 ++++++++++++++++++++++++++++++++++ Mac/IDLE/Makefile.in | 9 ++++-- Mac/PythonLauncher/Info.plist | 65 ---------------------------------------- Mac/PythonLauncher/Info.plist.in | 65 ++++++++++++++++++++++++++++++++++++++++ Mac/PythonLauncher/Makefile.in | 7 +++-- 6 files changed, 132 insertions(+), 124 deletions(-) delete mode 100644 Mac/IDLE/Info.plist create mode 100644 Mac/IDLE/Info.plist.in delete mode 100644 Mac/PythonLauncher/Info.plist create mode 100644 Mac/PythonLauncher/Info.plist.in diff --git a/Mac/IDLE/Info.plist b/Mac/IDLE/Info.plist deleted file mode 100644 index bbe2ea1..0000000 --- a/Mac/IDLE/Info.plist +++ /dev/null @@ -1,55 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleDocumentTypes - - - CFBundleTypeExtensions - - py - pyw - - CFBundleTypeIconFile - PythonSource.icns - CFBundleTypeName - Python Script - CFBundleTypeRole - Editor - - - CFBundleTypeExtensions - - pyc - pyo - - CFBundleTypeIconFile - PythonCompiled.icns - CFBundleTypeName - Python Bytecode Document - CFBundleTypeRole - Editor - - - CFBundleExecutable - IDLE - CFBundleGetInfoString - 2.5, © 001-2006 Python Software Foundation - CFBundleIconFile - IDLE.icns - CFBundleIdentifier - org.python.IDLE - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - IDLE - CFBundlePackageType - APPL - CFBundleShortVersionString - 2.5 - CFBundleVersion - 2.5 - - diff --git a/Mac/IDLE/Info.plist.in b/Mac/IDLE/Info.plist.in new file mode 100644 index 0000000..58e913c --- /dev/null +++ b/Mac/IDLE/Info.plist.in @@ -0,0 +1,55 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleDocumentTypes + + + CFBundleTypeExtensions + + py + pyw + + CFBundleTypeIconFile + PythonSource.icns + CFBundleTypeName + Python Script + CFBundleTypeRole + Editor + + + CFBundleTypeExtensions + + pyc + pyo + + CFBundleTypeIconFile + PythonCompiled.icns + CFBundleTypeName + Python Bytecode Document + CFBundleTypeRole + Editor + + + CFBundleExecutable + IDLE + CFBundleGetInfoString + %VERSION%, © 001-2006 Python Software Foundation + CFBundleIconFile + IDLE.icns + CFBundleIdentifier + org.python.IDLE + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + IDLE + CFBundlePackageType + APPL + CFBundleShortVersionString + %VERSION% + CFBundleVersion + %VERSION% + + diff --git a/Mac/IDLE/Makefile.in b/Mac/IDLE/Makefile.in index 7359aae..2f63892 100644 --- a/Mac/IDLE/Makefile.in +++ b/Mac/IDLE/Makefile.in @@ -39,16 +39,21 @@ clean: IDLE.app: \ $(srcdir)/../Icons/IDLE.icns $(srcdir)/idlemain.py \ $(srcdir)/../Icons/PythonSource.icns \ - $(srcdir)/../Icons/PythonCompiled.icns + $(srcdir)/../Icons/PythonCompiled.icns Info.plist rm -fr IDLE.app $(RUNSHARED) $(BUILDPYTHON) $(BUNDLEBULDER) \ --builddir=. \ --name=IDLE \ --link-exec \ - --plist=$(srcdir)/Info.plist \ + --plist=Info.plist \ --mainprogram=$(srcdir)/idlemain.py \ --iconfile=$(srcdir)/../Icons/IDLE.icns \ --resource=$(srcdir)/../Icons/PythonSource.icns \ --resource=$(srcdir)/../Icons/PythonCompiled.icns \ --python=$(prefix)/Resources/Python.app/Contents/MacOS/Python \ build + + +Info.plist: $(srcdir)/Info.plist.in + sed 's/%VERSION%/'"`$(RUNSHARED) $(BUILDPYTHON) -c 'import platform; print platform.python_version()'`"'/g' < $(srcdir)/Info.plist.in > Info.plist + diff --git a/Mac/PythonLauncher/Info.plist b/Mac/PythonLauncher/Info.plist deleted file mode 100644 index 1dd795f..0000000 --- a/Mac/PythonLauncher/Info.plist +++ /dev/null @@ -1,65 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleDocumentTypes - - - CFBundleTypeExtensions - - py - pyw - - CFBundleTypeIconFile - PythonSource.icns - CFBundleTypeName - Python Script - CFBundleTypeRole - Viewer - NSDocumentClass - MyDocument - - - CFBundleTypeExtensions - - pyc - pyo - - CFBundleTypeIconFile - PythonCompiled.icns - CFBundleTypeName - Python Bytecode Document - CFBundleTypeRole - Viewer - NSDocumentClass - MyDocument - - - CFBundleExecutable - PythonLauncher - CFBundleGetInfoString - 2.5, © 001-2006 Python Software Foundation - CFBundleIconFile - PythonLauncher.icns - CFBundleIdentifier - org.python.PythonLauncher - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - Python Launcher - CFBundlePackageType - APPL - CFBundleShortVersionString - 2.5 - CFBundleSignature - PytL - CFBundleVersion - 2.5 - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - - diff --git a/Mac/PythonLauncher/Info.plist.in b/Mac/PythonLauncher/Info.plist.in new file mode 100644 index 0000000..3c726d7 --- /dev/null +++ b/Mac/PythonLauncher/Info.plist.in @@ -0,0 +1,65 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleDocumentTypes + + + CFBundleTypeExtensions + + py + pyw + + CFBundleTypeIconFile + PythonSource.icns + CFBundleTypeName + Python Script + CFBundleTypeRole + Viewer + NSDocumentClass + MyDocument + + + CFBundleTypeExtensions + + pyc + pyo + + CFBundleTypeIconFile + PythonCompiled.icns + CFBundleTypeName + Python Bytecode Document + CFBundleTypeRole + Viewer + NSDocumentClass + MyDocument + + + CFBundleExecutable + PythonLauncher + CFBundleGetInfoString + %VERSION%, © 001-2006 Python Software Foundation + CFBundleIconFile + PythonLauncher.icns + CFBundleIdentifier + org.python.PythonLauncher + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + Python Launcher + CFBundlePackageType + APPL + CFBundleShortVersionString + %VERSION% + CFBundleSignature + PytL + CFBundleVersion + %VERSION% + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + diff --git a/Mac/PythonLauncher/Makefile.in b/Mac/PythonLauncher/Makefile.in index 19763a6..b4b126c 100644 --- a/Mac/PythonLauncher/Makefile.in +++ b/Mac/PythonLauncher/Makefile.in @@ -35,7 +35,7 @@ clean: rm -f *.o "Python Launcher" rm -rf "Python Launcher.app" -Python\ Launcher.app: \ +Python\ Launcher.app: Info.plist \ Python\ Launcher $(srcdir)/../Icons/PythonLauncher.icns \ $(srcdir)/../Icons/PythonSource.icns \ $(srcdir)/../Icons/PythonCompiled.icns \ @@ -51,7 +51,7 @@ Python\ Launcher.app: \ --resource=$(srcdir)/../Icons/PythonCompiled.icns \ --resource=$(srcdir)/English.lproj \ --resource=$(srcdir)/factorySettings.plist \ - --plist=$(srcdir)/Info.plist \ + --plist Info.plist \ build find "Python Launcher.app" -name '.svn' -print0 | xargs -0 rm -r @@ -76,3 +76,6 @@ main.o: $(srcdir)/main.m Python\ Launcher: $(OBJECTS) $(CC) $(LDFLAGS) -o "Python Launcher" $(OBJECTS) -framework AppKit -framework Carbon + +Info.plist: $(srcdir)/Info.plist.in + sed 's/%VERSION%/'"`$(RUNSHARED) $(BUILDPYTHON) -c 'import platform; print platform.python_version()'`"'/g' < $(srcdir)/Info.plist.in > Info.plist -- cgit v0.12