diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2002-08-15 21:31:18 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2002-08-15 21:31:18 (GMT) |
| commit | 81204152d4e4de10b074a8db14b2ae426db5bcb0 (patch) | |
| tree | 3497e8ea35051a67996ce0f07e482c905cdff546 /Mac | |
| parent | e417de0e5697a5242f7530292da13c25eddcf439 (diff) | |
| download | cpython-81204152d4e4de10b074a8db14b2ae426db5bcb0.zip cpython-81204152d4e4de10b074a8db14b2ae426db5bcb0.tar.gz cpython-81204152d4e4de10b074a8db14b2ae426db5bcb0.tar.bz2 | |
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.
Diffstat (limited to 'Mac')
| -rw-r--r-- | Mac/OSX/Makefile | 42 |
1 files changed, 36 insertions, 6 deletions
diff --git a/Mac/OSX/Makefile b/Mac/OSX/Makefile index 6411fb3..ec51d02 100644 --- a/Mac/OSX/Makefile +++ b/Mac/OSX/Makefile @@ -38,6 +38,7 @@ CC=cc LD=cc REZ=/Developer/Tools/Rez DEREZ=/Developer/Tools/DeRez +CPMAC=/Developer/Tools/CpMac PYTHON=$(builddir)/python.exe APPTEMPLATE=$(srcdir)/Mac/OSXResources/app @@ -92,11 +93,27 @@ install_Python: $(PYTHON) done; \ 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 +# 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) @@ -154,7 +171,7 @@ installmacsubtree: $(INSTALLED_PYTHON) else true; \ fi; \ done - @for i in $(MACLIBSRC)/*.py $(MACLIBSRC)/*.rsrc; \ + @for i in $(MACLIBSRC)/*.py; \ do \ if test -x $$i; then \ $(INSTALL_SCRIPT) $$i $(MACLIBDEST); \ @@ -164,6 +181,11 @@ installmacsubtree: $(INSTALLED_PYTHON) echo $(INSTALL_DATA) $$i $(MACLIBDEST); \ fi; \ done +## @for i in $(MACLIBSRC)/*.rsrc; \ +## do \ +## echo $(CPMAC) $$i $$b ; \ +## $(CPMAC) $$i $$b ; \ +## done @for d in $(MACLIBSUBDIRS); \ do \ a=$(MACLIBSRC)/$$d; \ @@ -176,6 +198,10 @@ installmacsubtree: $(INSTALLED_PYTHON) *.py[co]) ;; \ *.orig) ;; \ *~) ;; \ + *.rsrc) \ + echo $(CPMAC) $$i $$b ; \ + $(CPMAC) $$i $$b ; \ + ;; \ *) \ if test -d $$i; then continue; fi; \ if test -x $$i; then \ @@ -211,6 +237,10 @@ installmacsubtree: $(INSTALLED_PYTHON) *.py[co]) ;; \ *.orig) ;; \ *~) ;; \ + *.rsrc) \ + echo $(CPMAC) $$i $$b ; \ + $(CPMAC) $$i $$b ; \ + ;; \ *) \ if test -d $$i; then continue; fi; \ if test -x $$i; then \ |