<!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>[153430] trunk/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/153430">153430</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2013-07-29 09:35:34 -0700 (Mon, 29 Jul 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add support infrastructure for iOS WebKit port
https://bugs.webkit.org/show_bug.cgi?id=119168

Reviewed by Ryosuke Niwa.

Implement support infrastructure towards building iOS WebKit.

* Scripts/webkitdirs.pm:
(xcodeSDKPlatformName): Added.
(determineConfigurationProductDir):
(builtDylibPathForName):
(willUseIOSDeviceSDKWhenBuilding): Added.
(willUseIOSSimulatorSDKWhenBuilding): Added.
(isIOSWebKit): Added.
(copyInspectorFrontendFiles):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitdirspm">trunk/Tools/Scripts/webkitdirs.pm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (153429 => 153430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2013-07-29 16:34:47 UTC (rev 153429)
+++ trunk/Tools/ChangeLog        2013-07-29 16:35:34 UTC (rev 153430)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2013-07-29  Daniel Bates  &lt;dabates@apple.com&gt;
+
+        Add support infrastructure for iOS WebKit port
+        https://bugs.webkit.org/show_bug.cgi?id=119168
+
+        Reviewed by Ryosuke Niwa.
+
+        Implement support infrastructure towards building iOS WebKit.
+
+        * Scripts/webkitdirs.pm:
+        (xcodeSDKPlatformName): Added.
+        (determineConfigurationProductDir):
+        (builtDylibPathForName):
+        (willUseIOSDeviceSDKWhenBuilding): Added.
+        (willUseIOSSimulatorSDKWhenBuilding): Added.
+        (isIOSWebKit): Added.
+        (copyInspectorFrontendFiles):
+
</ins><span class="cx"> 2013-07-29  Sergio Correia  &lt;sergio.correia@openbossa.org&gt;
</span><span class="cx"> 
</span><span class="cx">         CoordinatedGraphics: Add API to get and set the active state of a WebView
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (153429 => 153430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm        2013-07-29 16:34:47 UTC (rev 153429)
+++ trunk/Tools/Scripts/webkitdirs.pm        2013-07-29 16:35:34 UTC (rev 153430)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# Copyright (C) 2005, 2006, 2007, 2010, 2011, 2012 Apple Inc. All rights reserved.
</del><ins>+# Copyright (C) 2005, 2006, 2007, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
</ins><span class="cx"> # Copyright (C) 2009 Google Inc. All rights reserved.
</span><span class="cx"> # Copyright (C) 2011 Research In Motion Limited. All rights reserved.
</span><span class="cx"> #
</span><span class="lines">@@ -413,6 +413,16 @@
</span><span class="cx">     return $xcodeSDK;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+sub xcodeSDKPlatformName()
+{
+    determineXcodeSDK();
+    return &quot;&quot; if !defined $xcodeSDK;
+    return &quot;iphoneos&quot; if $xcodeSDK =~ /iphoneos/i;
+    return &quot;iphonesimulator&quot; if $xcodeSDK =~ /iphonesimulator/i;
+    return &quot;macosx&quot; if $xcodeSDK =~ /macosx/i;
+    die &quot;Couldn't determine platform name from Xcode SDK&quot;;
+}
+
</ins><span class="cx"> sub programFilesPath
</span><span class="cx"> {
</span><span class="cx">     return $programFilesPath if defined $programFilesPath;
</span><span class="lines">@@ -478,6 +488,7 @@
</span><span class="cx">             $configurationProductDir = &quot;$baseProductDir&quot;;
</span><span class="cx">         } else {
</span><span class="cx">             $configurationProductDir = &quot;$baseProductDir/$configuration&quot;;
</span><ins>+            $configurationProductDir .= &quot;-&quot; . xcodeSDKPlatformName() if isIOSWebKit();
</ins><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="lines">@@ -844,6 +855,9 @@
</span><span class="cx">     if (isWinCE()) {
</span><span class="cx">         return &quot;$configurationProductDir/$libraryName&quot;;
</span><span class="cx">     }
</span><ins>+    if (isIOSWebKit()) {
+        return &quot;$configurationProductDir/$libraryName.framework/$libraryName&quot;;
+    }
</ins><span class="cx">     if (isAppleMacWebKit()) {
</span><span class="cx">         return &quot;$configurationProductDir/$libraryName.framework/Versions/A/$libraryName&quot;;
</span><span class="cx">     }
</span><span class="lines">@@ -1287,6 +1301,22 @@
</span><span class="cx">     return isAppleWebKit() &amp;&amp; (isCygwin() || isWindows());
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+sub willUseIOSDeviceSDKWhenBuilding()
+{
+    return xcodeSDKPlatformName() eq &quot;iphoneos&quot;;
+}
+
+sub willUseIOSSimulatorSDKWhenBuilding()
+{
+    return xcodeSDKPlatformName() eq &quot;iphonesimulator&quot;;
+}
+
+sub isIOSWebKit()
+{
+    determineXcodeSDK();
+    return isAppleMacWebKit() &amp;&amp; (willUseIOSDeviceSDKWhenBuilding() || willUseIOSSimulatorSDKWhenBuilding());
+}
+
</ins><span class="cx"> sub isPerianInstalled()
</span><span class="cx"> {
</span><span class="cx">     if (!isAppleWebKit()) {
</span><span class="lines">@@ -1686,7 +1716,11 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (isAppleMacWebKit()) {
</span><del>-        $inspectorResourcesDirPath = $productDir . &quot;/WebCore.framework/Resources/inspector&quot;;
</del><ins>+        if (isIOSWebKit()) {
+            $inspectorResourcesDirPath = $productDir . &quot;/WebCore.framework/inspector&quot;;
+        } else {
+            $inspectorResourcesDirPath = $productDir . &quot;/WebCore.framework/Resources/inspector&quot;;
+        }
</ins><span class="cx">     } elsif (isAppleWinWebKit()) {
</span><span class="cx">         $inspectorResourcesDirPath = $productDir . &quot;/WebKit.resources/inspector&quot;;
</span><span class="cx">     } elsif (isQt() || isGtk()) {
</span><span class="lines">@@ -1710,11 +1744,24 @@
</span><span class="cx"> 
</span><span class="cx">     if (isAppleMacWebKit()) {
</span><span class="cx">         my $sourceLocalizedStrings = sourceDir() . &quot;/Source/WebCore/English.lproj/localizedStrings.js&quot;;
</span><del>-        my $destinationLocalizedStrings = $productDir . &quot;/WebCore.framework/Resources/English.lproj/localizedStrings.js&quot;;
</del><ins>+        my $destinationLocalizedStrings;
+        if (isIOSWebKit()) {
+            $destinationLocalizedStrings = $productDir . &quot;/WebCore.framework/English.lproj/localizedStrings.js&quot;;
+        } else {
+            $destinationLocalizedStrings = $productDir . &quot;/WebCore.framework/Resources/English.lproj/localizedStrings.js&quot;;
+        }
</ins><span class="cx">         system &quot;ditto&quot;, $sourceLocalizedStrings, $destinationLocalizedStrings;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    return system &quot;rsync&quot;, &quot;-aut&quot;, &quot;--exclude=/.DS_Store&quot;, &quot;--exclude=*.re2js&quot;, &quot;--exclude=.svn/&quot;, !isQt() ? &quot;--exclude=/WebKit.qrc&quot; : &quot;&quot;, $sourceInspectorPath, $inspectorResourcesDirPath;
</del><ins>+    my $exitStatus = system &quot;rsync&quot;, &quot;-aut&quot;, &quot;--exclude=/.DS_Store&quot;, &quot;--exclude=*.re2js&quot;, &quot;--exclude=.svn/&quot;, !isQt() ? &quot;--exclude=/WebKit.qrc&quot; : &quot;&quot;, $sourceInspectorPath, $inspectorResourcesDirPath;
+    return $exitStatus if $exitStatus;
+
+    if (isIOSWebKit()) {
+        chdir($productDir . &quot;/WebCore.framework&quot;);
+        return system &quot;zip&quot;, &quot;--quiet&quot;, &quot;--exclude=*.qrc&quot;, &quot;-r&quot;, &quot;inspector-remote.zip&quot;, &quot;inspector&quot;;
+    }
+
+    return 0; # Success; did copy files.
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> sub buildXCodeProject($$@)
</span></span></pre>
</div>
</div>

</body>
</html>