Title: [89515] trunk/Tools
- Revision
- 89515
- Author
- [email protected]
- Date
- 2011-06-22 18:34:11 -0700 (Wed, 22 Jun 2011)
Log Message
<http://webkit.org/b/63212> TestWebKitAPI Xcode project has bogus settings since r86287
Reviewed by David Levin.
* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: Fix the reference to libgtest.a to
be relative to the built products directory rather than using a hard-coded path. Remove the
explicit settings of FRAMEWORK_SEARCH_PATHS, HEADER_SEARCH_PATHS and LIBRARY_SEARCH_PATHS
as they're all unnecessary. If they were necessary they should be set in the .xcconfig file
rather than in the .xcodeproj directly.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (89514 => 89515)
--- trunk/Tools/ChangeLog 2011-06-23 01:27:19 UTC (rev 89514)
+++ trunk/Tools/ChangeLog 2011-06-23 01:34:11 UTC (rev 89515)
@@ -1,3 +1,15 @@
+2011-06-22 Mark Rowe <[email protected]>
+
+ Reviewed by David Levin.
+
+ <http://webkit.org/b/63212> TestWebKitAPI Xcode project has bogus settings since r86287
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: Fix the reference to libgtest.a to
+ be relative to the built products directory rather than using a hard-coded path. Remove the
+ explicit settings of FRAMEWORK_SEARCH_PATHS, HEADER_SEARCH_PATHS and LIBRARY_SEARCH_PATHS
+ as they're all unnecessary. If they were necessary they should be set in the .xcconfig file
+ rather than in the .xcodeproj directly.
+
2011-06-22 Dirk Pranke <[email protected]>
Reviewed by Ojan Vafai.
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (89514 => 89515)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2011-06-23 01:27:19 UTC (rev 89514)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2011-06-23 01:34:11 UTC (rev 89515)
@@ -174,7 +174,7 @@
C0ADBE8412FCA6B600D2C129 /* simple-form.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "simple-form.html"; sourceTree = "<group>"; };
C0BD669C131D3CF700E18F2A /* ResponsivenessTimerDoesntFireEarly.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResponsivenessTimerDoesntFireEarly.cpp; sourceTree = "<group>"; };
C0BD669E131D3CFF00E18F2A /* ResponsivenessTimerDoesntFireEarly_Bundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResponsivenessTimerDoesntFireEarly_Bundle.cpp; sourceTree = "<group>"; };
- F3FC3EE213678B7300126A65 /* libgtest.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgtest.a; path = ../../WebKitBuild/Debug/libgtest.a; sourceTree = SOURCE_ROOT; };
+ F3FC3EE213678B7300126A65 /* libgtest.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgtest.a; sourceTree = BUILT_PRODUCTS_DIR; };
F6F3F29013342FEB00A6BF19 /* CookieManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CookieManager.cpp; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -506,15 +506,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = BC90958012554CF900083756 /* TestWebKitAPI.xcconfig */;
buildSettings = {
- FRAMEWORK_SEARCH_PATHS = "$(inherited)";
- HEADER_SEARCH_PATHS = (
- ../../Source/ThirdParty/gtest/include,
- "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders",
- );
- LIBRARY_SEARCH_PATHS = (
- "$(inherited)",
- "\"$(SRCROOT)/../../WebKitBuild/Debug\"",
- );
};
name = Debug;
};
@@ -522,15 +513,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = BC90958012554CF900083756 /* TestWebKitAPI.xcconfig */;
buildSettings = {
- FRAMEWORK_SEARCH_PATHS = "$(inherited)";
- HEADER_SEARCH_PATHS = (
- ../../Source/ThirdParty/gtest/include,
- "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders",
- );
- LIBRARY_SEARCH_PATHS = (
- "$(inherited)",
- "\"$(SRCROOT)/../../WebKitBuild/Release\"",
- );
};
name = Release;
};
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
