Install the dialog resources into the application bundle. The EasyDialogs

selftest now works.

diff --git a/Mac/OSX/Makefile b/Mac/OSX/Makefile
index 768d665d39232b05bf415192058ee7aa9bd46b03..0b91d3a44882d65c0098c8c5ed8992cad4bd61ca 100644 (file)
--- a/Mac/OSX/Makefile
+++ b/Mac/OSX/Makefile
@@ -25,8 +25,12 @@ OBJECTS=$(PYTHONBUILDDIR)/Mac/Python/macmain.o \
 pythonforbundle: $(OBJECTS)
        $(LD) $(LDFLAGS) $(OBJECTS) -o pythonforbundle
 
+PYTHON=$(PYTHONBUILDDIR)/python.exe
 APPTEMPLATE=$(PYTHONBUILDDIR)/Mac/OSXResources/app
 APPSUBDIRS=MacOS Resources Resources/English.lproj
+RESOURCEFILE_ASINGLE=$(PYTHONBUILDDIR)/Mac/Resources/dialogs.rsrc
+RESOURCEFILE=python.rsrc
+RFCONVERTER=$(PYTHONBUILDDIR)/Mac/Lib/applesingle.py
 install: pythonforbundle
        @for i in $(APPINSTALLDIR) $(APPINSTALLDIR)/Contents; do \
                if test ! -d $$i; then \
@@ -67,7 +71,9 @@ install: pythonforbundle
                done; \
        done
        $(INSTALL_PROGRAM) pythonforbundle $(APPINSTALLDIR)/Contents/MacOS/python
-       echo Need to install resources
+       # Create a temporary version of the resources here
+       $(PYTHON) $(RFCONVERTER) -r $(RESOURCEFILE_ASINGLE) $(RESOURCEFILE)
+       $(INSTALL_DATA) $(RESOURCEFILE) $(APPINSTALLDIR)/Contents/Resources/$(RESOURCEFILE)
                
 LIBDEST=$(INSTALLDIR)/Mac/Lib
 LIBSRC=$(PYTHONBUILDDIR)/Mac/Lib