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

[jackjansen@users.sourceforge.net]

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

Modified Files:
	Makefile 
Log Message:
Try to cater for a source tree checked out with MacCVS in stead of
unix cvs. In this case the resource files are actual resource files
in stead of AppleSingle encoded files.


Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/OSX/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Makefile	9 Aug 2002 14:15:46 -0000	1.21
--- Makefile	15 Aug 2002 21:31:18 -0000	1.22
***************
*** 39,42 ****
--- 39,43 ----
  REZ=/Developer/Tools/Rez
  DEREZ=/Developer/Tools/DeRez
+ CPMAC=/Developer/Tools/CpMac
  
  PYTHON=$(builddir)/python.exe
***************
*** 93,101 ****
  	done
  	$(INSTALL_PROGRAM) $(STRIPFLAG) $(PYTHON) $(APPINSTALLDIR)/Contents/MacOS/python
! 	# Create a temporary version of the resources here
! 	$(PYTHON) $(RFCONVERTER) -r $(RESOURCEDIR)/dialogs.rsrc dialogs.rsrc
! 	$(PYTHON) $(RFCONVERTER) -r $(RESOURCEDIR)/errors.rsrc errors.rsrc
! 	$(DEREZ) -useDF -skip ckid dialogs.rsrc > dialogs.r
! 	$(DEREZ) -useDF -skip ckid errors.rsrc > errors.r
  	$(REZ) -useDF -o $(RESOURCEFILE) dialogs.r errors.r 
  	$(INSTALL_DATA) $(RESOURCEFILE) $(APPINSTALLDIR)/Contents/Resources/$(RESOURCEFILE)
--- 94,118 ----
  	done
  	$(INSTALL_PROGRAM) $(STRIPFLAG) $(PYTHON) $(APPINSTALLDIR)/Contents/MacOS/python
! # Create a temporary version of the resources here
! # Note that the resource files can either be real 2-fork resource files
! # or AppleSingle encoded files.
! 	@if test -s $(RESOURCEDIR)/dialogs.rsrc; then \
! 		echo $(PYTHON) $(RFCONVERTER) -r $(RESOURCEDIR)/dialogs.rsrc dialogs.rsrc ;\
! 		$(PYTHON) $(RFCONVERTER) -r $(RESOURCEDIR)/dialogs.rsrc dialogs.rsrc ; \
! 		echo $(DEREZ) -useDF -skip ckid dialogs.rsrc > dialogs.r ; \
! 		$(DEREZ) -useDF -skip ckid dialogs.rsrc > dialogs.r ; \
! 	else \
! 		echo $(DEREZ) -skip ckid $(RESOURCEDIR)/dialogs.rsrc > dialogs.r ; \
! 		$(DEREZ) -skip ckid $(RESOURCEDIR)/dialogs.rsrc > dialogs.r ; \
! 	fi
! 	@if test -s $(RESOURCEDIR)/errors.rsrc; then \
! 		echo $(PYTHON) $(RFCONVERTER) -r $(RESOURCEDIR)/errors.rsrc errors.rsrc ;\
! 		$(PYTHON) $(RFCONVERTER) -r $(RESOURCEDIR)/errors.rsrc errors.rsrc ; \
! 		echo $(DEREZ) -useDF -skip ckid errors.rsrc > errors.r ; \
! 		$(DEREZ) -useDF -skip ckid errors.rsrc > errors.r ; \
! 	else \
! 		echo $(DEREZ) -skip ckid $(RESOURCEDIR)/errors.rsrc > errors.r ; \
! 		$(DEREZ) -skip ckid $(RESOURCEDIR)/errors.rsrc > errors.r ; \
! 	fi
  	$(REZ) -useDF -o $(RESOURCEFILE) dialogs.r errors.r 
  	$(INSTALL_DATA) $(RESOURCEFILE) $(APPINSTALLDIR)/Contents/Resources/$(RESOURCEFILE)
***************
*** 155,159 ****
  		fi; \
  	done
! 	@for i in $(MACLIBSRC)/*.py $(MACLIBSRC)/*.rsrc; \
  	do \
  		if test -x $$i; then \
--- 172,176 ----
  		fi; \
  	done
! 	@for i in $(MACLIBSRC)/*.py; \
  	do \
  		if test -x $$i; then \
***************
*** 165,168 ****
--- 182,190 ----
  		fi; \
  	done
+ ##	@for i in $(MACLIBSRC)/*.rsrc; \
+ ##	do \
+ ##		echo $(CPMAC) $$i $$b ; \
+ ##		$(CPMAC) $$i $$b ; \
+ ##	done
  	@for d in $(MACLIBSUBDIRS); \
  	do \
***************
*** 177,180 ****
--- 199,206 ----
  			*.orig) ;; \
  			*~) ;; \
+ 			*.rsrc) \
+ 				echo $(CPMAC) $$i $$b ; \
+ 				$(CPMAC) $$i $$b ; \
+ 				;; \
  			*) \
  				if test -d $$i; then continue; fi; \
***************
*** 212,215 ****
--- 238,245 ----
  			*.orig) ;; \
  			*~) ;; \
+ 			*.rsrc) \
+ 				echo $(CPMAC) $$i $$b ; \
+ 				$(CPMAC) $$i $$b ; \
+ 				;; \
  			*) \
  				if test -d $$i; then continue; fi; \