322578 backing out due to 10.2 bustage

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

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 = {

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;
 		};

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

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 = {

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)