[Python-checkins] python/dist/src/Mac/OSX Makefile,1.13,1.14

[jackjansen@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Mac/OSX
In directory usw-pr-cvs1:/tmp/cvs-serv942

Modified Files:
	Makefile 
Log Message:
- Install into /Applications/Python in stead of into /Applications.
- Build PythonLauncher.app and PythonIDE.app as well as Python.app. 


Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/OSX/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Makefile	8 Jul 2002 13:34:23 -0000	1.13
--- Makefile	31 Jul 2002 14:46:04 -0000	1.14
***************
*** 8,12 ****
  
  INSTALLDIR=/Library/Frameworks/Python.framework/Versions/Current
! APPINSTALLDIR=/Applications/Python.app
  
  # Variables for installing the "normal" unix binaries
--- 8,13 ----
  
  INSTALLDIR=/Library/Frameworks/Python.framework/Versions/Current
! PYTHONAPPSDIR=/Applications/Python
! APPINSTALLDIR=$(PYTHONAPPSDIR)/Python.app
  
  # Variables for installing the "normal" unix binaries
***************
*** 31,35 ****
  
  CFLAGS=$(OPT) $(DEFINES) $(INCLUDES)
! LDFLAGS=-framework System -framework Python -framework Carbon \
  	-framework Foundation
  CC=cc
--- 32,36 ----
  
  CFLAGS=$(OPT) $(DEFINES) $(INCLUDES)
! LDFLAGS=-F$(PYTHONBUILDDIR) -framework System -framework Python -framework Carbon \
  	-framework Foundation
  CC=cc
***************
*** 41,47 ****
  	$(PYTHONBUILDDIR)/Mac/Python/macgetargv.o
  
- pythonforbundle: $(OBJECTS)
- 	$(LD) $(LDFLAGS) $(OBJECTS) -o pythonforbundle
- 
  PYTHON=$(PYTHONBUILDDIR)/python.exe
  APPTEMPLATE=$(PYTHONSRCDIR)/Mac/OSXResources/app
--- 42,45 ----
***************
*** 50,55 ****
  RESOURCEFILE=python.rsrc
  RFCONVERTER=$(PYTHONSRCDIR)/Mac/Lib/applesingle.py
! install: pythonforbundle
! 	@for i in $(APPINSTALLDIR) $(APPINSTALLDIR)/Contents; do \
  		if test ! -d $$i; then \
  			echo "Creating directory $$i"; \
--- 48,60 ----
  RESOURCEFILE=python.rsrc
  RFCONVERTER=$(PYTHONSRCDIR)/Mac/Lib/applesingle.py
! 
! install_all: install_PythonLauncher install_Python install_IDE
! 
! install_PythonLauncher:
! 	cd $(PYTHONSRCDIR)/Mac/OSX/PythonLauncher/PythonLauncher.pbproj ; \
! 	pbxbuild -target PythonLauncher -buildstyle Deployment DSTROOT=/ install
! 	
! install_Python: pythonforbundle
! 	@for i in $(PYTHONAPPSDIR) $(APPINSTALLDIR) $(APPINSTALLDIR)/Contents; do \
  		if test ! -d $$i; then \
  			echo "Creating directory $$i"; \
***************
*** 96,99 ****
--- 101,109 ----
  	$(REZ) -useDF -o $(RESOURCEFILE) dialogs.r errors.r 
  	$(INSTALL_DATA) $(RESOURCEFILE) $(APPINSTALLDIR)/Contents/Resources/$(RESOURCEFILE)
+ 	
+ install_IDE: $(INSTALLED_PYTHONW)
+ 	$(INSTALLED_PYTHONW) $(PYTHONSRCDIR)/Mac/scripts/BuildApplet.py \
+ 		--output $(PYTHONAPPSDIR)/PythonIDE.app --noargv \
+ 		$(PYTHONSRCDIR)/Mac/Tools/IDE/PythonIDE.py
  		
  LIBDEST=$(INSTALLDIR)/Mac/Lib
***************
*** 209,213 ****
  	
  # Put symlinks "python" and "pythonw" in the standard place
! installunixprograms: $(INSTALLED_PYTHON) pythonw.sh
  	$(INSTALL) -d $(UNIXBINDIR)
  	$(INSTALL_SYMLINK) $(INSTALLED_PYTHON) $(UNIXBINDIR)/python
--- 219,226 ----
  	
  # Put symlinks "python" and "pythonw" in the standard place
! $(INSTALLED_PYTHONW): install_Python
! # $(INSTALLED_PYTHON) has to be done by the main Makefile, we cannot do that here.
! 
! installunixprograms: $(INSTALLED_PYTHON) $(INSTALLED_PYTHONW) pythonw.sh
  	$(INSTALL) -d $(UNIXBINDIR)
  	$(INSTALL_SYMLINK) $(INSTALLED_PYTHON) $(UNIXBINDIR)/python
***************
*** 221,224 ****
--- 234,239 ----
  	echo $$l/lib-scriptpackages >> $(INSTALLDIR)/lib/python$(VERSION)/site-packages/Mac.pth
  
+ pythonforbundle: $(OBJECTS)
+ 	$(LD) $(LDFLAGS) $(OBJECTS) -o pythonforbundle
  
  # Rules to build each file in OBJECTS - is there a better way?