From: Jack Jansen <jack.jansen@cwi.nl>
Date: Tue, 15 Jan 2002 23:20:40 +0000 (+0000)
Subject: Include errors.rsrc in the Python.app resource file, so the error strings
X-Git-Tag: v2.3c1~6841
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fdc8d758adde67303c9be5a6f36bf4a55a831471;p=python

Include errors.rsrc in the Python.app resource file, so the error strings
are available in MacOS API exceptions.
---

diff --git a/Mac/OSX/Makefile b/Mac/OSX/Makefile
index 89c934322b..524969bdcf 100644
--- a/Mac/OSX/Makefile
+++ b/Mac/OSX/Makefile
@@ -28,7 +28,7 @@ pythonforbundle: $(OBJECTS)
 PYTHON=$(PYTHONBUILDDIR)/python.exe
 APPTEMPLATE=$(PYTHONBUILDDIR)/Mac/OSXResources/app
 APPSUBDIRS=MacOS Resources Resources/English.lproj
-RESOURCEFILE_ASINGLE=$(PYTHONBUILDDIR)/Mac/Resources/dialogs.rsrc
+RESOURCEDIR=$(PYTHONBUILDDIR)/Mac/Resources
 RESOURCEFILE=python.rsrc
 RFCONVERTER=$(PYTHONBUILDDIR)/Mac/Lib/applesingle.py
 install: pythonforbundle
@@ -71,7 +71,11 @@ install: pythonforbundle
 	done
 	$(INSTALL_PROGRAM) pythonforbundle $(APPINSTALLDIR)/Contents/MacOS/python
 	# Create a temporary version of the resources here
-	$(PYTHON) $(RFCONVERTER) -r $(RESOURCEFILE_ASINGLE) $(RESOURCEFILE)
+	$(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)
 		
 LIBDEST=$(INSTALLDIR)/Mac/Lib