[Python-checkins] python/dist/src/Mac/OSX Makefile,1.20,1.21

[jackjansen@users.sourceforge.net]

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

Modified Files:
	Makefile 
Log Message:
- Precompile py files in Mac subtree after installing
- Pre-cache .rsrc files in Mac subtree after installing
- Fixed nameclash in Make variables


Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/OSX/Makefile,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Makefile	9 Aug 2002 00:18:21 -0000	1.20
--- Makefile	9 Aug 2002 14:15:46 -0000	1.21
***************
*** 46,49 ****
--- 46,50 ----
  RESOURCEFILE=python.rsrc
  RFCONVERTER=$(srcdir)/Mac/Lib/applesingle.py
+ CACHERSRC=$(srcdir)/Mac/scripts/cachersrc.py
  
  installapps: install_PythonLauncher install_Python install_BuildApplet install_IDE
***************
*** 115,121 ****
  		$(srcdir)/Mac/scripts/BuildApplet.py
  		
! LIBDEST=$(prefix)/Mac/Lib
! LIBSRC=$(srcdir)/Mac/Lib
! LIBSUBDIRS= \
  	Carbon \
  	lib-scriptpackages \
--- 116,122 ----
  		$(srcdir)/Mac/scripts/BuildApplet.py
  		
! MACLIBDEST=$(prefix)/Mac/Lib
! MACLIBSRC=$(srcdir)/Mac/Lib
! MACLIBSUBDIRS= \
  	Carbon \
  	lib-scriptpackages \
***************
*** 131,139 ****
  	mkcwproject/template-carbon \
  	mkcwproject/template-ppc
! TOOLSDEST=$(prefix)/Mac/Tools
! TOOLSSRC=$(srcdir)/Mac/Tools
! TOOLSSUBDIRS=IDE
! installmacsubtree:
! 	@for i in $(LIBDEST) $(TOOLSDEST); \
  	do \
  		if test ! -d $$i; then \
--- 132,140 ----
  	mkcwproject/template-carbon \
  	mkcwproject/template-ppc
! MACTOOLSDEST=$(prefix)/Mac/Tools
! MACTOOLSSRC=$(srcdir)/Mac/Tools
! MACTOOLSSUBDIRS=IDE
! installmacsubtree: $(INSTALLED_PYTHON)
! 	@for i in $(MACLIBDEST) $(MACTOOLSDEST); \
  	do \
  		if test ! -d $$i; then \
***************
*** 143,151 ****
  		fi; \
  	done
! 	@for d in $(LIBSUBDIRS); \
  	do \
! 		a=$(LIBSRC)/$$d; \
  		if test ! -d $$a; then continue; else true; fi; \
! 		b=$(LIBDEST)/$$d; \
  		if test ! -d $$b; then \
  			echo "Creating directory $$b"; \
--- 144,152 ----
  		fi; \
  	done
! 	@for d in $(MACLIBSUBDIRS); \
  	do \
! 		a=$(MACLIBSRC)/$$d; \
  		if test ! -d $$a; then continue; else true; fi; \
! 		b=$(MACLIBDEST)/$$d; \
  		if test ! -d $$b; then \
  			echo "Creating directory $$b"; \
***************
*** 154,172 ****
  		fi; \
  	done
! 	@for i in $(LIBSRC)/*.py $(LIBSRC)/*.rsrc; \
  	do \
  		if test -x $$i; then \
! 			$(INSTALL_SCRIPT) $$i $(LIBDEST); \
! 			echo $(INSTALL_SCRIPT) $$i $(LIBDEST); \
  		else \
! 			$(INSTALL_DATA) $$i $(LIBDEST); \
! 			echo $(INSTALL_DATA) $$i $(LIBDEST); \
  		fi; \
  	done
! 	@for d in $(LIBSUBDIRS); \
  	do \
! 		a=$(LIBSRC)/$$d; \
  		if test ! -d $$a; then continue; else true; fi; \
! 		b=$(LIBDEST)/$$d; \
  		for i in $$a/*; \
  		do \
--- 155,173 ----
  		fi; \
  	done
! 	@for i in $(MACLIBSRC)/*.py $(MACLIBSRC)/*.rsrc; \
  	do \
  		if test -x $$i; then \
! 			$(INSTALL_SCRIPT) $$i $(MACLIBDEST); \
! 			echo $(INSTALL_SCRIPT) $$i $(MACLIBDEST); \
  		else \
! 			$(INSTALL_DATA) $$i $(MACLIBDEST); \
! 			echo $(INSTALL_DATA) $$i $(MACLIBDEST); \
  		fi; \
  	done
! 	@for d in $(MACLIBSUBDIRS); \
  	do \
! 		a=$(MACLIBSRC)/$$d; \
  		if test ! -d $$a; then continue; else true; fi; \
! 		b=$(MACLIBDEST)/$$d; \
  		for i in $$a/*; \
  		do \
***************
*** 188,196 ****
  		done; \
  	done
! 	@for d in $(TOOLSSUBDIRS); \
  	do \
! 		a=$(TOOLSSRC)/$$d; \
  		if test ! -d $$a; then continue; else true; fi; \
! 		b=$(TOOLSDEST)/$$d; \
  		if test ! -d $$b; then \
  			echo "Creating directory $$b"; \
--- 189,197 ----
  		done; \
  	done
! 	@for d in $(MACTOOLSSUBDIRS); \
  	do \
! 		a=$(MACTOOLSSRC)/$$d; \
  		if test ! -d $$a; then continue; else true; fi; \
! 		b=$(MACTOOLSDEST)/$$d; \
  		if test ! -d $$b; then \
  			echo "Creating directory $$b"; \
***************
*** 199,207 ****
  		fi; \
  	done
! 	@for d in $(TOOLSSUBDIRS); \
  	do \
! 		a=$(TOOLSSRC)/$$d; \
  		if test ! -d $$a; then continue; else true; fi; \
! 		b=$(TOOLSDEST)/$$d; \
  		for i in $$a/*; \
  		do \
--- 200,208 ----
  		fi; \
  	done
! 	@for d in $(MACTOOLSSUBDIRS); \
  	do \
! 		a=$(MACTOOLSSRC)/$$d; \
  		if test ! -d $$a; then continue; else true; fi; \
! 		b=$(MACTOOLSDEST)/$$d; \
  		for i in $$a/*; \
  		do \
***************
*** 223,228 ****
  		done; \
  	done
! 
  	$(INSTALL_DATA) $(srcdir)/Mac/OSX/Mac.pth $(LIBDEST)/site-packages/
  	
  # Put symlinks "python" and "pythonw" in the standard place
--- 224,234 ----
  		done; \
  	done
! 	
  	$(INSTALL_DATA) $(srcdir)/Mac/OSX/Mac.pth $(LIBDEST)/site-packages/
+ 
+ 	$(PYTHON) $(CACHERSRC) -v $(MACLIBDEST) $(MACTOOLSDEST)
+ 	$(INSTALLED_PYTHON) $(srcdir)/Lib/compileall.py $(MACLIBDEST) $(MACTOOLSDEST)
+ 	$(INSTALLED_PYTHON) -O $(srcdir)/Lib/compileall.py $(MACLIBDEST) $(MACTOOLSDEST)
+ 
  	
  # Put symlinks "python" and "pythonw" in the standard place
***************
*** 241,244 ****
  dontinstallmacsubtree:
  	l=`cd $(srcdir)/Mac/Lib; pwd`; \
! 	echo $$l > $(LIBDEST)/site-packages/Mac.pth ; \
! 	echo $$l/lib-scriptpackages >> $(LIBDEST)/site-packages/Mac.pth
--- 247,250 ----
  dontinstallmacsubtree:
  	l=`cd $(srcdir)/Mac/Lib; pwd`; \
! 	echo $$l > $(MACLIBDEST)/site-packages/Mac.pth ; \
! 	echo $$l/lib-scriptpackages >> $(MACLIBDEST)/site-packages/Mac.pth