Link TestShell against libevent, now required. Turn off objc-gc setting in

this file because it now comes from the xcconfig.  Clean up ugly backslashes.
Review URL: http://codereview.chromium.org/3158

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

1 files changed, 84 insertions, 13 deletions

diff --git a/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj b/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj
index a966573..6a3c5d8 100644
--- a/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj
+++ b/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		7B779D510E83001A00C2971E /* libevent.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B779D500E82FFAC00C2971E /* libevent.a */; };
 		82F372150E82AE0500DF5AFE /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 82F372140E82AE0500DF5AFE /* Security.framework */; };
 		82F399480E7EE4D500785E15 /* libWebKitSystemInterfaceLeopard.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 82F399470E7EE4D500785E15 /* libWebKitSystemInterfaceLeopard.a */; };
 		82F399B70E7EF75800785E15 /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B8205260E770291008F45CF /* libbase.a */; };
@@ -86,6 +87,34 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
+		7B779D3B0E82FF2200C2971E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 7B42A4C40DE20F1700659DE0 /* v8.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 89F23C870E78D5B2006B2466 /* libv8-arm.a */;
+			remoteInfo = "v8-arm";
+		};
+		7B779D3D0E82FF2200C2971E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 7B42A4C40DE20F1700659DE0 /* v8.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 89F23C950E78D5B6006B2466 /* v8_shell-arm */;
+			remoteInfo = "v8_shell-arm";
+		};
+		7B779D4F0E82FFAC00C2971E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 7B779D4B0E82FFAC00C2971E /* libevent.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 7B262E840E82E5D7001CE27F /* libevent.a */;
+			remoteInfo = libevent;
+		};
+		7B779D520E83002A00C2971E /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 7B779D4B0E82FFAC00C2971E /* libevent.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 7B262E830E82E5D7001CE27F /* libevent */;
+			remoteInfo = libevent;
+		};
 		7B8205250E770291008F45CF /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = ABD16F700DC6CBDF0013D3AA /* base.xcodeproj */;
@@ -482,6 +511,7 @@
 		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = "<group>"; };
 		32CA4F630368D1EE00C91783 /* TestShell_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestShell_Prefix.pch; sourceTree = "<group>"; };
 		7B42A4C40DE20F1700659DE0 /* v8.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = v8.xcodeproj; path = build/v8.xcodeproj; sourceTree = "<group>"; };
+		7B779D4B0E82FFAC00C2971E /* libevent.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libevent.xcodeproj; path = third_party/libevent/libevent.xcodeproj; sourceTree = "<group>"; };
 		7B8200950E76FDA1008F45CF /* common.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = common.xcconfig; sourceTree = "<group>"; };
 		7B8200960E76FDA1008F45CF /* debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = debug.xcconfig; sourceTree = "<group>"; };
 		7B8200970E76FDA1008F45CF /* executable.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = executable.xcconfig; sourceTree = "<group>"; };
@@ -581,6 +611,7 @@
 				82F399B70E7EF75800785E15 /* libbase.a in Frameworks */,
 				82F399B80E7EF75A00785E15 /* libbase_gfx.a in Frameworks */,
 				82F39CF90E7EF92500785E15 /* libbzip2.a in Frameworks */,
+				7B779D510E83001A00C2971E /* libevent.a in Frameworks */,
 				82F39D0E0E7EFA5500785E15 /* libglue.a in Frameworks */,
 				82F399F90E7EF7C000785E15 /* libgoogleurl.a in Frameworks */,
 				82F39A220E7EF85F00785E15 /* libgtest.a in Frameworks */,
@@ -656,6 +687,14 @@
 			name = Frameworks;
 			sourceTree = SDKROOT;
 		};
+		7B779D4C0E82FFAC00C2971E /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				7B779D500E82FFAC00C2971E /* libevent.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		7B8200940E76FD84008F45CF /* Configuration */ = {
 			isa = PBXGroup;
 			children = (
@@ -677,6 +716,7 @@
 				AB8665450DC78A5A002CE06A /* googleurl.xcodeproj */,
 				82F39A1C0E7EF85C00785E15 /* gtest.xcodeproj */,
 				829E35270DC0C95300819EBF /* icu.xcodeproj */,
+				7B779D4B0E82FFAC00C2971E /* libevent.xcodeproj */,
 				7BFDF6620E37AE2100F1D7D8 /* libjpeg.xcodeproj */,
 				ABC8C3EE0DC7F72600B59C21 /* libpng.xcodeproj */,
 				7B8203F10E76FED8008F45CF /* libxml.xcodeproj */,
@@ -781,6 +821,8 @@
 				7B82059A0E770291008F45CF /* libjscre.a */,
 				7B82059C0E770291008F45CF /* libv8.a */,
 				7B82059E0E770291008F45CF /* v8_shell */,
+				7B779D3C0E82FF2200C2971E /* libv8-arm.a */,
+				7B779D3E0E82FF2200C2971E /* v8_shell-arm */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -924,26 +966,27 @@
 			dependencies = (
 				82F399C20E7EF76900785E15 /* PBXTargetDependency */,
 				82F399C40E7EF76900785E15 /* PBXTargetDependency */,
+				82F39CFB0E7EF92C00785E15 /* PBXTargetDependency */,
 				82F399FB0E7EF7C900785E15 /* PBXTargetDependency */,
+				82F39A250E7EF86800785E15 /* PBXTargetDependency */,
 				82F39A120E7EF81000785E15 /* PBXTargetDependency */,
 				82F39A140E7EF81000785E15 /* PBXTargetDependency */,
 				82F39A160E7EF81000785E15 /* PBXTargetDependency */,
-				82F39A1A0E7EF82B00785E15 /* PBXTargetDependency */,
-				82F39A250E7EF86800785E15 /* PBXTargetDependency */,
-				82F39CF70E7EF91900785E15 /* PBXTargetDependency */,
-				82F39CFB0E7EF92C00785E15 /* PBXTargetDependency */,
-				82F39D070E7EF96400785E15 /* PBXTargetDependency */,
+				7B779D530E83002A00C2971E /* PBXTargetDependency */,
 				82F39D0A0E7EF97500785E15 /* PBXTargetDependency */,
+				82F39D420E7EFD9C00785E15 /* PBXTargetDependency */,
+				82F39D070E7EF96400785E15 /* PBXTargetDependency */,
+				82F39A1A0E7EF82B00785E15 /* PBXTargetDependency */,
+				82F39D2D0E7EFC2D00785E15 /* PBXTargetDependency */,
 				82F39D150E7EFA6800785E15 /* PBXTargetDependency */,
 				82F39D170E7EFA6800785E15 /* PBXTargetDependency */,
 				82F39D190E7EFA6800785E15 /* PBXTargetDependency */,
 				82F39D1B0E7EFA6800785E15 /* PBXTargetDependency */,
 				82F39D1D0E7EFA6800785E15 /* PBXTargetDependency */,
 				82F39D1F0E7EFA6800785E15 /* PBXTargetDependency */,
-				82F39D2D0E7EFC2D00785E15 /* PBXTargetDependency */,
-				82F39D420E7EFD9C00785E15 /* PBXTargetDependency */,
 				82F39D4C0E7EFDB500785E15 /* PBXTargetDependency */,
 				82F39D4E0E7EFDB500785E15 /* PBXTargetDependency */,
+				82F39CF70E7EF91900785E15 /* PBXTargetDependency */,
 			);
 			name = TestShell;
 			productInstallPath = "$(HOME)/Applications";
@@ -983,6 +1026,10 @@
 					ProjectRef = 829E35270DC0C95300819EBF /* icu.xcodeproj */;
 				},
 				{
+					ProductGroup = 7B779D4C0E82FFAC00C2971E /* Products */;
+					ProjectRef = 7B779D4B0E82FFAC00C2971E /* libevent.xcodeproj */;
+				},
+				{
 					ProductGroup = 7B8205550E770291008F45CF /* Products */;
 					ProjectRef = 7BFDF6620E37AE2100F1D7D8 /* libjpeg.xcodeproj */;
 				},
@@ -1027,6 +1074,27 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
+		7B779D3C0E82FF2200C2971E /* libv8-arm.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = "libv8-arm.a";
+			remoteRef = 7B779D3B0E82FF2200C2971E /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		7B779D3E0E82FF2200C2971E /* v8_shell-arm */ = {
+			isa = PBXReferenceProxy;
+			fileType = "compiled.mach-o.executable";
+			path = "v8_shell-arm";
+			remoteRef = 7B779D3D0E82FF2200C2971E /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		7B779D500E82FFAC00C2971E /* libevent.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libevent.a;
+			remoteRef = 7B779D4F0E82FFAC00C2971E /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		7B8205260E770291008F45CF /* libbase.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1328,6 +1396,11 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
+		7B779D530E83002A00C2971E /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = libevent;
+			targetProxy = 7B779D520E83002A00C2971E /* PBXContainerItemProxy */;
+		};
 		82F399C20E7EF76900785E15 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = base;
@@ -1465,7 +1538,6 @@
 			baseConfigurationReference = 7B8200960E76FDA1008F45CF /* debug.xcconfig */;
 			buildSettings = {
 				FRAMEWORK_SEARCH_PATHS = "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks";
-				GCC_ENABLE_OBJC_GC = supported;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(GCC_PREPROCESSOR_DEFINITIONS)",
 					BUILDING_CHROMIUM__,
@@ -1491,7 +1563,6 @@
 			baseConfigurationReference = 7B8200980E76FDA1008F45CF /* release.xcconfig */;
 			buildSettings = {
 				FRAMEWORK_SEARCH_PATHS = "$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks";
-				GCC_ENABLE_OBJC_GC = supported;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(GCC_PREPROCESSOR_DEFINITIONS)",
 					BUILDING_CHROMIUM__,
@@ -1519,8 +1590,8 @@
 				GCC_PREFIX_HEADER = TestShell_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
 				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/temp\"",
+					"$(LIBRARY_SEARCH_PATHS)",
+					"$(SRCROOT)/temp",
 				);
 				PRODUCT_NAME = TestShell;
 				WRAPPER_EXTENSION = app;
@@ -1534,8 +1605,8 @@
 				GCC_PREFIX_HEADER = TestShell_Prefix.pch;
 				INFOPLIST_FILE = Info.plist;
 				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(SRCROOT)/temp\"",
+					"$(LIBRARY_SEARCH_PATHS)",
+					"$(SRCROOT)/temp",
 				);
 				PRODUCT_NAME = TestShell;
 				WRAPPER_EXTENSION = app;