<!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>[192106] trunk</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/192106">192106</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-06 08:58:31 -0800 (Fri, 06 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Teach Makefile to build LayoutTestRelay when building for iOS Simulator
https://bugs.webkit.org/show_bug.cgi?id=150849
Reviewed by Alexey Proskuryakov.
.:
Add support for overriding the user-provided arguments SDKROOT and ARCHS
on a per Makefile basis.
* Makefile.shared:
Tools:
Override the user-specified arguments SDKROOT and ARCHS to use the default SDK
and default ARCHS since LayoutTestRelay is a Mac command line tool.
* LayoutTestRelay/Makefile: Define OVERWRITE_SDKROOT and OVERWRITE_ARCHS.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkMakefileshared">trunk/Makefile.shared</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsLayoutTestRelayMakefile">trunk/Tools/LayoutTestRelay/Makefile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (192105 => 192106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-11-06 16:47:45 UTC (rev 192105)
+++ trunk/ChangeLog 2015-11-06 16:58:31 UTC (rev 192106)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-11-06 Daniel Bates <dabates@apple.com>
+
+ Teach Makefile to build LayoutTestRelay when building for iOS Simulator
+ https://bugs.webkit.org/show_bug.cgi?id=150849
+
+ Reviewed by Alexey Proskuryakov.
+
+ Add support for overriding the user-provided arguments SDKROOT and ARCHS
+ on a per Makefile basis.
+
+ * Makefile.shared:
+
</ins><span class="cx"> 2015-11-06 Philippe Normand <pnormand@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, GTK build fix after r192095.
</span></span></pre></div>
<a id="trunkMakefileshared"></a>
<div class="modfile"><h4>Modified: trunk/Makefile.shared (192105 => 192106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Makefile.shared 2015-11-06 16:47:45 UTC (rev 192105)
+++ trunk/Makefile.shared 2015-11-06 16:58:31 UTC (rev 192106)
</span><span class="lines">@@ -4,12 +4,27 @@
</span><span class="cx"> XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()' -- $(BUILD_WEBKIT_OPTIONS)` $${COLOR_DIAGNOSTICS_ARG} $(ARGS)
</span><span class="cx">
</span><span class="cx"> ifneq (,$(SDKROOT))
</span><del>- XCODE_OPTIONS += SDKROOT=$(SDKROOT)
</del><ins>+ ifneq (,$(OVERRIDE_SDKROOT))
+ ifneq (default,$(OVERRIDE_SDKROOT))
+ XCODE_OPTIONS := $(XCODE_OPTIONS) SDKROOT=$(OVERRIDE_SDKROOT)
+ endif
+ OVERRIDE_SDKROOT =
+ else
+ XCODE_OPTIONS := $(XCODE_OPTIONS) SDKROOT=$(SDKROOT)
+ endif
</ins><span class="cx"> endif
</span><span class="cx">
</span><span class="cx"> ifneq (,$(ARCHS))
</span><del>- XCODE_OPTIONS += ARCHS="$(ARCHS)"
- XCODE_OPTIONS += ONLY_ACTIVE_ARCH=NO
</del><ins>+ ifneq (,$(OVERRIDE_ARCHS))
+ ifneq (default,$(OVERRIDE_ARCHS))
+ XCODE_OPTIONS := $(XCODE_OPTIONS) ARCHS="$(OVERRIDE_ARCHS)"
+ XCODE_OPTIONS += ONLY_ACTIVE_ARCH=NO
+ endif
+ OVERRIDE_ARCHS =
+ else
+ XCODE_OPTIONS := $(XCODE_OPTIONS) ARCHS="$(ARCHS)"
+ XCODE_OPTIONS += ONLY_ACTIVE_ARCH=NO
+ endif
</ins><span class="cx"> endif
</span><span class="cx">
</span><span class="cx"> DEFAULT_VERBOSITY := $(shell defaults read org.webkit.BuildConfiguration BuildTranscriptVerbosity 2>/dev/null || echo "default")
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (192105 => 192106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-11-06 16:47:45 UTC (rev 192105)
+++ trunk/Tools/ChangeLog 2015-11-06 16:58:31 UTC (rev 192106)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-11-06 Daniel Bates <dabates@apple.com>
+
+ Teach Makefile to build LayoutTestRelay when building for iOS Simulator
+ https://bugs.webkit.org/show_bug.cgi?id=150849
+
+ Reviewed by Alexey Proskuryakov.
+
+ Override the user-specified arguments SDKROOT and ARCHS to use the default SDK
+ and default ARCHS since LayoutTestRelay is a Mac command line tool.
+
+ * LayoutTestRelay/Makefile: Define OVERWRITE_SDKROOT and OVERWRITE_ARCHS.
+
</ins><span class="cx"> 2015-11-05 Nikos Andronikos <nikos.andronikos-webkit@cisra.canon.com.au>
</span><span class="cx">
</span><span class="cx"> Add runtime and compile time flags for enabling Web Animations API and model.
</span></span></pre></div>
<a id="trunkToolsLayoutTestRelayMakefile"></a>
<div class="modfile"><h4>Modified: trunk/Tools/LayoutTestRelay/Makefile (192105 => 192106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/LayoutTestRelay/Makefile 2015-11-06 16:47:45 UTC (rev 192105)
+++ trunk/Tools/LayoutTestRelay/Makefile 2015-11-06 16:58:31 UTC (rev 192106)
</span><span class="lines">@@ -1,3 +1,6 @@
</span><span class="cx"> SCRIPTS_PATH = ../Scripts
</span><span class="cx">
</span><ins>+OVERRIDE_ARCHS = default
+OVERRIDE_SDKROOT = default
+
</ins><span class="cx"> include ../../Makefile.shared
</span></span></pre>
</div>
</div>
</body>
</html>