more Mac OS X 10.4 "Tiger" build stuff. Patch my Mark Mentovai. b=292530 r=josh r=pinkerton r=cls sr=bryner a=brendan

git-svn-id: svn://10.0.0.236/trunk@173954 18797224-902f-48f8-a5cc-f745e15eee43
2005-06-01 18:53:30 +00:00
parent 9c496f6461
commit e578f68c52
14 changed files with 1978 additions and 864 deletions
--- a/mozilla/modules/plugin/samples/default/mac/DefaultPlugin.xcode/project.pbxproj
+++ b/mozilla/modules/plugin/samples/default/mac/DefaultPlugin.xcode/project.pbxproj
@@ -0,0 +1,368 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 39;
+	objects = {
+		089C1669FE841209C02AAC07 = {
+			buildSettings = {
+			};
+			buildStyles = (
+				4F9091AC011F3BD104CA0E50,
+				4F9091AD011F3BD104CA0E50,
+				F50EB520038ABFA401A9666E,
+			);
+			hasScannedForEncodings = 1;
+			isa = PBXProject;
+			mainGroup = 089C166AFE841209C02AAC07;
+			projectDirPath = "";
+			targets = (
+				4D16849D0830226300080847,
+			);
+		};
+		089C166AFE841209C02AAC07 = {
+			children = (
+				08FB77ADFE841716C02AAC07,
+				089C167CFE841241C02AAC07,
+				089C1671FE841209C02AAC07,
+				19C28FB4FE9D528D11CA2CBB,
+				4D1684AC0830226300080847,
+			);
+			isa = PBXGroup;
+			name = MRJPlugin;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		089C1671FE841209C02AAC07 = {
+			children = (
+				F5A7D3AB036E359F01A96660,
+				08EA7FFBFE8413EDC02AAC07,
+			);
+			isa = PBXGroup;
+			name = "External Frameworks and Libraries";
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		089C167CFE841241C02AAC07 = {
+			children = (
+				089C167DFE841241C02AAC07,
+				F5E0C34D036A12DF01A96660,
+			);
+			isa = PBXGroup;
+			name = Resources;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		089C167DFE841241C02AAC07 = {
+			children = (
+				089C167EFE841241C02AAC07,
+			);
+			isa = PBXVariantGroup;
+			name = InfoPlist.strings;
+			path = "";
+			refType = 2;
+			sourceTree = SOURCE_ROOT;
+		};
+		089C167EFE841241C02AAC07 = {
+			fileEncoding = 10;
+			isa = PBXFileReference;
+			lastKnownFileType = text.plist.strings;
+			name = English;
+			path = English.lproj/InfoPlist.strings;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		08EA7FFBFE8413EDC02AAC07 = {
+			isa = PBXFileReference;
+			lastKnownFileType = wrapper.framework;
+			name = Carbon.framework;
+			path = /System/Library/Frameworks/Carbon.framework;
+			refType = 0;
+			sourceTree = "<absolute>";
+		};
+		08FB77ADFE841716C02AAC07 = {
+			children = (
+				0F64AF2C0433C8A200A96652,
+				F5E0C34F036A130901A96660,
+				F5E0C351036A130E01A96660,
+			);
+			isa = PBXGroup;
+			name = Source;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+//080
+//081
+//082
+//083
+//084
+//0F0
+//0F1
+//0F2
+//0F3
+//0F4
+		0F64AF2C0433C8A200A96652 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			path = DefaultPluginPrefix.h;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+//0F0
+//0F1
+//0F2
+//0F3
+//0F4
+//190
+//191
+//192
+//193
+//194
+		19C28FB4FE9D528D11CA2CBB = {
+			children = (
+				4D1684AD0830226300080847,
+			);
+			isa = PBXGroup;
+			name = Products;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+//190
+//191
+//192
+//193
+//194
+//4D0
+//4D1
+//4D2
+//4D3
+//4D4
+		4D16849D0830226300080847 = {
+			buildPhases = (
+				4D16849F0830226300080847,
+				4D1684A10830226300080847,
+				4D1684A30830226300080847,
+				4D1684A60830226300080847,
+				4D1684A90830226300080847,
+				4D1684AB0830226300080847,
+			);
+			buildRules = (
+			);
+			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = "\"$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreFoundation.framework\"";
+				GCC_PREFIX_HEADER = DefaultPluginPrefix.h;
+				GCC_PREPROCESSOR_DEFINITIONS = "XP_MACOSX=1 NO_X11=1 USE_SYSTEM_CONSOLE=1";
+				HEADER_SEARCH_PATHS = "../../../../../dist/sdk/xpcom/include ../../../../../dist/include/caps ../../../../../dist/include/java ../../../../../dist/include/js ../../../../../dist/include/nspr ../../../../../dist/include/nspr/obsolete ../../../../../dist/include/oji ../../../../../dist/include/plugin ../../../../../dist/include/xpcom ../../../../../dist/include/xpconnect ../../../../../dist/include /Developer/Headers/FlatCarbon";
+				INFOPLIST_FILE = "Info-DefaultPlugin.plist";
+				LIBRARY_SEARCH_PATHS = /usr/lib;
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = "Default Plugin";
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
+				WRAPPER_EXTENSION = plugin;
+			};
+			dependencies = (
+			);
+			isa = PBXNativeTarget;
+			name = "Default Plugin";
+			productName = MRJPlugin;
+			productReference = 4D1684AD0830226300080847;
+			productType = "com.apple.product-type.bundle";
+		};
+		4D16849F0830226300080847 = {
+			buildActionMask = 2147483647;
+			files = (
+				4D1684A00830226300080847,
+			);
+			isa = PBXHeadersBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		4D1684A00830226300080847 = {
+			fileRef = 0F64AF2C0433C8A200A96652;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		4D1684A10830226300080847 = {
+			buildActionMask = 2147483647;
+			files = (
+				4D1684A20830226300080847,
+			);
+			isa = PBXResourcesBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		4D1684A20830226300080847 = {
+			fileRef = 089C167DFE841241C02AAC07;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		4D1684A30830226300080847 = {
+			buildActionMask = 2147483647;
+			files = (
+				4D1684A40830226300080847,
+				4D1684A50830226300080847,
+			);
+			isa = PBXSourcesBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		4D1684A40830226300080847 = {
+			fileRef = F5E0C34F036A130901A96660;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		4D1684A50830226300080847 = {
+			fileRef = F5E0C351036A130E01A96660;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		4D1684A60830226300080847 = {
+			buildActionMask = 2147483647;
+			files = (
+				4D1684A70830226300080847,
+				4D1684A80830226300080847,
+			);
+			isa = PBXFrameworksBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		4D1684A70830226300080847 = {
+			fileRef = 08EA7FFBFE8413EDC02AAC07;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		4D1684A80830226300080847 = {
+			fileRef = F5A7D3AB036E359F01A96660;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		4D1684A90830226300080847 = {
+			buildActionMask = 2147483647;
+			files = (
+				4D1684AA0830226300080847,
+			);
+			isa = PBXRezBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		4D1684AA0830226300080847 = {
+			fileRef = F5E0C34D036A12DF01A96660;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		4D1684AB0830226300080847 = {
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 6;
+			files = (
+			);
+			isa = PBXCopyFilesBuildPhase;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		4D1684AC0830226300080847 = {
+			isa = PBXFileReference;
+			lastKnownFileType = text.xml;
+			path = "Info-DefaultPlugin.plist";
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		4D1684AD0830226300080847 = {
+			explicitFileType = wrapper.cfbundle;
+			includeInIndex = 0;
+			isa = PBXFileReference;
+			path = "Default Plugin.plugin";
+			refType = 3;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+//4D0
+//4D1
+//4D2
+//4D3
+//4D4
+//4F0
+//4F1
+//4F2
+//4F3
+//4F4
+		4F9091AC011F3BD104CA0E50 = {
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				OPTIMIZATION_CFLAGS = "-O0";
+				ZERO_LINK = YES;
+			};
+			isa = PBXBuildStyle;
+			name = Development;
+		};
+		4F9091AD011F3BD104CA0E50 = {
+			buildSettings = {
+				COPY_PHASE_STRIP = YES;
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				ZERO_LINK = NO;
+			};
+			isa = PBXBuildStyle;
+			name = Deployment;
+		};
+//4F0
+//4F1
+//4F2
+//4F3
+//4F4
+//F50
+//F51
+//F52
+//F53
+//F54
+		F50EB520038ABFA401A9666E = {
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				DEBUGGING_SYMBOLS = YES;
+			};
+			isa = PBXBuildStyle;
+			name = DeploymentSymbols;
+		};
+		F5A7D3AB036E359F01A96660 = {
+			isa = PBXFileReference;
+			lastKnownFileType = wrapper.framework;
+			name = CoreFoundation.framework;
+			path = /System/Library/Frameworks/CoreFoundation.framework;
+			refType = 0;
+			sourceTree = "<absolute>";
+		};
+		F5E0C34D036A12DF01A96660 = {
+			isa = PBXFileReference;
+			lastKnownFileType = file;
+			path = _NullPlugin.rsrc;
+			refType = 2;
+			sourceTree = SOURCE_ROOT;
+		};
+		F5E0C34F036A130901A96660 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
+			path = NullPlugin.cpp;
+			refType = 2;
+			sourceTree = SOURCE_ROOT;
+		};
+		F5E0C351036A130E01A96660 = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.cpp.cpp;
+			path = npmac.cpp;
+			refType = 2;
+			sourceTree = SOURCE_ROOT;
+		};
+	};
+	rootObject = 089C1669FE841209C02AAC07;
+}
--- a/mozilla/modules/plugin/samples/default/mac/Info-DefaultPlugin.plist
+++ b/mozilla/modules/plugin/samples/default/mac/Info-DefaultPlugin.plist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>Default Plugin</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>com.netscape.DefaultPlugin</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>NSPL</string>
+	<key>CFBundleSignature</key>
+	<string>MOSS</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+</dict>
+</plist>
--- a/mozilla/modules/plugin/samples/default/mac/Makefile.in
+++ b/mozilla/modules/plugin/samples/default/mac/Makefile.in
@@ -60,6 +60,8 @@ PACKAGE_FILE = npnul.pkg

 include $(topsrcdir)/config/rules.mk

+unexport CC CXX
+
 # decodes resource files from AppleSingle to Resource Manager format.
 ASDECODE = $(DIST)/bin/asdecode
 RESOURCE_FILES = _NullPlugin.rsrc
@@ -68,11 +70,12 @@ RESOURCE_FILES = _NullPlugin.rsrc
 ABS_topsrcdir   := $(shell cd $(topsrcdir); pwd)
 ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
 export::
-	rsync -a --exclude .DS_Store --exclude "CVS/" $(srcdir)/DefaultPlugin.pbproj .
+	rsync -a --exclude .DS_Store --exclude "CVS/" $(srcdir)/DefaultPlugin.xcode .
 	ln -fs $(srcdir)/English.lproj
 	ln -fs $(srcdir)/DefaultPluginPrefix.h
 	ln -fs $(srcdir)/NullPlugin.cpp
 	ln -fs $(srcdir)/npmac.cpp
+	ln -fs $(srcdir)/Info-*.plist .
 endif

 all:: build-plugin
@@ -86,7 +89,8 @@ install-plugin: build-plugin
 resources: $(RESOURCE_FILES)

 build-plugin: resources
-	$(PBBUILD) -target $(TARGET) -buildstyle $(BUILDSTYLE)
+	$(PBBUILD) -project DefaultPlugin.xcode -target $(TARGET) -buildstyle $(BUILDSTYLE) $(PBBUILD_SETTINGS)
+	echo -n NSPLMOSS > "build/DefaultPlugin.build/Default Plugin.build/PkgInfo"

 _%.rsrc: %.rsrc
 	$(ASDECODE) $< $@