<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[198862] branches/safari-601.1.46-branch/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/198862">198862</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-03-30 16:06:39 -0700 (Wed, 30 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/192375">r192375</a>. rdar://problem/25253479</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchToolsChangeLog">branches/safari-601.1.46-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari601146branchToolsDumpRenderTreeDumpRenderTreexcodeprojprojectpbxproj">branches/safari-601.1.46-branch/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj</a></li>
<li><a href="#branchessafari601146branchToolsDumpRenderTreemacConfigurationsDumpRenderTreexcconfig">branches/safari-601.1.46-branch/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig</a></li>
<li><a href="#branchessafari601146branchToolsDumpRenderTreemacDumpRenderTreeMainmm">branches/safari-601.1.46-branch/Tools/DumpRenderTree/mac/DumpRenderTreeMain.mm</a></li>
<li><a href="#branchessafari601146branchToolsWebKitTestRunnerConfigurationsBasexcconfig">branches/safari-601.1.46-branch/Tools/WebKitTestRunner/Configurations/Base.xcconfig</a></li>
<li><a href="#branchessafari601146branchToolsWebKitTestRunnerConfigurationsDebugReleasexcconfig">branches/safari-601.1.46-branch/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#branchessafari601146branchToolsWebKitTestRunnerConfigurationsWebKitTestRunnerxcconfig">branches/safari-601.1.46-branch/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig</a></li>
<li><a href="#branchessafari601146branchToolsWebKitTestRunnermacmainmm">branches/safari-601.1.46-branch/Tools/WebKitTestRunner/mac/main.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Tools/ChangeLog (198861 => 198862)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-03-30 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r192375. rdar://problem/25253479
+
+ 2015-11-12 Daniel Bates <dabates@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.
+
</ins><span class="cx"> 2016-03-28 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Upstream webkitdirs.pm from trunk.
</span></span></pre></div>
<a id="branchessafari601146branchToolsDumpRenderTreeDumpRenderTreexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (198861 => 198862)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1152,7 +1152,6 @@
</span><span class="cx"> baseConfigurationReference = BCB281F00CFA713D007E533E /* DumpRenderTree.xcconfig */;
</span><span class="cx"> buildSettings = {
</span><span class="cx"> INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH)";
</span><del>- SKIP_INSTALL = NO;
</del><span class="cx"> };
</span><span class="cx"> name = Production;
</span><span class="cx"> };
</span></span></pre></div>
<a id="branchessafari601146branchToolsDumpRenderTreemacConfigurationsDumpRenderTreexcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig (198861 => 198862)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -27,5 +27,6 @@
</span><span class="cx"> OTHER_LDFLAGS_macosx = -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebCoreTestSupport -force_load $(BUILT_PRODUCTS_DIR)/libDumpRenderTree.a -framework Carbon -framework Cocoa -framework JavaScriptCore -framework OpenGL -framework QuartzCore -framework WebKit;
</span><span class="cx"> LD_RUNPATH_SEARCH_PATHS = "@loader_path/.";
</span><span class="cx"> PRODUCT_NAME = DumpRenderTree;
</span><del>-
-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = DumpRenderTreeMain.mm *.ttf *.TTF *.sfont;
</del><ins>+SKIP_INSTALL[sdk=macosx*] = NO;
+SKIP_INSTALL[sdk=iphone*] = YES;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.ttf *.TTF *.otf;
</ins></span></pre></div>
<a id="branchessafari601146branchToolsDumpRenderTreemacDumpRenderTreeMainmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Tools/DumpRenderTree/mac/DumpRenderTreeMain.mm (198861 => 198862)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -23,9 +23,20 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC)
+
</ins><span class="cx"> #include "DumpRenderTreeMac.h"
</span><span class="cx">
</span><span class="cx"> int main(int argc, const char *argv[])
</span><span class="cx"> {
</span><span class="cx"> return DumpRenderTreeMain(argc, argv);
</span><span class="cx"> }
</span><ins>+
+#else
+
+int main(int, const char*[])
+{
+ return 0;
+}
+
+#endif
</ins></span></pre></div>
<a id="branchessafari601146branchToolsWebKitTestRunnerConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Tools/WebKitTestRunner/Configurations/Base.xcconfig (198861 => 198862)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -53,9 +53,15 @@
</span><span class="cx">
</span><span class="cx"> SDKROOT = macosx.internal;
</span><span class="cx">
</span><del>-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;
</del><ins>+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;
</ins><span class="cx">
</span><ins>+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;
+
</ins><span class="cx"> FRAMEWORK_SEARCH_PATHS = $(inherited) $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</span><span class="cx">
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY = WebKitSystemInterface
</span></span></pre></div>
<a id="branchessafari601146branchToolsWebKitTestRunnerConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig (198861 => 198862)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -34,8 +34,6 @@
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_101200 = 10.12;
</span><span class="cx">
</span><del>-WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(BUILT_PRODUCTS_DIR);
-
</del><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphoneos*] = WebKitSystemInterfaceIOSDevice$(IPHONEOS_DEPLOYMENT_TARGET);
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphonesimulator*] = WebKitSystemInterfaceIOSSimulator$(IPHONEOS_DEPLOYMENT_TARGET);
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=macosx*] = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span></span></pre></div>
<a id="branchessafari601146branchToolsWebKitTestRunnerConfigurationsWebKitTestRunnerxcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig (198861 => 198862)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -35,4 +35,5 @@
</span><span class="cx"> SKIP_INSTALL = NO;
</span><span class="cx">
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = EventSenderProxy.mm main.mm PlatformWebViewMac.mm TestControllerMac.mm mac/*;
</span><ins>+INCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = mac/main.mm;
</ins><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = AccessibilityUIElementIPhone.mm;
</span></span></pre></div>
<a id="branchessafari601146branchToolsWebKitTestRunnermacmainmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Tools/WebKitTestRunner/mac/main.mm (198861 => 198862)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -25,6 +25,8 @@
</span><span class="cx">
</span><span class="cx"> #import "config.h"
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC)
+
</ins><span class="cx"> #import "TestController.h"
</span><span class="cx">
</span><span class="cx"> static void setDefaultsToConsistentValuesForTesting()
</span><span class="lines">@@ -59,3 +61,12 @@
</span><span class="cx"> [pool drain];
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><ins>+
+#else
+
+int main(int, const char*[])
+{
+ return 0;
+}
+
+#endif // PLATFORM(MAC)
</ins></span></pre>
</div>
</div>
</body>
</html>