Title: [184146] trunk/Tools
- Revision
- 184146
- Author
- [email protected]
- Date
- 2015-05-11 18:54:51 -0700 (Mon, 11 May 2015)
Log Message
Fix internal build configuration issues
https://bugs.webkit.org/show_bug.cgi?id=144762
Reviewed by Darin Adler.
Modifies TestWebKitAPI and WebKitTestRunner's xcconfig files to use SDK selectors.
* TestWebKitAPI/Configurations/Base.xcconfig:
* TestWebKitAPI/Configurations/DebugRelease.xcconfig:
* TestWebKitAPI/Configurations/InjectedBundle.xcconfig:
* TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig:
* WebKitTestRunner/Configurations/DebugRelease.xcconfig:
* WebKitTestRunner/Configurations/InjectedBundle.xcconfig:
* WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (184145 => 184146)
--- trunk/Tools/ChangeLog 2015-05-12 01:43:57 UTC (rev 184145)
+++ trunk/Tools/ChangeLog 2015-05-12 01:54:51 UTC (rev 184146)
@@ -1,3 +1,20 @@
+2015-05-11 Jake Nielsen <[email protected]>
+
+ Fix internal build configuration issues
+ https://bugs.webkit.org/show_bug.cgi?id=144762
+
+ Reviewed by Darin Adler.
+
+ Modifies TestWebKitAPI and WebKitTestRunner's xcconfig files to use SDK selectors.
+
+ * TestWebKitAPI/Configurations/Base.xcconfig:
+ * TestWebKitAPI/Configurations/DebugRelease.xcconfig:
+ * TestWebKitAPI/Configurations/InjectedBundle.xcconfig:
+ * TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig:
+ * WebKitTestRunner/Configurations/DebugRelease.xcconfig:
+ * WebKitTestRunner/Configurations/InjectedBundle.xcconfig:
+ * WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig:
+
2015-05-11 Brent Fulgham <[email protected]>
[Win] Move Windows build target to Windows 7 (or newer)
Modified: trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig (184145 => 184146)
--- trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2015-05-12 01:43:57 UTC (rev 184145)
+++ trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2015-05-12 01:54:51 UTC (rev 184146)
@@ -62,10 +62,8 @@
WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
WEBCORE_PRIVATE_HEADERS_DIR = $(WEBKIT_UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
-EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
-EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.h *IOS.cpp *IOS.mm;
-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *Mac.h *Mac.cpp *Mac.mm */mac/*;
-EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
+EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = *IOS.h *IOS.cpp *IOS.mm;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *Mac.h *Mac.cpp *Mac.mm */mac/*;
OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
Modified: trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig (184145 => 184146)
--- trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig 2015-05-12 01:43:57 UTC (rev 184145)
+++ trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig 2015-05-12 01:54:51 UTC (rev 184146)
@@ -35,10 +35,8 @@
WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(BUILT_PRODUCTS_DIR);
-SDKROOT = $(SDKROOT_$(PLATFORM_NAME));
-SDKROOT_iphoneos = $(SDKROOT);
-SDKROOT_iphonesimulator = $(SDKROOT);
-SDKROOT_macosx = $(SDKROOT_macosx_$(USE_INTERNAL_SDK));
+SDKROOT[sdk=iphone*] = $(SDKROOT);
+SDKROOT = $(SDKROOT_macosx_$(USE_INTERNAL_SDK));
SDKROOT_macosx_ = macosx;
SDKROOT_macosx_YES = macosx.internal;
Modified: trunk/Tools/TestWebKitAPI/Configurations/InjectedBundle.xcconfig (184145 => 184146)
--- trunk/Tools/TestWebKitAPI/Configurations/InjectedBundle.xcconfig 2015-05-12 01:43:57 UTC (rev 184145)
+++ trunk/Tools/TestWebKitAPI/Configurations/InjectedBundle.xcconfig 2015-05-12 01:54:51 UTC (rev 184146)
@@ -23,9 +23,7 @@
PRODUCT_NAME = InjectedBundleTestWebKitAPI;
-FRAMEWORK_AND_LIBRARY_LDFLAGS = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_$(PLATFORM_NAME));
-FRAMEWORK_AND_LIBRARY_LDFLAGS_iphonesimulator = -lobjc -framework UIKit;
-FRAMEWORK_AND_LIBRARY_LDFLAGS_iphoneos = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_iphonesimulator);
-FRAMEWORK_AND_LIBRARY_LDFLAGS_macosx = -framework _javascript_Core -framework WebKit -framework CoreGraphics -framework Cocoa;
+FRAMEWORK_AND_LIBRARY_LDFLAGS[sdk=iphone*] = -lobjc -framework UIKit;
+FRAMEWORK_AND_LIBRARY_LDFLAGS[sdk=macosx*] = -framework _javascript_Core -framework WebKit -framework CoreGraphics -framework Cocoa;
OTHER_LDFLAGS = $(inherited) $(FRAMEWORK_AND_LIBRARY_LDFLAGS);
Modified: trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig (184145 => 184146)
--- trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig 2015-05-12 01:43:57 UTC (rev 184145)
+++ trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig 2015-05-12 01:54:51 UTC (rev 184146)
@@ -25,9 +25,9 @@
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
UNEXPORTED_SYMBOL_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZN7testing4Test16TearDownTestCaseEv -Wl,-unexported_symbol -Wl,__ZN7testing4Test13SetUpTestCaseEv
-OTHER_LDFLAGS = $(inherited) $(UNEXPORTED_SYMBOL_LDFLAGS) -lgtest -force_load $(BUILT_PRODUCTS_DIR)/libTestWebKitAPI.a -framework _javascript_Core -framework WebKit $(OTHER_LDFLAGS_$(PLATFORM_NAME));
-OTHER_LDFLAGS_macosx = -framework Cocoa -framework Carbon;
+OTHER_LDFLAGS = $(inherited) $(UNEXPORTED_SYMBOL_LDFLAGS) -lgtest -force_load $(BUILT_PRODUCTS_DIR)/libTestWebKitAPI.a -framework _javascript_Core -framework WebKit $(OTHER_LDFLAGS_PLATFORM);
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework Cocoa -framework Carbon;
+
// FIXME: This should not be built on iOS. Instead we should create and use a TestWebKitAPI application.
-OTHER_LDFLAGS_iphoneos = -framework WebCore -framework CoreGraphics;
-OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
+OTHER_LDFLAGS_PLATFORM[sdk=iphone*] = -framework WebCore -framework CoreGraphics;
Modified: trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig (184145 => 184146)
--- trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig 2015-05-12 01:43:57 UTC (rev 184145)
+++ trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig 2015-05-12 01:54:51 UTC (rev 184146)
@@ -35,17 +35,14 @@
WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(BUILT_PRODUCTS_DIR);
-WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(PLATFORM_NAME));
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos = WebKitSystemInterfaceIOSDevice$(IPHONEOS_DEPLOYMENT_TARGET);
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphonesimulator = WebKitSystemInterfaceIOSSimulator$(IPHONEOS_DEPLOYMENT_TARGET);
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphoneos*] = WebKitSystemInterfaceIOSDevice$(IPHONEOS_DEPLOYMENT_TARGET);
+WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphonesimulator*] = WebKitSystemInterfaceIOSSimulator$(IPHONEOS_DEPLOYMENT_TARGET);
+WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=macosx*] = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceMavericks;
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000);
-SDKROOT = $(SDKROOT_$(PLATFORM_NAME));
-SDKROOT_iphoneos = $(SDKROOT);
-SDKROOT_iphonesimulator = $(SDKROOT);
-SDKROOT_macosx = $(SDKROOT_macosx_$(USE_INTERNAL_SDK));
+SDKROOT[sdk=iphone*] = $(SDKROOT);
+SDKROOT = $(SDKROOT_macosx_$(USE_INTERNAL_SDK));
SDKROOT_macosx_ = macosx;
SDKROOT_macosx_YES = macosx.internal;
Modified: trunk/Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig (184145 => 184146)
--- trunk/Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig 2015-05-12 01:43:57 UTC (rev 184145)
+++ trunk/Tools/WebKitTestRunner/Configurations/InjectedBundle.xcconfig 2015-05-12 01:54:51 UTC (rev 184146)
@@ -30,12 +30,9 @@
SKIP_INSTALL = NO;
OTHER_LDFLAGS_BASE = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -framework CoreText -framework QuartzCore;
-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_BASE) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
-OTHER_LDFLAGS_iphoneos = -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework Foundation -framework UIKit;
-OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
-OTHER_LDFLAGS_macosx = -framework Carbon -framework Cocoa;
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_BASE) $(OTHER_LDFLAGS_PLATFORM);
+OTHER_LDFLAGS_PLATFORM[sdk=iphone*] = -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework Foundation -framework UIKit;
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework Carbon -framework Cocoa;
-EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = AccessibilityControllerMac.mm AccessibilityTextMarkerMac.mm AccessibilityUIElementMac.mm ActivateFonts.mm InjectedBundleMac.mm InjectedBundlePageMac.mm WebArchiveDumpSupportMac.mm;
-EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
-EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.*;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = AccessibilityControllerMac.mm AccessibilityTextMarkerMac.mm AccessibilityUIElementMac.mm ActivateFonts.mm InjectedBundleMac.mm InjectedBundlePageMac.mm WebArchiveDumpSupportMac.mm;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = *IOS.*;
Modified: trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig (184145 => 184146)
--- trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig 2015-05-12 01:43:57 UTC (rev 184145)
+++ trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig 2015-05-12 01:54:51 UTC (rev 184146)
@@ -27,15 +27,12 @@
GCC_ENABLE_OBJC_EXCEPTIONS = YES
OTHER_LDFLAGS_BASE = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY);
-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_BASE) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
-OTHER_LDFLAGS_iphoneos = -framework _javascript_Core -framework CoreGraphics -framework ImageIO -framework UIKit;
-OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
-OTHER_LDFLAGS_macosx = -framework Carbon -framework Cocoa;
+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_BASE) $(OTHER_LDFLAGS_PLATFORM);
+OTHER_LDFLAGS_PLATFORM[sdk=iphone*] = -framework _javascript_Core -framework CoreGraphics -framework ImageIO -framework UIKit;
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework Carbon -framework Cocoa;
INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Resources;
SKIP_INSTALL = NO;
-EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = EventSenderProxy.mm main.mm PlatformWebViewMac.mm TestControllerMac.mm mac/*;
-EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
-EXCLUDED_SOURCE_FILE_NAMES_macosx = AccessibilityUIElementIPhone.mm;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = EventSenderProxy.mm main.mm PlatformWebViewMac.mm TestControllerMac.mm mac/*;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = AccessibilityUIElementIPhone.mm;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
