[Python-checkins] python/dist/src/Mac/OSX Makefile.panther, 1.1.2.6, 1.1.2.7

[jackjansen at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Mac/OSX
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28932

Modified Files:
      Tag: release23-maint
	Makefile.panther 
Log Message:
Getting things in place for the MacPython additions build 3.


Index: Makefile.panther
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/OSX/Attic/Makefile.panther,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -d -r1.1.2.6 -r1.1.2.7
--- Makefile.panther	30 Dec 2004 22:43:29 -0000	1.1.2.6
+++ Makefile.panther	2 Jan 2005 23:19:39 -0000	1.1.2.7
@@ -2,27 +2,30 @@
 # It installs the things that are available in MacPython but that are
 # ommitted from Apple's installation of Python 2.3.
 #
-all: install_waste install_IDE install_PackageManager install_IDLE \
+all: install_waste install_IDE install_PackageManager \
 	install_BuildApplet installextras install_PythonLauncher install_pimpupdate
 
+srcdir=../..
 VERSION=2.3
 DESTDIR=
 PYTHONAPPSDIR=/Applications/MacPython-$(VERSION)
 
 APPLE_prefix=/System/Library/Frameworks/Python.framework/Versions/$(VERSION)
-APPLE_PYTHON=/usr/bin/python$(VERSION)
+BUILDPYTHON=/usr/bin/python$(VERSION)
 APPLE_LIBDEST=$(APPLE_prefix)/lib/python$(VERSION)
-APPLE_PYTHONW=$(APPLE_prefix)/Resources/Python.app/Contents/MacOS/Python
+INSTALLED_PYTHONW=$(APPLE_prefix)/Resources/Python.app/Contents/MacOS/Python
 APPLE_PYTHONLAUNCHER=$(APPLE_prefix)/Resources/PythonLauncher.app
+bundlebuilder=$(srcdir)/Lib/plat-mac/bundlebuilder.py
 
 install_waste:
-	$(APPLE_PYTHON) setup.panther.py install \
+	$(BUILDPYTHON) setup.panther.py install \
 		--prefix=$(APPLE_prefix) --root=/$(DESTDIR)
 	
 install_IDE:
-	$(MAKE) -f Makefile install_IDE \
-		BUILDPYTHON=$(APPLE_PYTHON) INSTALLED_PYTHONW=$(APPLE_PYTHONW) \
-		DESTDIR=$(DESTDIR) PYTHONAPPSDIR=$(PYTHONAPPSDIR)
+	$(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \
+		--python $(INSTALLED_PYTHONW) \
+		--output $(DESTDIR)$(PYTHONAPPSDIR)/PythonIDE.app --noargv \
+		$(srcdir)/Mac/Tools/IDE/PythonIDE.py
 	# Add the extra files to the resources. This is to work around bugs in
 	# them in the original 2.3.
 	cp ../Tools/IDE/PythonIDEMain.py $(DESTDIR)$(PYTHONAPPSDIR)/PythonIDE.app/Contents/Resources
@@ -31,23 +34,24 @@
 	cp ../Tools/IDE/PyEdit.py $(DESTDIR)$(PYTHONAPPSDIR)/PythonIDE.app/Contents/Resources
 
 install_PackageManager:
-	$(MAKE) -f Makefile install_PackageManager \
-		BUILDPYTHON=$(APPLE_PYTHON) INSTALLED_PYTHONW=$(APPLE_PYTHONW) \
-		DESTDIR=$(DESTDIR) PYTHONAPPSDIR=$(PYTHONAPPSDIR)
-
-install_IDLE:
-	$(MAKE) -f Makefile install_IDLE \
-		BUILDPYTHON=$(APPLE_PYTHON) INSTALLED_PYTHONW=$(APPLE_PYTHONW) \
-		DESTDIR=$(DESTDIR) PYTHONAPPSDIR=$(PYTHONAPPSDIR)
+	$(BUILDPYTHON) $(bundlebuilder) \
+		--builddir $(DESTDIR)$(PYTHONAPPSDIR)/ \
+		--python $(INSTALLED_PYTHONW) \
+		--resource $(srcdir)/Mac/Tools/IDE/PythonIDE.rsrc \
+		--mainprogram $(srcdir)/Mac/Tools/IDE/PackageManager.py \
+		--iconfile $(srcdir)/Mac/Tools/IDE/PackageManager.icns \
+		--plist $(srcdir)/Mac/Tools/IDE/PackageManager.plist \
+		--creator Pimp build
 
 install_BuildApplet:
-	$(MAKE) -f Makefile install_BuildApplet \
-		BUILDPYTHON=$(APPLE_PYTHON) INSTALLED_PYTHONW=$(APPLE_PYTHONW) \
-		DESTDIR=$(DESTDIR) PYTHONAPPSDIR=$(PYTHONAPPSDIR)
+	$(BUILDPYTHON) $(srcdir)/Mac/scripts/BuildApplet.py \
+		--python $(INSTALLED_PYTHONW) \
+		--output $(DESTDIR)$(PYTHONAPPSDIR)/BuildApplet.app \
+		$(srcdir)/Mac/scripts/BuildApplet.py
 
 installextras:
 	$(MAKE) -f Makefile installextras \
-		BUILDPYTHON=$(APPLE_PYTHON) INSTALLED_PYTHONW=$(APPLE_PYTHONW) \
+		BUILDPYTHON=$(BUILDPYTHON) INSTALLED_PYTHONW=$(INSTALLED_PYTHONW) \
 		DESTDIR=$(DESTDIR) PYTHONAPPSDIR=$(PYTHONAPPSDIR)
 
 install_PythonLauncher: