Title: [153353] trunk/Tools
- Revision
- 153353
- Author
- [email protected]
- Date
- 2013-07-25 16:07:06 -0700 (Thu, 25 Jul 2013)
Log Message
Fix build of DumpRenderTree and WebKitTestRunner when building against an SDK.
* DumpRenderTree/mac/Configurations/Base.xcconfig: Fix framework search path when building against an SDK.
* WebKitTestRunner/Configurations/Base.xcconfig: Ditto. Also fix where our scripts look for WebCore.framework
so they pull the version out of the SDK.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (153352 => 153353)
--- trunk/Tools/ChangeLog 2013-07-25 22:36:33 UTC (rev 153352)
+++ trunk/Tools/ChangeLog 2013-07-25 23:07:06 UTC (rev 153353)
@@ -1,3 +1,11 @@
+2013-07-25 Mark Rowe <[email protected]>
+
+ Fix build of DumpRenderTree and WebKitTestRunner when building against an SDK.
+
+ * DumpRenderTree/mac/Configurations/Base.xcconfig: Fix framework search path when building against an SDK.
+ * WebKitTestRunner/Configurations/Base.xcconfig: Ditto. Also fix where our scripts look for WebCore.framework
+ so they pull the version out of the SDK.
+
2013-07-25 Anders Carlsson <[email protected]>
Localizable.strings generated by extract-localizable-strings should be UTF-8
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (153352 => 153353)
--- trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2013-07-25 22:36:33 UTC (rev 153352)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2013-07-25 23:07:06 UTC (rev 153353)
@@ -24,8 +24,8 @@
CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
CLANG_CXX_LIBRARY = libc++;
CLANG_WARN_CXX0X_EXTENSIONS = NO;
-HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include ForwardingHeaders mac/InternalHeaders $(NEXT_ROOT)/usr/local/include/WebCoreTestSupport ${SRCROOT}/../../Source/_javascript_Core/icu;
-FRAMEWORK_SEARCH_PATHS = $(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks;
+HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include ForwardingHeaders mac/InternalHeaders $(NEXT_ROOT)/usr/local/include/WebCoreTestSupport $(SRCROOT)/../../Source/_javascript_Core/icu;
+FRAMEWORK_SEARCH_PATHS = $(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Frameworks;
GCC_PREPROCESSOR_DEFINITIONS = ENABLE_DASHBOARD_SUPPORT WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST;
DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
PREBINDING = NO
Modified: trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig (153352 => 153353)
--- trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2013-07-25 22:36:33 UTC (rev 153352)
+++ trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2013-07-25 23:07:06 UTC (rev 153353)
@@ -24,8 +24,8 @@
CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
CLANG_CXX_LIBRARY = libc++;
CLANG_WARN_CXX0X_EXTENSIONS = NO;
-HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders ${SRCROOT}/../../Source/_javascript_Core/icu $(NEXT_ROOT)/usr/local/include/WebCoreTestSupport;
-FRAMEWORK_SEARCH_PATHS = $(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks;
+HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(SRCROOT)/../../Source/_javascript_Core/icu $(NEXT_ROOT)/usr/local/include/WebCoreTestSupport;
+FRAMEWORK_SEARCH_PATHS = $(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) ENABLE_DASHBOARD_SUPPORT WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST;
DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
PREBINDING = NO
@@ -58,7 +58,7 @@
SDKROOT = $(SDKROOT_TARGETING_SAME_OS_X_VERSION_$(TARGETING_SAME_OS_X_VERSION));
SDKROOT_TARGETING_SAME_OS_X_VERSION_ = macosx;
-WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
+WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(SDKROOT)$(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
WEBCORE_PRIVATE_HEADERS_DIR = $(WEBKIT_UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
WEBKIT_SYSTEM_INTERFACE_LIBRARY = WebKitSystemInterface
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
