Skip to content

Commit 1339944

Browse files
ned-deilyned-deily
committed
Issue python#20022: Eliminate use of deprecated bundlebuilder in OS X builds.
1 parent 502ef90 commit 1339944

File tree

4 files changed

+16
-953
lines changed

4 files changed

+16
-953
lines changed

‎Mac/PythonLauncher/Info.plist.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
55
<key>CFBundleDevelopmentRegion</key>
@@ -38,7 +38,7 @@
3838
</dict>
3939
</array>
4040
<key>CFBundleExecutable</key>
41-
<string>PythonLauncher</string>
41+
<string>Python Launcher</string>
4242
<key>CFBundleGetInfoString</key>
4343
<string>%VERSION%, © 2001-2014 Python Software Foundation</string>
4444
<key>CFBundleIconFile</key>

‎Mac/PythonLauncher/Makefile.in‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@ BUILDPYTHON= $(builddir)/python$(BUILDEXE)
1515
PYTHONFRAMEWORK=@PYTHONFRAMEWORK@
1616

1717
# Deployment target selected during configure, to be checked
18-
# by distutils
18+
# by distutils
1919
MACOSX_DEPLOYMENT_TARGET=@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@
2020
@EXPORT_MACOSX_DEPLOYMENT_TARGET@export MACOSX_DEPLOYMENT_TARGET
2121

22-
BUNDLEBULDER=$(srcdir)/../Tools/bundlebuilder.py
23-
2422
PYTHONAPPSDIR=@FRAMEWORKINSTALLAPPSPREFIX@/$(PYTHONFRAMEWORK) $(VERSION)
2523
OBJECTS=FileSettings.o MyAppDelegate.o MyDocument.o PreferencesWindowController.o doscript.o main.o
2624

@@ -30,31 +28,29 @@ install: Python\ Launcher.app
3028
/bin/cp -r "Python Launcher.app" "$(DESTDIR)$(PYTHONAPPSDIR)"
3129
touch "$(DESTDIR)$(PYTHONAPPSDIR)/Python Launcher.app"
3230

33-
3431
clean:
3532
rm -f *.o "Python Launcher"
3633
rm -rf "Python Launcher.app"
34+
rm -f Info.plist
3735

3836
Python\ Launcher.app: Info.plist \
3937
Python\ Launcher $(srcdir)/../Icons/PythonLauncher.icns \
4038
$(srcdir)/../Icons/PythonSource.icns \
4139
$(srcdir)/../Icons/PythonCompiled.icns \
4240
$(srcdir)/factorySettings.plist
4341
rm -fr "Python Launcher.app"
44-
$(RUNSHARED) $(BUILDPYTHON) $(BUNDLEBULDER) \
45-
--builddir=. \
46-
--name="Python Launcher" \
47-
--executable="Python Launcher" \
48-
--iconfile=$(srcdir)/../Icons/PythonLauncher.icns \
49-
--bundle-id=org.python.PythonLauncher \
50-
--resource=$(srcdir)/../Icons/PythonSource.icns \
51-
--resource=$(srcdir)/../Icons/PythonCompiled.icns \
52-
--resource=$(srcdir)/English.lproj \
53-
--resource=$(srcdir)/factorySettings.plist \
54-
--plist Info.plist \
55-
build
42+
mkdir "Python Launcher.app"
43+
mkdir "Python Launcher.app/Contents"
44+
mkdir "Python Launcher.app/Contents/MacOS"
45+
mkdir "Python Launcher.app/Contents/Resources"
46+
cp "Python Launcher" "Python Launcher.app/Contents/MacOS"
47+
cp Info.plist "Python Launcher.app/Contents"
48+
cp $(srcdir)/../Icons/PythonLauncher.icns "Python Launcher.app/Contents/Resources"
49+
cp $(srcdir)/../Icons/PythonSource.icns "Python Launcher.app/Contents/Resources"
50+
cp $(srcdir)/../Icons/PythonCompiled.icns "Python Launcher.app/Contents/Resources"
51+
cp $(srcdir)/factorySettings.plist "Python Launcher.app/Contents/Resources"
52+
cp -R $(srcdir)/English.lproj "Python Launcher.app/Contents/Resources"
5653
find "Python Launcher.app" -name '.svn' -print0 | xargs -0 rm -r
57-
5854

5955
FileSettings.o: $(srcdir)/FileSettings.m
6056
$(CC) $(CFLAGS) -o $@ -c $(srcdir)/FileSettings.m

0 commit comments

Comments
 (0)