Commit 7ad20b7c authored by mark%moxienet.com's avatar mark%moxienet.com
Browse files

Excellent, we no longer have any Jaguar tinderboxes! 322578 Support ppc<->x86... 

Excellent, we no longer have any Jaguar tinderboxes!  322578 Support ppc<->x86 cross builds for Mac OS X.  Remove asdecode.  Third time's the charm.  r=josh sr=pink
parent 2486a199

config/Makefile.in

+0 −7
Original line number Diff line number Diff line
@@ -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

modules/plugin/samples/default/mac/DefaultPlugin.pbproj/project.pbxproj

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+2 −11
Original line number Diff line number Diff line
@@ -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