diff options
Diffstat (limited to 'Mac')
| -rw-r--r-- | Mac/OSX/IDLE/Info.plist | 55 | ||||
| -rw-r--r-- | Mac/OSX/IDLE/Makefile.in | 8 | ||||
| -rw-r--r-- | Mac/OSX/Makefile.in | 11 | ||||
| -rw-r--r-- | Mac/OSX/PythonLauncher/English.lproj/InfoPlist.strings | bin | 618 -> 0 bytes | |||
| -rw-r--r-- | Mac/OSX/PythonLauncher/Info.plist | 4 | ||||
| -rw-r--r-- | Mac/OSX/PythonLauncher/Makefile.in | 1 | ||||
| -rw-r--r-- | Mac/OSXResources/app/Resources/PythonApplet.icns | bin | 55208 -> 63136 bytes |
7 files changed, 70 insertions, 9 deletions
diff --git a/Mac/OSX/IDLE/Info.plist b/Mac/OSX/IDLE/Info.plist new file mode 100644 index 0000000..bbe2ea1 --- /dev/null +++ b/Mac/OSX/IDLE/Info.plist @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> + <key>CFBundleDocumentTypes</key> + <array> + <dict> + <key>CFBundleTypeExtensions</key> + <array> + <string>py</string> + <string>pyw</string> + </array> + <key>CFBundleTypeIconFile</key> + <string>PythonSource.icns</string> + <key>CFBundleTypeName</key> + <string>Python Script</string> + <key>CFBundleTypeRole</key> + <string>Editor</string> + </dict> + <dict> + <key>CFBundleTypeExtensions</key> + <array> + <string>pyc</string> + <string>pyo</string> + </array> + <key>CFBundleTypeIconFile</key> + <string>PythonCompiled.icns</string> + <key>CFBundleTypeName</key> + <string>Python Bytecode Document</string> + <key>CFBundleTypeRole</key> + <string>Editor</string> + </dict> + </array> + <key>CFBundleExecutable</key> + <string>IDLE</string> + <key>CFBundleGetInfoString</key> + <string>2.5, © 001-2006 Python Software Foundation</string> + <key>CFBundleIconFile</key> + <string>IDLE.icns</string> + <key>CFBundleIdentifier</key> + <string>org.python.IDLE</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleName</key> + <string>IDLE</string> + <key>CFBundlePackageType</key> + <string>APPL</string> + <key>CFBundleShortVersionString</key> + <string>2.5</string> + <key>CFBundleVersion</key> + <string>2.5</string> +</dict> +</plist> diff --git a/Mac/OSX/IDLE/Makefile.in b/Mac/OSX/IDLE/Makefile.in index 26ecad4..a429277 100644 --- a/Mac/OSX/IDLE/Makefile.in +++ b/Mac/OSX/IDLE/Makefile.in @@ -1,3 +1,4 @@ +prefix=@prefix@ CC=@CC@ LD=@CC@ BASECFLAGS=@BASECFLAGS@ @@ -27,7 +28,8 @@ all: IDLE.app install: IDLE.app test -d "$(DESTDIR)$(PYTHONAPPSDIR)" || mkdir -p "$(DESTDIR)$(PYTHONAPPSDIR)" -test -d "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app" && rm -r "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app" - cp -r IDLE.app "$(DESTDIR)$(PYTHONAPPSDIR)" + cp -PR IDLE.app "$(DESTDIR)$(PYTHONAPPSDIR)" + touch "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app" clean: rm -rf IDLE.app @@ -40,9 +42,11 @@ IDLE.app: \ $(RUNSHARED) $(BUILDPYTHON) $(BUNDLEBULDER) \ --builddir=. \ --name=IDLE \ + --link-exec \ + --plist=$(srcdir)/Info.plist \ --mainprogram=$(srcdir)/idlemain.py \ --iconfile=$(srcdir)/../Icons/IDLE.icns \ - --bundle-id=org.python.IDLE \ --resource=$(srcdir)/../Icons/PythonSource.icns \ --resource=$(srcdir)/../Icons/PythonCompiled.icns \ + --python=$(prefix)/Resources/Python.app/Contents/MacOS/Python \ build diff --git a/Mac/OSX/Makefile.in b/Mac/OSX/Makefile.in index 80aaa02..14b7f51 100644 --- a/Mac/OSX/Makefile.in +++ b/Mac/OSX/Makefile.in @@ -74,9 +74,10 @@ install_versionedtools: for fn in idle pydoc python-config ;\ do \ mv "$(DESTDIR)$(prefix)/bin/$${fn}" "$(DESTDIR)$(prefix)/bin/$${fn}$(VERSION)" ;\ - ln -sf "$${fn}$(VERSION)" "$${fn}" ;\ + ln -sf "$${fn}$(VERSION)" "$(DESTDIR)$(prefix)/bin/$${fn}" ;\ done - rm -f "$(DESTDIR)$(prefix)/bin/smtpd.py" + mv "$(DESTDIR)$(prefix)/bin/smtpd.py" "$(DESTDIR)$(prefix)/bin/smtpd$(VERSION).py" + ln -sf "smtpd$(VERSION).py" "$(DESTDIR)$(prefix)/bin/smtpd.py" pythonw: $(srcdir)/Tools/pythonw.c @@ -142,7 +143,7 @@ install_BuildApplet: $(BUILDPYTHON) $(srcdir)/../scripts/BuildApplet.py \ --destroot "$(DESTDIR)" \ --python $(INSTALLED_PYTHONAPP) \ - --output "$(DESTDIR)$(PYTHONAPPSDIR)/BuildApplet.app" \ + --output "$(DESTDIR)$(PYTHONAPPSDIR)/Build Applet.app" \ $(srcdir)/../scripts/BuildApplet.py MACLIBDEST=$(LIBDEST)/plat-mac @@ -221,9 +222,9 @@ installextras: checkapplepython: - @if ! $(BUILDPYTHON) $(srcdir)/Mac/OSX/fixapplepython23.py -n; then \ + @if ! $(BUILDPYTHON) $(srcdir)/fixapplepython23.py -n; then \ echo "* WARNING: Apple-installed Python 2.3 will have trouble building extensions from now on."; \ - echo "* WARNING: Run $(srcdir)/Mac/OSX/fixapplepython23.py with \"sudo\" to fix this."; \ + echo "* WARNING: Run $(srcdir)/fixapplepython23.py with \"sudo\" to fix this."; \ fi diff --git a/Mac/OSX/PythonLauncher/English.lproj/InfoPlist.strings b/Mac/OSX/PythonLauncher/English.lproj/InfoPlist.strings Binary files differdeleted file mode 100644 index 40b6185..0000000 --- a/Mac/OSX/PythonLauncher/English.lproj/InfoPlist.strings +++ /dev/null diff --git a/Mac/OSX/PythonLauncher/Info.plist b/Mac/OSX/PythonLauncher/Info.plist index 5e9e457..1dd795f 100644 --- a/Mac/OSX/PythonLauncher/Info.plist +++ b/Mac/OSX/PythonLauncher/Info.plist @@ -40,7 +40,7 @@ <key>CFBundleExecutable</key> <string>PythonLauncher</string> <key>CFBundleGetInfoString</key> - <string>2.5, © 2001-2006 Python Software Foundation</string> + <string>2.5, © 001-2006 Python Software Foundation</string> <key>CFBundleIconFile</key> <string>PythonLauncher.icns</string> <key>CFBundleIdentifier</key> @@ -48,7 +48,7 @@ <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleName</key> - <string>PythonLauncher</string> + <string>Python Launcher</string> <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> diff --git a/Mac/OSX/PythonLauncher/Makefile.in b/Mac/OSX/PythonLauncher/Makefile.in index 41ea9d5..e6dacb3 100644 --- a/Mac/OSX/PythonLauncher/Makefile.in +++ b/Mac/OSX/PythonLauncher/Makefile.in @@ -29,6 +29,7 @@ install: Python\ Launcher.app test -d "$(DESTDIR)$(PYTHONAPPSDIR)" || mkdir -p "$(DESTDIR)$(PYTHONAPPSDIR)" -test -d "$(DESTDIR)$(PYTHONAPPSDIR)/Python Launcher.app" && rm -r "$(DESTDIR)$(PYTHONAPPSDIR)/Python Launcher.app" cp -r "Python Launcher.app" "$(DESTDIR)$(PYTHONAPPSDIR)" + touch "$(DESTDIR)$(PYTHONAPPSDIR)/Python Launcher.app" clean: rm -f *.o "Python Launcher" diff --git a/Mac/OSXResources/app/Resources/PythonApplet.icns b/Mac/OSXResources/app/Resources/PythonApplet.icns Binary files differindex e959c43..c8aad9f 100644 --- a/Mac/OSXResources/app/Resources/PythonApplet.icns +++ b/Mac/OSXResources/app/Resources/PythonApplet.icns |