[Python-checkins] python/dist/src/Mac/OSX Makefile,1.28,1.29

[jackjansen@users.sourceforge.net]

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

Modified Files:
	Makefile 
Log Message:
- Building IDE is optional on waste being available, similar to building
  IDLE (it was a fatal error before)
- Shuffled a few things around to facilitate the experimental building
  of MacPython for Jaguar's pre-installed python.


Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/OSX/Makefile,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** Makefile	7 Nov 2002 23:07:04 -0000	1.28
--- Makefile	11 Nov 2002 00:05:00 -0000	1.29
***************
*** 14,17 ****
--- 14,18 ----
  PYTHONAPPSDIR=$(dstroot)/Applications/Python
  APPINSTALLDIR=$(prefix)/Resources/Python.app
+ PTHFILE=$(srcdir)/Mac/OSX/Mac.pth
  
  # Variables for installing the "normal" unix binaries
***************
*** 28,41 ****
  LN=ln
  STRIPFLAG=-s
! OPT=-g -O3 -Wall -Wstrict-prototypes -Wno-long-double -no-cpp-precomp \
! 	-fno-common -dynamic
! INCLUDES=-I$(builddir) -I$(srcdir)/Include -I$(srcdir)/Mac/Include
! DEFINES=
! 
! CFLAGS=$(OPT) $(DEFINES) $(INCLUDES)
! LDFLAGS=-F$(builddir) -framework System -framework Python -framework Carbon \
! 	-framework Foundation
! CC=cc
! LD=cc
  CPMAC=/Developer/Tools/CpMac
  
--- 29,42 ----
  LN=ln
  STRIPFLAG=-s
! ##OPT=-g -O3 -Wall -Wstrict-prototypes -Wno-long-double -no-cpp-precomp \
! ##	-fno-common -dynamic
! ##INCLUDES=-I$(builddir) -I$(srcdir)/Include -I$(srcdir)/Mac/Include
! ##DEFINES=
! ##
! ##CFLAGS=$(OPT) $(DEFINES) $(INCLUDES)
! ##LDFLAGS=-F$(builddir) -framework System -framework Python -framework Carbon \
! ##	-framework Foundation
! ##CC=cc
! ##LD=cc
  CPMAC=/Developer/Tools/CpMac
  
***************
*** 44,47 ****
--- 45,49 ----
  APPSUBDIRS=MacOS Resources Resources/English.lproj
  CACHERSRC=$(srcdir)/Mac/scripts/cachersrc.py
+ compileall=$(srcdir)/Lib/compileall.py
  
  installapps: install_PythonLauncher install_Python install_BuildApplet install_IDE install_IDLE
***************
*** 95,106 ****
  	
  install_IDE: $(INSTALLED_PYTHONW)
! 	@if $(INSTALLED_PYTHONW) -c "import waste"; then : ; else \
  		echo PythonIDE needs the \"waste\" extension module; \
  		echo See Mac/OSX/README for details; \
! 		exit 1; \
  	fi
- 	$(INSTALLED_PYTHONW) $(srcdir)/Mac/scripts/BuildApplet.py \
- 		--output $(PYTHONAPPSDIR)/PythonIDE.app --noargv \
- 		$(srcdir)/Mac/Tools/IDE/PythonIDE.py
  
  install_IDLE: $(INSTALLED_PYTHONW)
--- 97,111 ----
  	
  install_IDE: $(INSTALLED_PYTHONW)
! 	@if ! $(INSTALLED_PYTHONW) -c "import waste"; then  \
  		echo PythonIDE needs the \"waste\" extension module; \
  		echo See Mac/OSX/README for details; \
! 	else \
! 		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_IDLE: $(INSTALLED_PYTHONW)
***************
*** 251,263 ****
  	done
  	
! 	$(INSTALL_DATA) $(srcdir)/Mac/OSX/Mac.pth $(LIBDEST)/site-packages/
  
  	$(PYTHON) $(CACHERSRC) -v $(MACLIBDEST) $(MACTOOLSDEST)
! 	$(PYTHON) -Wi -tt $(srcdir)/Lib/compileall.py -x badsyntax $(MACLIBDEST) $(MACTOOLSDEST)
! 	$(PYTHON) -O -Wi -tt $(srcdir)/Lib/compileall.py -x badsyntax $(MACLIBDEST) $(MACTOOLSDEST)
  
! 	
! # 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.
--- 256,270 ----
  	done
  	
! 	$(INSTALL_DATA) $(PTHFILE) $(LIBDEST)/site-packages/
  
  	$(PYTHON) $(CACHERSRC) -v $(MACLIBDEST) $(MACTOOLSDEST)
! 	$(PYTHON) -Wi -tt $(compileall) -x badsyntax $(MACLIBDEST) $(MACTOOLSDEST)
! 	$(PYTHON) -O -Wi -tt $(compileall) -x badsyntax $(MACLIBDEST) $(MACTOOLSDEST)
  
! #
! # We use the full name here in stead of $(INSTALLED_PYTHONW), because
! # the latter may be overridden by Makefile.jaguar when building for a pre-installed
! # /usr/bin/python
! $(APPINSTALLDIR)/Contents/MacOS/python: install_Python
  
  # $(INSTALLED_PYTHON) has to be done by the main Makefile, we cannot do that here.