Diff
Modified: branches/safari-601.1.46-branch/Tools/ChangeLog (198861 => 198862)
--- branches/safari-601.1.46-branch/Tools/ChangeLog 2016-03-30 22:42:47 UTC (rev 198861)
+++ branches/safari-601.1.46-branch/Tools/ChangeLog 2016-03-30 23:06:39 UTC (rev 198862)
@@ -1,3 +1,33 @@
+2016-03-30 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r192375. rdar://problem/25253479
+
+ 2015-11-12 Daniel Bates <daba...@apple.com>
+
+ Support building configuration Production of DumpRenderTree and WebKitTestRunner for iOS
+ https://bugs.webkit.org/show_bug.cgi?id=151191
+
+ Reviewed by Andy Estes.
+
+ * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: Remove hardcoded SKIP_INTALL.
+ Will override this setting in DumpRenderTree.xcconfig.
+ * DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig: When building for iOS we now
+ compile source file DumpRenderTreeMain.mm to produce a built product and make the Apple
+ Internal build system happy. Do not waste time coping OpenType font files (*.otf files)
+ and skip installation when building for iOS since we are not interested in the build product
+ and are only building this target to make the Apple Internal build system happy.
+ * DumpRenderTree/mac/DumpRenderTreeMain.mm:
+ (main): Added dummy implementation for iOS so that we build an actual command line tool to
+ make the Apple Internal build system happy.
+ * WebKitTestRunner/Configurations/Base.xcconfig: Add iOS-specific definition for WEBKIT_UMBRELLA_FRAMEWORKS_DIR.
+ * WebKitTestRunner/Configurations/DebugRelease.xcconfig: Remove variable WEBKIT_UMBRELLA_FRAMEWORKS_DIR.
+ * WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig: Build file WebKitTestRunner/mac/main.mm
+ on iOS Only to produce a built product and make the Apple Internal build system happy. No need
+ to define OTHER_LDFLAGS when building this target for iOS as the default linker flags are sufficient.
+ * WebKitTestRunner/mac/main.mm:
+ (main): Added dummy implementation for iOS so that we build an actual command line tool to
+ make the Apple Internal build system happy.
+
2016-03-28 Matthew Hanson <matthew_han...@apple.com>
Upstream webkitdirs.pm from trunk.
Modified: branches/safari-601.1.46-branch/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (198861 => 198862)
--- branches/safari-601.1.46-branch/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2016-03-30 22:42:47 UTC (rev 198861)
+++ branches/safari-601.1.46-branch/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2016-03-30 23:06:39 UTC (rev 198862)
@@ -1152,7 +1152,6 @@
baseConfigurationReference = BCB281F00CFA713D007E533E /* DumpRenderTree.xcconfig */;
buildSettings = {
INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH)";
- SKIP_INSTALL = NO;
};
name = Production;
};
Modified: branches/safari-601.1.46-branch/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig (198861 => 198862)
--- branches/safari-601.1.46-branch/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig 2016-03-30 22:42:47 UTC (rev 198861)
+++ branches/safari-601.1.46-branch/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig 2016-03-30 23:06:39 UTC (rev 198862)
@@ -27,5 +27,6 @@
OTHER_LDFLAGS_macosx = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebCoreTestSupport -force_load $(BUILT_PRODUCTS_DIR)/libDumpRenderTree.a -framework Carbon -framework Cocoa -framework _javascript_Core -framework OpenGL -framework QuartzCore -framework WebKit;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/.";
PRODUCT_NAME = DumpRenderTree;
-
-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = DumpRenderTreeMain.mm *.ttf *.TTF *.sfont;
+SKIP_INSTALL[sdk=macosx*] = NO;
+SKIP_INSTALL[sdk=iphone*] = YES;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.ttf *.TTF *.otf;
Modified: branches/safari-601.1.46-branch/Tools/DumpRenderTree/mac/DumpRenderTreeMain.mm (198861 => 198862)
--- branches/safari-601.1.46-branch/Tools/DumpRenderTree/mac/DumpRenderTreeMain.mm 2016-03-30 22:42:47 UTC (rev 198861)
+++ branches/safari-601.1.46-branch/Tools/DumpRenderTree/mac/DumpRenderTreeMain.mm 2016-03-30 23:06:39 UTC (rev 198862)
@@ -23,9 +23,20 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if PLATFORM(MAC)
+
#include "DumpRenderTreeMac.h"
int main(int argc, const char *argv[])
{
return DumpRenderTreeMain(argc, argv);
}
+
+#else
+
+int main(int, const char*[])
+{
+ return 0;
+}
+
+#endif
Modified: branches/safari-601.1.46-branch/Tools/WebKitTestRunner/Configurations/Base.xcconfig (198861 => 198862)
--- branches/safari-601.1.46-branch/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2016-03-30 22:42:47 UTC (rev 198861)
+++ branches/safari-601.1.46-branch/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2016-03-30 23:06:39 UTC (rev 198862)
@@ -53,9 +53,15 @@
SDKROOT = macosx.internal;
-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;
+PRODUCTION_FRAMEWORKS_DIR[sdk=iphone*] = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+PRODUCTION_FRAMEWORKS_DIR[sdk=macosx*] = $(SDKROOT)$(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
+WEBCORE_PRIVATE_HEADERS_DIR = $(WEBCORE_PRIVATE_HEADERS_DIR_$(CONFIGURATION));
+WEBCORE_PRIVATE_HEADERS_DIR_Release = $(WEBCORE_PRIVATE_HEADERS_DIR_engineering);
+WEBCORE_PRIVATE_HEADERS_DIR_Debug = $(WEBCORE_PRIVATE_HEADERS_DIR_engineering);
+WEBCORE_PRIVATE_HEADERS_DIR_Production = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
+WEBCORE_PRIVATE_HEADERS_DIR_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
+
FRAMEWORK_SEARCH_PATHS = $(inherited) $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
WEBKIT_SYSTEM_INTERFACE_LIBRARY = WebKitSystemInterface
Modified: branches/safari-601.1.46-branch/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig (198861 => 198862)
--- branches/safari-601.1.46-branch/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig 2016-03-30 22:42:47 UTC (rev 198861)
+++ branches/safari-601.1.46-branch/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig 2016-03-30 23:06:39 UTC (rev 198862)
@@ -34,8 +34,6 @@
MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
MACOSX_DEPLOYMENT_TARGET_101200 = 10.12;
-WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(BUILT_PRODUCTS_DIR);
-
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));
Modified: branches/safari-601.1.46-branch/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig (198861 => 198862)
--- branches/safari-601.1.46-branch/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig 2016-03-30 22:42:47 UTC (rev 198861)
+++ branches/safari-601.1.46-branch/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig 2016-03-30 23:06:39 UTC (rev 198862)
@@ -35,4 +35,5 @@
SKIP_INSTALL = NO;
EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = EventSenderProxy.mm main.mm PlatformWebViewMac.mm TestControllerMac.mm mac/*;
+INCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = mac/main.mm;
EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = AccessibilityUIElementIPhone.mm;
Modified: branches/safari-601.1.46-branch/Tools/WebKitTestRunner/mac/main.mm (198861 => 198862)
--- branches/safari-601.1.46-branch/Tools/WebKitTestRunner/mac/main.mm 2016-03-30 22:42:47 UTC (rev 198861)
+++ branches/safari-601.1.46-branch/Tools/WebKitTestRunner/mac/main.mm 2016-03-30 23:06:39 UTC (rev 198862)
@@ -25,6 +25,8 @@
#import "config.h"
+#if PLATFORM(MAC)
+
#import "TestController.h"
static void setDefaultsToConsistentValuesForTesting()
@@ -59,3 +61,12 @@
[pool drain];
return 0;
}
+
+#else
+
+int main(int, const char*[])
+{
+ return 0;
+}
+
+#endif // PLATFORM(MAC)
