Build and run bzip2 and gzip filter tests in net. Brings net, bzip2, and zlib

project files into the new xcconfig-based setup.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1001 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 26 insertions, 58 deletions

diff --git a/third_party/zlib/zlib.xcodeproj/project.pbxproj b/third_party/zlib/zlib.xcodeproj/project.pbxproj
index 82b4d7e..963b3d4 100644
--- a/third_party/zlib/zlib.xcodeproj/project.pbxproj
+++ b/third_party/zlib/zlib.xcodeproj/project.pbxproj
@@ -3,36 +3,30 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 44;
+	objectVersion = 45;
 	objects = {
 
 /* Begin PBXBuildFile section */
 		82AB5D830D8044BE005B920B /* adler32.c in Sources */ = {isa = PBXBuildFile; fileRef = 82AB5D6C0D8044BE005B920B /* adler32.c */; };
 		82AB5D840D8044BE005B920B /* compress.c in Sources */ = {isa = PBXBuildFile; fileRef = 82AB5D6D0D8044BE005B920B /* compress.c */; };
 		82AB5D850D8044BE005B920B /* crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = 82AB5D6E0D8044BE005B920B /* crc32.c */; };
-		82AB5D860D8044BE005B920B /* crc32.h in Headers */ = {isa = PBXBuildFile; fileRef = 82AB5D6F0D8044BE005B920B /* crc32.h */; };
 		82AB5D870D8044BE005B920B /* deflate.c in Sources */ = {isa = PBXBuildFile; fileRef = 82AB5D700D8044BE005B920B /* deflate.c */; };
-		82AB5D880D8044BE005B920B /* deflate.h in Headers */ = {isa = PBXBuildFile; fileRef = 82AB5D710D8044BE005B920B /* deflate.h */; };
 		82AB5D890D8044BE005B920B /* gzio.c in Sources */ = {isa = PBXBuildFile; fileRef = 82AB5D720D8044BE005B920B /* gzio.c */; };
 		82AB5D8A0D8044BE005B920B /* infback.c in Sources */ = {isa = PBXBuildFile; fileRef = 82AB5D730D8044BE005B920B /* infback.c */; };
 		82AB5D8B0D8044BE005B920B /* inffast.c in Sources */ = {isa = PBXBuildFile; fileRef = 82AB5D740D8044BE005B920B /* inffast.c */; };
-		82AB5D8C0D8044BE005B920B /* inffast.h in Headers */ = {isa = PBXBuildFile; fileRef = 82AB5D750D8044BE005B920B /* inffast.h */; };
-		82AB5D8D0D8044BE005B920B /* inffixed.h in Headers */ = {isa = PBXBuildFile; fileRef = 82AB5D760D8044BE005B920B /* inffixed.h */; };
 		82AB5D8E0D8044BE005B920B /* inflate.c in Sources */ = {isa = PBXBuildFile; fileRef = 82AB5D770D8044BE005B920B /* inflate.c */; };
-		82AB5D8F0D8044BE005B920B /* inflate.h in Headers */ = {isa = PBXBuildFile; fileRef = 82AB5D780D8044BE005B920B /* inflate.h */; };
 		82AB5D900D8044BE005B920B /* inftrees.c in Sources */ = {isa = PBXBuildFile; fileRef = 82AB5D790D8044BE005B920B /* inftrees.c */; };
-		82AB5D910D8044BE005B920B /* inftrees.h in Headers */ = {isa = PBXBuildFile; fileRef = 82AB5D7A0D8044BE005B920B /* inftrees.h */; };
-		82AB5D920D8044BE005B920B /* mozzconf.h in Headers */ = {isa = PBXBuildFile; fileRef = 82AB5D7B0D8044BE005B920B /* mozzconf.h */; };
 		82AB5D930D8044BE005B920B /* trees.c in Sources */ = {isa = PBXBuildFile; fileRef = 82AB5D7C0D8044BE005B920B /* trees.c */; };
-		82AB5D940D8044BE005B920B /* trees.h in Headers */ = {isa = PBXBuildFile; fileRef = 82AB5D7D0D8044BE005B920B /* trees.h */; };
 		82AB5D950D8044BE005B920B /* uncompr.c in Sources */ = {isa = PBXBuildFile; fileRef = 82AB5D7E0D8044BE005B920B /* uncompr.c */; };
-		82AB5D960D8044BE005B920B /* zconf.h in Headers */ = {isa = PBXBuildFile; fileRef = 82AB5D7F0D8044BE005B920B /* zconf.h */; };
-		82AB5D970D8044BE005B920B /* zlib.h in Headers */ = {isa = PBXBuildFile; fileRef = 82AB5D800D8044BE005B920B /* zlib.h */; };
 		82AB5D980D8044BE005B920B /* zutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 82AB5D810D8044BE005B920B /* zutil.c */; };
-		82AB5D990D8044BE005B920B /* zutil.h in Headers */ = {isa = PBXBuildFile; fileRef = 82AB5D820D8044BE005B920B /* zutil.h */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		7BA0163D0E5A1E0700044150 /* common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = common.xcconfig; sourceTree = "<group>"; };
+		7BA0163E0E5A1E0700044150 /* debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = debug.xcconfig; sourceTree = "<group>"; };
+		7BA0163F0E5A1E0700044150 /* executable.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = executable.xcconfig; sourceTree = "<group>"; };
+		7BA016400E5A1E0700044150 /* release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = release.xcconfig; sourceTree = "<group>"; };
+		7BA016410E5A1E0700044150 /* staticlib.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = staticlib.xcconfig; sourceTree = "<group>"; };
 		82AB5D6C0D8044BE005B920B /* adler32.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = adler32.c; sourceTree = "<group>"; };
 		82AB5D6D0D8044BE005B920B /* compress.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = compress.c; sourceTree = "<group>"; };
 		82AB5D6E0D8044BE005B920B /* crc32.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crc32.c; sourceTree = "<group>"; };
@@ -73,6 +67,7 @@
 		08FB7794FE84155DC02AAC07 /* zlib */ = {
 			isa = PBXGroup;
 			children = (
+				7BA0163A0E5A1DE300044150 /* Configuration */,
 				08FB7795FE84155DC02AAC07 /* Source */,
 				1AB674ADFE9D54B511CA2CBB /* Products */,
 			);
@@ -117,35 +112,26 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-/* End PBXGroup section */
-
-/* Begin PBXHeadersBuildPhase section */
-		D2AAC043055464E500DB518D /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				82AB5D860D8044BE005B920B /* crc32.h in Headers */,
-				82AB5D880D8044BE005B920B /* deflate.h in Headers */,
-				82AB5D8C0D8044BE005B920B /* inffast.h in Headers */,
-				82AB5D8D0D8044BE005B920B /* inffixed.h in Headers */,
-				82AB5D8F0D8044BE005B920B /* inflate.h in Headers */,
-				82AB5D910D8044BE005B920B /* inftrees.h in Headers */,
-				82AB5D920D8044BE005B920B /* mozzconf.h in Headers */,
-				82AB5D940D8044BE005B920B /* trees.h in Headers */,
-				82AB5D960D8044BE005B920B /* zconf.h in Headers */,
-				82AB5D970D8044BE005B920B /* zlib.h in Headers */,
-				82AB5D990D8044BE005B920B /* zutil.h in Headers */,
+		7BA0163A0E5A1DE300044150 /* Configuration */ = {
+			isa = PBXGroup;
+			children = (
+				7BA0163D0E5A1E0700044150 /* common.xcconfig */,
+				7BA0163E0E5A1E0700044150 /* debug.xcconfig */,
+				7BA0163F0E5A1E0700044150 /* executable.xcconfig */,
+				7BA016400E5A1E0700044150 /* release.xcconfig */,
+				7BA016410E5A1E0700044150 /* staticlib.xcconfig */,
 			);
-			runOnlyForDeploymentPostprocessing = 0;
+			name = Configuration;
+			path = ../../build;
+			sourceTree = "<group>";
 		};
-/* End PBXHeadersBuildPhase section */
+/* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
 		D2AAC045055464E500DB518D /* zlib */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 1DEB91EB08733DB70010E9CD /* Build configuration list for PBXNativeTarget "zlib" */;
 			buildPhases = (
-				D2AAC043055464E500DB518D /* Headers */,
 				D2AAC044055464E500DB518D /* Sources */,
 				D289987405E68DCB004EDB86 /* Frameworks */,
 			);
@@ -164,7 +150,7 @@
 		08FB7793FE84155DC02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "zlib" */;
-			compatibilityVersion = "Xcode 3.0";
+			compatibilityVersion = "Xcode 3.1";
 			hasScannedForEncodings = 1;
 			mainGroup = 08FB7794FE84155DC02AAC07 /* zlib */;
 			projectDirPath = "";
@@ -200,51 +186,33 @@
 /* Begin XCBuildConfiguration section */
 		1DEB91EC08733DB70010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7BA016410E5A1E0700044150 /* staticlib.xcconfig */;
 			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				INSTALL_PATH = /usr/local/lib;
 				PRODUCT_NAME = zlib;
 			};
 			name = Debug;
 		};
 		1DEB91ED08733DB70010E9CD /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7BA016410E5A1E0700044150 /* staticlib.xcconfig */;
 			buildSettings = {
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_MODEL_TUNING = G5;
-				INSTALL_PATH = /usr/local/lib;
 				PRODUCT_NAME = zlib;
 			};
 			name = Release;
 		};
 		1DEB91F008733DB70010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7BA0163E0E5A1E0700044150 /* debug.xcconfig */;
 			buildSettings = {
-				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
-				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				PREBINDING = NO;
-				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
+				XCODEPROJ_DEPTH = ../..;
 			};
 			name = Debug;
 		};
 		1DEB91F108733DB70010E9CD /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7BA016400E5A1E0700044150 /* release.xcconfig */;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
-				GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
-				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				PREBINDING = NO;
-				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
+				XCODEPROJ_DEPTH = ../..;
 			};
 			name = Release;
 		};