From 227fa8f814f9eb09056fcc823fc87ccc5f32fea0 Mon Sep 17 00:00:00 2001 From: "mark%moxienet.com" Date: Fri, 27 Jan 2006 22:19:42 +0000 Subject: [PATCH] 322578 backing out due to 10.2 bustage --- config/Makefile.in | 7 +++++++ .../mac/DefaultPlugin.pbproj/project.pbxproj | 2 +- .../mac/DefaultPlugin.xcode/project.pbxproj | 2 +- .../plugin/samples/default/mac/Makefile.in | 15 ++++++++++----- .../samples/default/mac/NullPlugin.rsrc | Bin 1829 -> 1923 bytes .../plugin/MRJPlugin.pbproj/project.pbxproj | 8 ++++---- .../MRJCarbon/plugin/Resources/Dialogs.rsrc | Bin 1062 -> 1156 bytes .../oji/MRJCarbon/plugin/Resources/Makefile | 18 +++++++++++++++--- .../MRJCarbon/plugin/Resources/Strings.rsrc | Bin 1528 -> 1622 bytes .../MRJCarbon/plugin/Resources/Version.rsrc | Bin 668 -> 762 bytes 10 files changed, 38 insertions(+), 14 deletions(-) diff --git a/config/Makefile.in b/config/Makefile.in index 8aa256a938ec..55718e7828f5 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -68,6 +68,13 @@ TARGETS += elf-dynstr-gc endif endif +ifeq ($(OS_ARCH), Darwin) +# XXX Setting CPP_PROG_LINK is ugly, but it works (it makes nsinstall +# link with $(CXX)). asdecode should really be in its own directory. +CPP_PROG_LINK = 1 +SIMPLE_PROGRAMS += asdecode +endif + # IMPORTANT: Disable NSBUILDROOT for this directory only, otherwise we have # a recursive rule for finding nsinstall and the Perl scripts. ifdef NSBUILDROOT diff --git a/modules/plugin/samples/default/mac/DefaultPlugin.pbproj/project.pbxproj b/modules/plugin/samples/default/mac/DefaultPlugin.pbproj/project.pbxproj index 2321e8960a36..da877e41e2bf 100644 --- a/modules/plugin/samples/default/mac/DefaultPlugin.pbproj/project.pbxproj +++ b/modules/plugin/samples/default/mac/DefaultPlugin.pbproj/project.pbxproj @@ -349,7 +349,7 @@ }; F5E0C34D036A12DF01A96660 = { isa = PBXFileReference; - path = NullPlugin.rsrc; + path = _NullPlugin.rsrc; refType = 2; }; F5E0C34E036A12DF01A96660 = { diff --git a/modules/plugin/samples/default/mac/DefaultPlugin.xcode/project.pbxproj b/modules/plugin/samples/default/mac/DefaultPlugin.xcode/project.pbxproj index 3b10f03de3ad..0c0588ce47f5 100644 --- a/modules/plugin/samples/default/mac/DefaultPlugin.xcode/project.pbxproj +++ b/modules/plugin/samples/default/mac/DefaultPlugin.xcode/project.pbxproj @@ -343,7 +343,7 @@ F5E0C34D036A12DF01A96660 = { isa = PBXFileReference; lastKnownFileType = file; - path = NullPlugin.rsrc; + path = _NullPlugin.rsrc; refType = 2; sourceTree = SOURCE_ROOT; }; diff --git a/modules/plugin/samples/default/mac/Makefile.in b/modules/plugin/samples/default/mac/Makefile.in index 7add95c42e28..df0185296289 100644 --- a/modules/plugin/samples/default/mac/Makefile.in +++ b/modules/plugin/samples/default/mac/Makefile.in @@ -76,6 +76,10 @@ PACKAGE_FILE = npnul.pkg unexport CC CXX +# decodes resource files from AppleSingle to Resource Manager format. +ASDECODE = $(DIST)/bin/asdecode +RESOURCE_FILES = _NullPlugin.rsrc + # for objdir builds, copy the project, and symlink the sources ABS_topsrcdir := $(shell cd $(topsrcdir); pwd) ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT)) @@ -86,7 +90,6 @@ export:: ln -fs $(srcdir)/NullPlugin.cpp ln -fs $(srcdir)/npmac.cpp ln -fs $(srcdir)/Info-*.plist . - ln -fs $(srcdir)/NullPlugin.rsrc endif libs install:: install-plugin @@ -94,13 +97,15 @@ libs install:: install-plugin install-plugin: build-plugin $(INSTALL) "$(XCODE_PRODUCT_DIR)/Default Plugin.plugin" $(DIST)/bin/plugins -resources: - @echo These .rsrc files are now distributed as resources in data forks. - @echo No further processing is necessary. +resources: $(RESOURCE_FILES) -build-plugin: +build-plugin: resources $(PBBUILD) $(PROJECT_ARG) -target $(TARGET) -buildstyle $(BUILDSTYLE) $(PBBUILD_ARG) echo -n NSPLMOSS > "$(XCODE_PRODUCT_DIR)/Default Plugin.plugin/Contents/PkgInfo" +_%.rsrc: %.rsrc + $(ASDECODE) $< $@ + clean clobber distclean:: + rm -f $(RESOURCE_FILES) rm -rf build diff --git a/modules/plugin/samples/default/mac/NullPlugin.rsrc b/modules/plugin/samples/default/mac/NullPlugin.rsrc index 46f333438b8de0733a9c02d66816a6c53a33791a..1a09fad814f071ee0369684dfd9dce1e6627c44b 100644 GIT binary patch delta 103 zcmZ3=*UWFnz$(VTz{G$Fn1Mo!Kx_w<0;vJA*;RowCy-7C(h3_?*%g91)t_1+6G7F9X delta 8 PcmZqXU&^=9PL&-1415A% diff --git a/plugin/oji/MRJCarbon/plugin/MRJPlugin.pbproj/project.pbxproj b/plugin/oji/MRJCarbon/plugin/MRJPlugin.pbproj/project.pbxproj index 4f72baab3a97..754a02cdf1e7 100644 --- a/plugin/oji/MRJCarbon/plugin/MRJPlugin.pbproj/project.pbxproj +++ b/plugin/oji/MRJCarbon/plugin/MRJPlugin.pbproj/project.pbxproj @@ -406,14 +406,14 @@ }; F59D146D02AC308301000104 = { isa = PBXFileReference; - name = Dialogs.rsrc; - path = Resources/Dialogs.rsrc; + name = _Dialogs.rsrc; + path = Resources/_Dialogs.rsrc; refType = 2; }; F59D146E02AC308301000104 = { isa = PBXFileReference; - name = Strings.rsrc; - path = Resources/Strings.rsrc; + name = _Strings.rsrc; + path = Resources/_Strings.rsrc; refType = 2; }; F59D146F02AC308301000104 = { diff --git a/plugin/oji/MRJCarbon/plugin/Resources/Dialogs.rsrc b/plugin/oji/MRJCarbon/plugin/Resources/Dialogs.rsrc index f80b30dfd0e91cd281a8768031842bec35afea0f..728a264db18212574f3d4282afc658cb49b995ec 100644 GIT binary patch delta 88 zcmZ3+(Zb2bz$(VTz%+58uqrbH0|O%v+W|2MFaa@;&7uaRIe~NvkXG2B#-b1u9OUeh OUz!e5%y1AypaKA&1PF@& delta 8 PcmZqST*k4{PK^Zs3_$`_ diff --git a/plugin/oji/MRJCarbon/plugin/Resources/Makefile b/plugin/oji/MRJCarbon/plugin/Resources/Makefile index 00e7f9555f0d..e852f952e32a 100644 --- a/plugin/oji/MRJCarbon/plugin/Resources/Makefile +++ b/plugin/oji/MRJCarbon/plugin/Resources/Makefile @@ -1,3 +1,15 @@ -all: - @echo These .rsrc files are now distributed as resources in data forks. - @echo No further processing is necessary. +# decodes resource files from AppleSingle to Resource Manager format. + +ASDECODE = ../../../../../dist/bin/asdecode +RESOURCE_FILES = _Dialogs.rsrc _Strings.rsrc + +all: $(RESOURCE_FILES) + +_Dialogs.rsrc: Dialogs.rsrc + $(ASDECODE) Dialogs.rsrc _Dialogs.rsrc + +_Strings.rsrc: Strings.rsrc + $(ASDECODE) Strings.rsrc _Strings.rsrc + +clean: + rm -f $(RESOURCE_FILES) diff --git a/plugin/oji/MRJCarbon/plugin/Resources/Strings.rsrc b/plugin/oji/MRJCarbon/plugin/Resources/Strings.rsrc index f477bfdca5e38cfd81855763a303b028727f2f4a..591b7b609e89c809bfaf70710733e37ed86fcaf3 100644 GIT binary patch delta 103 zcmeyteT~PCfmMuwfr$YVFaw1cf!Gcz1yTcKv;F|moD2+XW