[webkit-changes] [153363] branches/safari-537-branch/Tools

Thu, 25 Jul 2013 18:35:17 -0700

Title: [153363] branches/safari-537-branch/Tools

Diff

Modified: branches/safari-537-branch/Tools/ChangeLog (153362 => 153363)


--- branches/safari-537-branch/Tools/ChangeLog	2013-07-26 01:24:13 UTC (rev 153362)
+++ branches/safari-537-branch/Tools/ChangeLog	2013-07-26 01:35:28 UTC (rev 153363)
@@ -1,3 +1,15 @@
+2013-07-25  Babak Shafiei  <[email protected]>
+
+        Merge r153353
+
+    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-23  Lucas Forschler  <[email protected]>
 
         Merge r153072

Modified: branches/safari-537-branch/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (153362 => 153363)


--- branches/safari-537-branch/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig	2013-07-26 01:24:13 UTC (rev 153362)
+++ branches/safari-537-branch/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig	2013-07-26 01:35:28 UTC (rev 153363)
@@ -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: branches/safari-537-branch/Tools/WebKitTestRunner/Configurations/Base.xcconfig (153362 => 153363)


--- branches/safari-537-branch/Tools/WebKitTestRunner/Configurations/Base.xcconfig	2013-07-26 01:24:13 UTC (rev 153362)
+++ branches/safari-537-branch/Tools/WebKitTestRunner/Configurations/Base.xcconfig	2013-07-26 01:35:28 UTC (rev 153363)
@@ -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

Reply via email to