- 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

diff --git a/Mac/IDLE/Info.plist b/Mac/IDLE/Info.plist.in
similarity index 91%
rename from Mac/IDLE/Info.plist
rename to Mac/IDLE/Info.plist.in
index bbe2ea11829438ea573f4556f06b7431c67cf29d..58e913c569841dd1d1fc957b00c4b2459092f112 100644 (file)
--- a/Mac/IDLE/Info.plist
+++ b/Mac/IDLE/Info.plist.in
@@ -36,7 +36,7 @@
        <key>CFBundleExecutable</key>
        <string>IDLE</string>
        <key>CFBundleGetInfoString</key>
-       <string>2.5, © 001-2006 Python Software Foundation</string>
+       <string>%VERSION%, © 001-2006 Python Software Foundation</string>
        <key>CFBundleIconFile</key>
        <string>IDLE.icns</string>
        <key>CFBundleIdentifier</key>
@@ -48,8 +48,8 @@
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
-       <string>2.5</string>
+       <string>%VERSION%</string>
        <key>CFBundleVersion</key>
-       <string>2.5</string>
+       <string>%VERSION%</string>
 </dict>
 </plist>

diff --git a/Mac/IDLE/Makefile.in b/Mac/IDLE/Makefile.in
index 7359aaec001ca48c19db1e135ae9c24eb3532926..2f63892a07189683751d4602aa36538e9a8cf035 100644 (file)
--- 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.in
similarity index 93%
rename from Mac/PythonLauncher/Info.plist
rename to Mac/PythonLauncher/Info.plist.in
index 1dd795f776609192c6dcb2c56d66d317dcdfa114..3c726d7524da9ab74c9c9c3023853fa186ae0191 100644 (file)
--- a/Mac/PythonLauncher/Info.plist
+++ b/Mac/PythonLauncher/Info.plist.in
@@ -40,7 +40,7 @@
        <key>CFBundleExecutable</key>
        <string>PythonLauncher</string>
        <key>CFBundleGetInfoString</key>
-       <string>2.5, © 001-2006 Python Software Foundation</string>
+       <string>%VERSION%, © 001-2006 Python Software Foundation</string>
        <key>CFBundleIconFile</key>
        <string>PythonLauncher.icns</string>
        <key>CFBundleIdentifier</key>
@@ -52,11 +52,11 @@
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
-       <string>2.5</string>
+       <string>%VERSION%</string>
        <key>CFBundleSignature</key>
        <string>PytL</string>
        <key>CFBundleVersion</key>
-       <string>2.5</string>
+       <string>%VERSION%</string>
        <key>NSMainNibFile</key>
        <string>MainMenu</string>
        <key>NSPrincipalClass</key>

diff --git a/Mac/PythonLauncher/Makefile.in b/Mac/PythonLauncher/Makefile.in
index 19763a66ca772ada80e0741d3542d42e8cadd2ec..b4b126c908d9d036eff87b58fde57c05ca46c950 100644 (file)
--- 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