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, 40 insertions, 34 deletions

diff --git a/third_party/bzip2/bzlib.xcodeproj/project.pbxproj b/third_party/bzip2/bzip2.xcodeproj/project.pbxproj
index f67f077..0374ade 100644
--- a/third_party/bzip2/bzlib.xcodeproj/project.pbxproj
+++ b/third_party/bzip2/bzip2.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 44;
+	objectVersion = 45;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -17,6 +17,11 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		7BA016130E5A1D1800044150 /* common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = common.xcconfig; sourceTree = "<group>"; };
+		7BA016140E5A1D1800044150 /* debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = debug.xcconfig; sourceTree = "<group>"; };
+		7BA016150E5A1D1800044150 /* executable.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = executable.xcconfig; sourceTree = "<group>"; };
+		7BA016160E5A1D1800044150 /* release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = release.xcconfig; sourceTree = "<group>"; };
+		7BA016170E5A1D1800044150 /* staticlib.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = staticlib.xcconfig; sourceTree = "<group>"; };
 		E4BA04410E25611C00BE02C6 /* blocksort.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = blocksort.c; sourceTree = "<group>"; };
 		E4BA04420E25611C00BE02C6 /* bzlib_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bzlib_private.h; sourceTree = "<group>"; };
 		E4BA04430E25611C00BE02C6 /* bzlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bzlib.c; sourceTree = "<group>"; };
@@ -26,7 +31,7 @@
 		E4BA04470E25611C00BE02C6 /* decompress.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = decompress.c; sourceTree = "<group>"; };
 		E4BA04480E25611C00BE02C6 /* huffman.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = huffman.c; sourceTree = "<group>"; };
 		E4BA04490E25611C00BE02C6 /* randtable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = randtable.c; sourceTree = "<group>"; };
-		E4BA04540E25613300BE02C6 /* libbzlib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libbzlib.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		E4BA04540E25613300BE02C6 /* libbzip2.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libbzip2.a; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -43,6 +48,7 @@
 		08FB7794FE84155DC02AAC07 /* zlib */ = {
 			isa = PBXGroup;
 			children = (
+				7BA016120E5A1CFE00044150 /* Configuration */,
 				08FB7795FE84155DC02AAC07 /* Source */,
 				1AB674ADFE9D54B511CA2CBB /* Products */,
 			);
@@ -53,9 +59,9 @@
 			isa = PBXGroup;
 			children = (
 				E4BA04410E25611C00BE02C6 /* blocksort.c */,
-				E4BA04420E25611C00BE02C6 /* bzlib_private.h */,
 				E4BA04430E25611C00BE02C6 /* bzlib.c */,
 				E4BA04440E25611C00BE02C6 /* bzlib.h */,
+				E4BA04420E25611C00BE02C6 /* bzlib_private.h */,
 				E4BA04450E25611C00BE02C6 /* compress.c */,
 				E4BA04460E25611C00BE02C6 /* crctable.c */,
 				E4BA04470E25611C00BE02C6 /* decompress.c */,
@@ -68,17 +74,30 @@
 		1AB674ADFE9D54B511CA2CBB /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				E4BA04540E25613300BE02C6 /* libbzlib.a */,
+				E4BA04540E25613300BE02C6 /* libbzip2.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
+		7BA016120E5A1CFE00044150 /* Configuration */ = {
+			isa = PBXGroup;
+			children = (
+				7BA016130E5A1D1800044150 /* common.xcconfig */,
+				7BA016140E5A1D1800044150 /* debug.xcconfig */,
+				7BA016150E5A1D1800044150 /* executable.xcconfig */,
+				7BA016160E5A1D1800044150 /* release.xcconfig */,
+				7BA016170E5A1D1800044150 /* staticlib.xcconfig */,
+			);
+			name = Configuration;
+			path = ../../build;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		D2AAC045055464E500DB518D /* bzlib */ = {
+		D2AAC045055464E500DB518D /* bzip2 */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 1DEB91EB08733DB70010E9CD /* Build configuration list for PBXNativeTarget "bzlib" */;
+			buildConfigurationList = 1DEB91EB08733DB70010E9CD /* Build configuration list for PBXNativeTarget "bzip2" */;
 			buildPhases = (
 				D2AAC044055464E500DB518D /* Sources */,
 				D289987405E68DCB004EDB86 /* Frameworks */,
@@ -87,9 +106,9 @@
 			);
 			dependencies = (
 			);
-			name = bzlib;
+			name = bzip2;
 			productName = zlib;
-			productReference = E4BA04540E25613300BE02C6 /* libbzlib.a */;
+			productReference = E4BA04540E25613300BE02C6 /* libbzip2.a */;
 			productType = "com.apple.product-type.library.static";
 		};
 /* End PBXNativeTarget section */
@@ -97,14 +116,14 @@
 /* Begin PBXProject section */
 		08FB7793FE84155DC02AAC07 /* Project object */ = {
 			isa = PBXProject;
-			buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "bzlib" */;
-			compatibilityVersion = "Xcode 3.0";
+			buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "bzip2" */;
+			compatibilityVersion = "Xcode 3.1";
 			hasScannedForEncodings = 1;
 			mainGroup = 08FB7794FE84155DC02AAC07 /* zlib */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				D2AAC045055464E500DB518D /* bzlib */,
+				D2AAC045055464E500DB518D /* bzip2 */,
 			);
 		};
 /* End PBXProject section */
@@ -129,53 +148,40 @@
 /* Begin XCBuildConfiguration section */
 		1DEB91EC08733DB70010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7BA016170E5A1D1800044150 /* staticlib.xcconfig */;
 			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				PRODUCT_NAME = bzlib;
+				PRODUCT_NAME = bzip2;
 			};
 			name = Debug;
 		};
 		1DEB91ED08733DB70010E9CD /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7BA016170E5A1D1800044150 /* staticlib.xcconfig */;
 			buildSettings = {
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				PRODUCT_NAME = bzlib;
+				PRODUCT_NAME = bzip2;
 			};
 			name = Release;
 		};
 		1DEB91F008733DB70010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7BA016140E5A1D1800044150 /* 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 = 7BA016160E5A1D1800044150 /* 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;
 		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		1DEB91EB08733DB70010E9CD /* Build configuration list for PBXNativeTarget "bzlib" */ = {
+		1DEB91EB08733DB70010E9CD /* Build configuration list for PBXNativeTarget "bzip2" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				1DEB91EC08733DB70010E9CD /* Debug */,
@@ -184,7 +190,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "bzlib" */ = {
+		1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "bzip2" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				1DEB91F008733DB70010E9CD /* Debug */,