Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 8120415

Browse files
jackjansenjackjansen
committed
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.
1 parent e417de0 commit 8120415

1 file changed

Lines changed: 36 additions & 6 deletions

File tree

‎Mac/OSX/Makefile‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ CC=cc
3838
LD=cc
3939
REZ=/Developer/Tools/Rez
4040
DEREZ=/Developer/Tools/DeRez
41+
CPMAC=/Developer/Tools/CpMac
4142

4243
PYTHON=$(builddir)/python.exe
4344
APPTEMPLATE=$(srcdir)/Mac/OSXResources/app
@@ -92,11 +93,27 @@ install_Python: $(PYTHON)
9293
done; \
9394
done
9495
$(INSTALL_PROGRAM) $(STRIPFLAG) $(PYTHON) $(APPINSTALLDIR)/Contents/MacOS/python
95-
# Create a temporary version of the resources here
96-
$(PYTHON) $(RFCONVERTER) -r $(RESOURCEDIR)/dialogs.rsrc dialogs.rsrc
97-
$(PYTHON) $(RFCONVERTER) -r $(RESOURCEDIR)/errors.rsrc errors.rsrc
98-
$(DEREZ) -useDF -skip ckid dialogs.rsrc > dialogs.r
99-
$(DEREZ) -useDF -skip ckid errors.rsrc > errors.r
96+
# Create a temporary version of the resources here
97+
# Note that the resource files can either be real 2-fork resource files
98+
# or AppleSingle encoded files.
99+
@if test -s $(RESOURCEDIR)/dialogs.rsrc; then \
100+
echo $(PYTHON) $(RFCONVERTER) -r $(RESOURCEDIR)/dialogs.rsrc dialogs.rsrc ;\
101+
$(PYTHON) $(RFCONVERTER) -r $(RESOURCEDIR)/dialogs.rsrc dialogs.rsrc ; \
102+
echo $(DEREZ) -useDF -skip ckid dialogs.rsrc > dialogs.r ; \
103+
$(DEREZ) -useDF -skip ckid dialogs.rsrc > dialogs.r ; \
104+
else \
105+
echo $(DEREZ) -skip ckid $(RESOURCEDIR)/dialogs.rsrc > dialogs.r ; \
106+
$(DEREZ) -skip ckid $(RESOURCEDIR)/dialogs.rsrc > dialogs.r ; \
107+
fi
108+
@if test -s $(RESOURCEDIR)/errors.rsrc; then \
109+
echo $(PYTHON) $(RFCONVERTER) -r $(RESOURCEDIR)/errors.rsrc errors.rsrc ;\
110+
$(PYTHON) $(RFCONVERTER) -r $(RESOURCEDIR)/errors.rsrc errors.rsrc ; \
111+
echo $(DEREZ) -useDF -skip ckid errors.rsrc > errors.r ; \
112+
$(DEREZ) -useDF -skip ckid errors.rsrc > errors.r ; \
113+
else \
114+
echo $(DEREZ) -skip ckid $(RESOURCEDIR)/errors.rsrc > errors.r ; \
115+
$(DEREZ) -skip ckid $(RESOURCEDIR)/errors.rsrc > errors.r ; \
116+
fi
100117
$(REZ) -useDF -o $(RESOURCEFILE) dialogs.r errors.r
101118
$(INSTALL_DATA) $(RESOURCEFILE) $(APPINSTALLDIR)/Contents/Resources/$(RESOURCEFILE)
102119

@@ -154,7 +171,7 @@ installmacsubtree: $(INSTALLED_PYTHON)
154171
else true; \
155172
fi; \
156173
done
157-
@for i in $(MACLIBSRC)/*.py $(MACLIBSRC)/*.rsrc; \
174+
@for i in $(MACLIBSRC)/*.py; \
158175
do \
159176
if test -x $$i; then \
160177
$(INSTALL_SCRIPT) $$i $(MACLIBDEST); \
@@ -164,6 +181,11 @@ installmacsubtree: $(INSTALLED_PYTHON)
164181
echo $(INSTALL_DATA) $$i $(MACLIBDEST); \
165182
fi; \
166183
done
184+
## @for i in $(MACLIBSRC)/*.rsrc; \
185+
## do \
186+
## echo $(CPMAC) $$i $$b ; \
187+
## $(CPMAC) $$i $$b ; \
188+
## done
167189
@for d in $(MACLIBSUBDIRS); \
168190
do \
169191
a=$(MACLIBSRC)/$$d; \
@@ -176,6 +198,10 @@ installmacsubtree: $(INSTALLED_PYTHON)
176198
*.py[co]) ;; \
177199
*.orig) ;; \
178200
*~) ;; \
201+
*.rsrc) \
202+
echo $(CPMAC) $$i $$b ; \
203+
$(CPMAC) $$i $$b ; \
204+
;; \
179205
*) \
180206
if test -d $$i; then continue; fi; \
181207
if test -x $$i; then \
@@ -211,6 +237,10 @@ installmacsubtree: $(INSTALLED_PYTHON)
211237
*.py[co]) ;; \
212238
*.orig) ;; \
213239
*~) ;; \
240+
*.rsrc) \
241+
echo $(CPMAC) $$i $$b ; \
242+
$(CPMAC) $$i $$b ; \
243+
;; \
214244
*) \
215245
if test -d $$i; then continue; fi; \
216246
if test -x $$i; then \

0 commit comments

Comments
 (0)