From 87aea0e5a59ad8292bccff9020910d25269a997e Mon Sep 17 00:00:00 2001 From: "mark%moxienet.com" Date: Fri, 27 Jan 2006 21:00:32 +0000 Subject: [PATCH] 322578 Support ppc<->x86 cross builds for Mac OS X. Remove asdecode. r=josh sr=pink git-svn-id: svn://10.0.0.236/trunk@188365 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/config/Makefile.in | 7 ------- .../mac/DefaultPlugin.pbproj/project.pbxproj | 2 +- .../mac/DefaultPlugin.xcode/project.pbxproj | 2 +- .../plugin/samples/default/mac/Makefile.in | 13 ++----------- .../samples/default/mac/NullPlugin.rsrc | Bin 1923 -> 1829 bytes .../plugin/MRJPlugin.pbproj/project.pbxproj | 8 ++++---- .../MRJCarbon/plugin/Resources/Dialogs.rsrc | Bin 1156 -> 1062 bytes .../oji/MRJCarbon/plugin/Resources/Makefile | 18 +++--------------- .../MRJCarbon/plugin/Resources/Strings.rsrc | Bin 1622 -> 1528 bytes .../MRJCarbon/plugin/Resources/Version.rsrc | Bin 762 -> 668 bytes 10 files changed, 11 insertions(+), 39 deletions(-) diff --git a/mozilla/config/Makefile.in b/mozilla/config/Makefile.in index 55718e7828f..8aa256a938e 100644 --- a/mozilla/config/Makefile.in +++ b/mozilla/config/Makefile.in @@ -68,13 +68,6 @@ 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/mozilla/modules/plugin/samples/default/mac/DefaultPlugin.pbproj/project.pbxproj b/mozilla/modules/plugin/samples/default/mac/DefaultPlugin.pbproj/project.pbxproj index da877e41e2b..2321e8960a3 100644 --- a/mozilla/modules/plugin/samples/default/mac/DefaultPlugin.pbproj/project.pbxproj +++ b/mozilla/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/mozilla/modules/plugin/samples/default/mac/DefaultPlugin.xcode/project.pbxproj b/mozilla/modules/plugin/samples/default/mac/DefaultPlugin.xcode/project.pbxproj index 0c0588ce47f..3b10f03de3a 100644 --- a/mozilla/modules/plugin/samples/default/mac/DefaultPlugin.xcode/project.pbxproj +++ b/mozilla/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/mozilla/modules/plugin/samples/default/mac/Makefile.in b/mozilla/modules/plugin/samples/default/mac/Makefile.in index df018529628..7ddc056fc51 100644 --- a/mozilla/modules/plugin/samples/default/mac/Makefile.in +++ b/mozilla/modules/plugin/samples/default/mac/Makefile.in @@ -76,10 +76,6 @@ 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)) @@ -90,6 +86,7 @@ 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 @@ -97,15 +94,9 @@ libs install:: install-plugin install-plugin: build-plugin $(INSTALL) "$(XCODE_PRODUCT_DIR)/Default Plugin.plugin" $(DIST)/bin/plugins -resources: $(RESOURCE_FILES) - -build-plugin: resources +build-plugin: $(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/mozilla/modules/plugin/samples/default/mac/NullPlugin.rsrc b/mozilla/modules/plugin/samples/default/mac/NullPlugin.rsrc index 1a09fad814f071ee0369684dfd9dce1e6627c44b..46f333438b8de0733a9c02d66816a6c53a33791a 100644 GIT binary patch delta 8 PcmZqXU&^=9PL&-1415A% delta 103 zcmZ3=*UWFnz$(VTz{G$Fn1Mo!Kx_w<0;vJA*;RowCy-7C(h3_?*%g91)t_1+6G7F9X diff --git a/mozilla/plugin/oji/MRJCarbon/plugin/MRJPlugin.pbproj/project.pbxproj b/mozilla/plugin/oji/MRJCarbon/plugin/MRJPlugin.pbproj/project.pbxproj index 754a02cdf1e..4f72baab3a9 100644 --- a/mozilla/plugin/oji/MRJCarbon/plugin/MRJPlugin.pbproj/project.pbxproj +++ b/mozilla/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/mozilla/plugin/oji/MRJCarbon/plugin/Resources/Dialogs.rsrc b/mozilla/plugin/oji/MRJCarbon/plugin/Resources/Dialogs.rsrc index 728a264db18212574f3d4282afc658cb49b995ec..f80b30dfd0e91cd281a8768031842bec35afea0f 100644 GIT binary patch delta 8 PcmZqST*k4{PK^Zs3_$`_ delta 88 zcmZ3+(Zb2bz$(VTz%+58uqrbH0|O%v+W|2MFaa@;&7uaRIe~NvkXG2B#-b1u9OUeh OUz!e5%y1AypaKA&1PF@& diff --git a/mozilla/plugin/oji/MRJCarbon/plugin/Resources/Makefile b/mozilla/plugin/oji/MRJCarbon/plugin/Resources/Makefile index e852f952e32..00e7f9555f0 100644 --- a/mozilla/plugin/oji/MRJCarbon/plugin/Resources/Makefile +++ b/mozilla/plugin/oji/MRJCarbon/plugin/Resources/Makefile @@ -1,15 +1,3 @@ -# 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) +all: + @echo These .rsrc files are now distributed as resources in data forks. + @echo No further processing is necessary. diff --git a/mozilla/plugin/oji/MRJCarbon/plugin/Resources/Strings.rsrc b/mozilla/plugin/oji/MRJCarbon/plugin/Resources/Strings.rsrc index 591b7b609e89c809bfaf70710733e37ed86fcaf3..f477bfdca5e38cfd81855763a303b028727f2f4a 100644 GIT binary patch delta 8 Pcmcb{^MiY%-49j(5{3iP delta 103 zcmeyteT~PCfmMuwfr$YVFaw1cf!Gcz1yTcKv;F|moD2+XW