[Python-checkins] python/dist/src/Mac/OSX Mac.pth,NONE,1.1 Makefile,1.11,1.12

[jackjansen@users.sourceforge.net]

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

Modified Files:
	Makefile 
Added Files:
	Mac.pth 
Log Message:
Patch #557719 by Tony Lownds, slightly massaged by me: streamline the
OSX framework build process. Things fixed/modified:
- the filesystem case-sensitivity test now works for builds outside
  the source directory
- various other fixes for building outside the source directory
- python.app now has a target in the main Makefile
- WASTE and AquaTk are found more automatically


--- NEW FILE: Mac.pth ---
../../../Mac/Lib
../../../Mac/Lib/lib-scriptpackages

Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/OSX/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Makefile	23 May 2002 22:18:13 -0000	1.11
--- Makefile	21 Jun 2002 14:48:38 -0000	1.12
***************
*** 1,3 ****
! PYTHONBUILDDIR=../..
  INSTALLDIR=/Library/Frameworks/Python.framework/Versions/Current
  APPINSTALLDIR=/Applications/Python.app
--- 1,10 ----
! # This file can be invoked from the "python.app" target in the 
! # main Makefile. The next two variables are overridden on the 
! # commandline in that case.
! 
! # assume user was invoking from Mac/OSX directory and building in source tree
! PYTHONBUILDDIR = ../..
! PYTHONSRCDIR = ../..
! 
  INSTALLDIR=/Library/Frameworks/Python.framework/Versions/Current
  APPINSTALLDIR=/Applications/Python.app
***************
*** 18,23 ****
  OPT=-g -O3 -Wall -Wstrict-prototypes -Wno-long-double -no-cpp-precomp \
  	-fno-common -dynamic
! INCLUDES=-I$(PYTHONBUILDDIR) -I$(PYTHONBUILDDIR)/Include \
! 	-I$(PYTHONBUILDDIR)/Mac/Include
  DEFINES=-DHAVE_CONFIG_H
  
--- 25,30 ----
  OPT=-g -O3 -Wall -Wstrict-prototypes -Wno-long-double -no-cpp-precomp \
  	-fno-common -dynamic
! INCLUDES=-I$(PYTHONBUILDDIR) -I$(PYTHONSRCDIR)/Include \
! 	-I$(PYTHONSRCDIR)/Mac/Include
  DEFINES=-DHAVE_CONFIG_H
  
***************
*** 37,45 ****
  
  PYTHON=$(PYTHONBUILDDIR)/python.exe
! APPTEMPLATE=$(PYTHONBUILDDIR)/Mac/OSXResources/app
  APPSUBDIRS=MacOS Resources Resources/English.lproj
! RESOURCEDIR=$(PYTHONBUILDDIR)/Mac/Resources
  RESOURCEFILE=python.rsrc
! RFCONVERTER=$(PYTHONBUILDDIR)/Mac/Lib/applesingle.py
  install: pythonforbundle
  	@for i in $(APPINSTALLDIR) $(APPINSTALLDIR)/Contents; do \
--- 44,52 ----
  
  PYTHON=$(PYTHONBUILDDIR)/python.exe
! APPTEMPLATE=$(PYTHONSRCDIR)/Mac/OSXResources/app
  APPSUBDIRS=MacOS Resources Resources/English.lproj
! RESOURCEDIR=$(PYTHONSRCDIR)/Mac/Resources
  RESOURCEFILE=python.rsrc
! RFCONVERTER=$(PYTHONSRCDIR)/Mac/Lib/applesingle.py
  install: pythonforbundle
  	@for i in $(APPINSTALLDIR) $(APPINSTALLDIR)/Contents; do \
***************
*** 90,94 ****
  		
  LIBDEST=$(INSTALLDIR)/Mac/Lib
! LIBSRC=$(PYTHONBUILDDIR)/Mac/Lib
  LIBSUBDIRS= \
  	Carbon \
--- 97,101 ----
  		
  LIBDEST=$(INSTALLDIR)/Mac/Lib
! LIBSRC=$(PYTHONSRCDIR)/Mac/Lib
  LIBSUBDIRS= \
  	Carbon \
***************
*** 106,110 ****
  	mkcwproject/template-ppc
  TOOLSDEST=$(INSTALLDIR)/Mac/Tools
! TOOLSSRC=$(PYTHONBUILDDIR)/Mac/Tools
  TOOLSSUBDIRS=IDE
  installmacsubtree:
--- 113,117 ----
  	mkcwproject/template-ppc
  TOOLSDEST=$(INSTALLDIR)/Mac/Tools
! TOOLSSRC=$(PYTHONSRCDIR)/Mac/Tools
  TOOLSSUBDIRS=IDE
  installmacsubtree:
***************
*** 198,203 ****
  	done
  
! 	@echo '** Copy the contents of sample_sitecustomize.py (or similar code) into'
! 	@echo '**' $(INSTALLDIR)/lib/python2.3/sitecustomize.py
  	
  # Put symlinks "python" and "pythonw" in the standard place
--- 205,209 ----
  	done
  
! 	$(INSTALL_DATA) $(PYTHONSRCDIR)/Mac/OSX/Mac.pth $(INSTALLDIR)/lib/python2.3/site-packages/
  	
  # Put symlinks "python" and "pythonw" in the standard place
***************
*** 214,215 ****
--- 220,230 ----
  	@echo '** Copy the contents of sample_sitecustomize.py (or similar code) into'
  	@echo '**' $(INSTALLDIR)/lib/python2.3/sitecustomize.py
+ 
+ 
+ # Rules to build each file in OBJECTS - is there a better way?
+ $(PYTHONBUILDDIR)/Mac/Python/macmain.o: $(PYTHONSRCDIR)/Mac/Python/macmain.c
+ 	$(CC) $(CFLAGS) -c $(PYTHONSRCDIR)/Mac/Python/macmain.c -o $@
+ 
+ $(PYTHONBUILDDIR)/Mac/Python/macgetargv.o: $(PYTHONSRCDIR)/Mac/Python/macgetargv.c
+ 	$(CC) $(CFLAGS) -c $(PYTHONSRCDIR)/Mac/Python/macgetargv.c -o $@
+