Undid half of the previous checkin: continue using BuildApplet for most

applets. PackageManager is still built with bundlebuilder itself.

diff --git a/Mac/OSX/Makefile b/Mac/OSX/Makefile
index 0d2e55c2effe89dc3058ddf42f822b2d7e0235d4..9b72ebb9ff92a2050f86db8a865ae4d95d5ecc78 100644 (file)
--- a/Mac/OSX/Makefile
+++ b/Mac/OSX/Makefile
@@ -48,8 +48,8 @@ CACHERSRC=$(srcdir)/Mac/scripts/cachersrc.py
 compileall=$(srcdir)/Lib/compileall.py
 bundlebuilder=$(srcdir)/Lib/plat-mac/bundlebuilder.py
 
-installapps: install_PythonLauncher install_Python install_BuildApplet \
-               install_PackageManager install_IDE install_IDLE
+installapps: install_PythonLauncher install_Python install_BuildApplet install_IDE \
+       install_IDLE install_PackageManager
 
 install_PythonLauncher:
        cd $(srcdir)/Mac/OSX/PythonLauncher/PythonLauncher.pbproj ; \
@@ -104,18 +104,12 @@ install_IDE: $(INSTALLED_PYTHONW)
                echo PythonIDE needs the \"waste\" extension module; \
                echo See Mac/OSX/README for details; \
        else \
-               echo $(INSTALLED_PYTHONW) $(bundlebuilder) \
-                       --builddir $(PYTHONAPPSDIR)/ \
-                       --resource $(srcdir)/Mac/Tools/IDE/PythonIDE.rsrc \
-                       --mainprogram $(srcdir)/Mac/Tools/IDE/PythonIDE.py \
-                       --iconfile $(srcdir)/Mac/Tools/IDE/PythonIDE.icns \
-                       --creator Pide build; \
-               $(INSTALLED_PYTHONW) $(bundlebuilder) \
-                       --builddir $(PYTHONAPPSDIR)/ \
-                       --resource $(srcdir)/Mac/Tools/IDE/PythonIDE.rsrc \
-                       --mainprogram $(srcdir)/Mac/Tools/IDE/PythonIDE.py \
-                       --iconfile $(srcdir)/Mac/Tools/IDE/PythonIDE.icns \
-                       --creator Pide build; \
+               echo $(INSTALLED_PYTHONW) $(srcdir)/Mac/scripts/BuildApplet.py \
+                       --output $(PYTHONAPPSDIR)/PythonIDE.app --noargv \
+                       $(srcdir)/Mac/Tools/IDE/PythonIDE.py ; \
+               $(INSTALLED_PYTHONW) $(srcdir)/Mac/scripts/BuildApplet.py \
+                       --output $(PYTHONAPPSDIR)/PythonIDE.app --noargv \
+                       $(srcdir)/Mac/Tools/IDE/PythonIDE.py; \
        fi
 
 install_PackageManager: $(INSTALLED_PYTHONW)