diff --git a/mozilla/embedding/components/printingui/src/mac/printpde/Makefile.in b/mozilla/embedding/components/printingui/src/mac/printpde/Makefile.in index ddeb1eafd57..d1790f52df1 100644 --- a/mozilla/embedding/components/printingui/src/mac/printpde/Makefile.in +++ b/mozilla/embedding/components/printingui/src/mac/printpde/Makefile.in @@ -60,6 +60,8 @@ endif libs:: pbxbuild -buildstyle $(BUILDSTYLE) install - cp -R build/UninstalledProducts/PrintPDE.plugin $(DIST) + mkdir -p $(DIST)/package + cp -R build/UninstalledProducts/PrintPDE.plugin $(DIST)/package/ + clean clobber:: rm -rf build diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in index 8fb7b8adf10..d6c23eadaa4 100644 --- a/mozilla/xpfe/bootstrap/Makefile.in +++ b/mozilla/xpfe/bootstrap/Makefile.in @@ -428,9 +428,11 @@ libs:: $(PROGRAM) rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM) rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS mkdir -p $(DIST)/$(APP_NAME).app/Contents/Plug-Ins - cp -R $(DIST)/PrintPDE.plugin $(DIST)/$(APP_NAME).app/Contents/Plug-Ins + cp -R $(DIST)/package/PrintPDE.plugin $(DIST)/$(APP_NAME).app/Contents/Plug-Ins/ cp -RL $(srcdir)/macbuild/mach.icns $(DIST)/$(APP_NAME).app/Contents/Resources/mach.icns + cp -RL $(DIST)/package/mozillaSuite.rsrc $(DIST)/$(APP_NAME).app/Contents/Resources/$(PROGRAM).rsrc echo -n APPLMOZZ > $(DIST)/$(APP_NAME).app/Contents/PkgInfo + clean clobber:: rm -rf $(DIST)/$(APP_NAME).app endif diff --git a/mozilla/xpfe/bootstrap/appleevents/Makefile.in b/mozilla/xpfe/bootstrap/appleevents/Makefile.in index 54458cdb987..80bb5b6a8ec 100644 --- a/mozilla/xpfe/bootstrap/appleevents/Makefile.in +++ b/mozilla/xpfe/bootstrap/appleevents/Makefile.in @@ -91,4 +91,22 @@ LOCAL_INCLUDES = \ include $(topsrcdir)/config/rules.mk + +# convert AppleScript dictionary .sdef file into .r format, and thence to .rsrc +SDP_TOOL = /Developer/Tools/sdp +REZ_TOOL = /Developer/Tools/Rez +SDEF_SRC = $(srcdir)/mozilla.sdef +RES_DEST = mozillaSuite.r +RSRC_DEST = mozillaSuite.rsrc + +$(RSRC_DEST): $(SDEF_SRC) + $(SDP_TOOL) -fa -o $(RES_DEST) $(SDEF_SRC) + $(REZ_TOOL) -useDF -o $(RSRC_DEST) $(RES_DEST) + cp $(RSRC_DEST) $(DIST)/package/ + rm -f $(RES_DEST) $(RSRC_DEST) + +libs:: $(RSRC_DEST) + +GARBAGE += $(RES_DEST) $(RSRC_DEST) + OS_CXXFLAGS += -fexceptions diff --git a/mozilla/xpfe/bootstrap/appleevents/mozilla.sdef b/mozilla/xpfe/bootstrap/appleevents/mozilla.sdef new file mode 100644 index 00000000000..4f3046fef0e --- /dev/null +++ b/mozilla/xpfe/bootstrap/appleevents/mozilla.sdef @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +