<!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>[189463] 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/189463">189463</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2015-09-07 00:46:50 -0700 (Mon, 07 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix the Production build after <a href="http://trac.webkit.org/projects/webkit/changeset/189455">r189455</a>.
* WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj: Somehow I added the All target using the
In-App Purchase template instead of the Aggregate template. Whoops.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerWebKitTestRunnerxcodeprojprojectpbxproj">trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (189462 => 189463)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-09-07 07:09:21 UTC (rev 189462)
+++ trunk/Tools/ChangeLog 2015-09-07 07:46:50 UTC (rev 189463)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2015-09-07 Andy Estes <aestes@apple.com>
+
+ Fix the Production build after r189455.
+
+ * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj: Somehow I added the All target using the
+ In-App Purchase template instead of the Aggregate template. Whoops.
+
</ins><span class="cx"> 2015-09-06 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKit.xcworkspace should be be able to build iOS platforms
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerWebKitTestRunnerxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj (189462 => 189463)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2015-09-07 07:09:21 UTC (rev 189462)
+++ trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2015-09-07 07:46:50 UTC (rev 189463)
</span><span class="lines">@@ -7,6 +7,18 @@
</span><span class="cx"> objects = {
</span><span class="cx">
</span><span class="cx"> /* Begin PBXAggregateTarget section */
</span><ins>+ A115CCB41B9D769D00E89159 /* All */ = {
+ isa = PBXAggregateTarget;
+ buildConfigurationList = A115CCB51B9D769D00E89159 /* Build configuration list for PBXAggregateTarget "All" */;
+ buildPhases = (
+ );
+ dependencies = (
+ A115CCBC1B9D76C400E89159 /* PBXTargetDependency */,
+ A115CCBA1B9D76BF00E89159 /* PBXTargetDependency */,
+ );
+ name = All;
+ productName = All;
+ };
</ins><span class="cx"> BC952D7711F3BF5D003398B4 /* Derived Sources */ = {
</span><span class="cx"> isa = PBXAggregateTarget;
</span><span class="cx"> buildConfigurationList = BC952D7D11F3BF6A003398B4 /* Build configuration list for PBXAggregateTarget "Derived Sources" */;
</span><span class="lines">@@ -102,14 +114,14 @@
</span><span class="cx"> /* End PBXBuildFile section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXContainerItemProxy section */
</span><del>- A185101F1B9ADE1400744AEB /* PBXContainerItemProxy */ = {
</del><ins>+ A115CCB91B9D76BF00E89159 /* PBXContainerItemProxy */ = {
</ins><span class="cx"> isa = PBXContainerItemProxy;
</span><span class="cx"> containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
</span><span class="cx"> proxyType = 1;
</span><span class="cx"> remoteGlobalIDString = 8DD76F960486AA7600D96B5E;
</span><span class="cx"> remoteInfo = WebKitTestRunner;
</span><span class="cx"> };
</span><del>- A18510211B9ADE1900744AEB /* PBXContainerItemProxy */ = {
</del><ins>+ A115CCBB1B9D76C400E89159 /* PBXContainerItemProxy */ = {
</ins><span class="cx"> isa = PBXContainerItemProxy;
</span><span class="cx"> containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
</span><span class="cx"> proxyType = 1;
</span><span class="lines">@@ -237,7 +249,6 @@
</span><span class="cx"> 841CC00D181185BF0042E9B6 /* Options.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Options.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 841CC00E181185BF0042E9B6 /* Options.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Options.h; sourceTree = "<group>"; };
</span><span class="cx"> 8DD76FA10486AA7600D96B5E /* WebKitTestRunner */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = WebKitTestRunner; sourceTree = BUILT_PRODUCTS_DIR; };
</span><del>- A18510181B9ADE0B00744AEB /* All */ = {isa = PBXFileReference; explicitFileType = folder; includeInIndex = 0; path = All; sourceTree = BUILT_PRODUCTS_DIR; };
</del><span class="cx"> A18510271B9ADE4800744AEB /* libWebKitTestRunner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libWebKitTestRunner.a; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="cx"> A18510381B9ADF2200744AEB /* WebKitTestRunner.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKitTestRunner.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> A18510391B9ADFF800744AEB /* WebKitTestRunnerApp.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebKitTestRunnerApp.xcconfig; sourceTree = "<group>"; };
</span><span class="lines">@@ -420,7 +431,6 @@
</span><span class="cx"> 8DD76FA10486AA7600D96B5E /* WebKitTestRunner */,
</span><span class="cx"> BC25186211D15D54002EBC01 /* WebKitTestRunnerInjectedBundle.bundle */,
</span><span class="cx"> 2EE52CE01890A9A80010ED21 /* WebKitTestRunnerApp.app */,
</span><del>- A18510181B9ADE0B00744AEB /* All */,
</del><span class="cx"> A18510271B9ADE4800744AEB /* libWebKitTestRunner.a */,
</span><span class="cx"> );
</span><span class="cx"> name = Products;
</span><span class="lines">@@ -706,23 +716,6 @@
</span><span class="cx"> productReference = 8DD76FA10486AA7600D96B5E /* WebKitTestRunner */;
</span><span class="cx"> productType = "com.apple.product-type.tool";
</span><span class="cx"> };
</span><del>- A18510171B9ADE0B00744AEB /* All */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = A185101E1B9ADE0B00744AEB /* Build configuration list for PBXNativeTarget "All" */;
- buildPhases = (
- A18510161B9ADE0B00744AEB /* Resources */,
- );
- buildRules = (
- );
- dependencies = (
- A18510221B9ADE1900744AEB /* PBXTargetDependency */,
- A18510201B9ADE1400744AEB /* PBXTargetDependency */,
- );
- name = All;
- productName = All;
- productReference = A18510181B9ADE0B00744AEB /* All */;
- productType = "com.apple.product-type.in-app-purchase-content";
- };
</del><span class="cx"> A18510261B9ADE4800744AEB /* WebKitTestRunner (Library) */ = {
</span><span class="cx"> isa = PBXNativeTarget;
</span><span class="cx"> buildConfigurationList = A185102D1B9ADE4800744AEB /* Build configuration list for PBXNativeTarget "WebKitTestRunner (Library)" */;
</span><span class="lines">@@ -767,7 +760,7 @@
</span><span class="cx"> attributes = {
</span><span class="cx"> LastSwiftUpdateCheck = 0700;
</span><span class="cx"> TargetAttributes = {
</span><del>- A18510171B9ADE0B00744AEB = {
</del><ins>+ A115CCB41B9D769D00E89159 = {
</ins><span class="cx"> CreatedOnToolsVersion = 7.0;
</span><span class="cx"> };
</span><span class="cx"> A18510261B9ADE4800744AEB = {
</span><span class="lines">@@ -790,7 +783,7 @@
</span><span class="cx"> projectDirPath = "";
</span><span class="cx"> projectRoot = "";
</span><span class="cx"> targets = (
</span><del>- A18510171B9ADE0B00744AEB /* All */,
</del><ins>+ A115CCB41B9D769D00E89159 /* All */,
</ins><span class="cx"> 8DD76F960486AA7600D96B5E /* WebKitTestRunner */,
</span><span class="cx"> 2EE52CDF1890A9A80010ED21 /* WebKitTestRunnerApp */,
</span><span class="cx"> BC25186111D15D54002EBC01 /* WebKitTestRunnerInjectedBundle */,
</span><span class="lines">@@ -810,13 +803,6 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> };
</span><del>- A18510161B9ADE0B00744AEB /* Resources */ = {
- isa = PBXResourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
</del><span class="cx"> BC25185E11D15D54002EBC01 /* Resources */ = {
</span><span class="cx"> isa = PBXResourcesBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span><span class="lines">@@ -948,15 +934,15 @@
</span><span class="cx"> /* End PBXSourcesBuildPhase section */
</span><span class="cx">
</span><span class="cx"> /* Begin PBXTargetDependency section */
</span><del>- A18510201B9ADE1400744AEB /* PBXTargetDependency */ = {
</del><ins>+ A115CCBA1B9D76BF00E89159 /* PBXTargetDependency */ = {
</ins><span class="cx"> isa = PBXTargetDependency;
</span><span class="cx"> target = 8DD76F960486AA7600D96B5E /* WebKitTestRunner */;
</span><del>- targetProxy = A185101F1B9ADE1400744AEB /* PBXContainerItemProxy */;
</del><ins>+ targetProxy = A115CCB91B9D76BF00E89159 /* PBXContainerItemProxy */;
</ins><span class="cx"> };
</span><del>- A18510221B9ADE1900744AEB /* PBXTargetDependency */ = {
</del><ins>+ A115CCBC1B9D76C400E89159 /* PBXTargetDependency */ = {
</ins><span class="cx"> isa = PBXTargetDependency;
</span><span class="cx"> target = 2EE52CDF1890A9A80010ED21 /* WebKitTestRunnerApp */;
</span><del>- targetProxy = A18510211B9ADE1900744AEB /* PBXContainerItemProxy */;
</del><ins>+ targetProxy = A115CCBB1B9D76C400E89159 /* PBXContainerItemProxy */;
</ins><span class="cx"> };
</span><span class="cx"> A18510321B9ADE5B00744AEB /* PBXTargetDependency */ = {
</span><span class="cx"> isa = PBXTargetDependency;
</span><span class="lines">@@ -1064,24 +1050,24 @@
</span><span class="cx"> };
</span><span class="cx"> name = Production;
</span><span class="cx"> };
</span><del>- A185101B1B9ADE0B00744AEB /* Debug */ = {
</del><ins>+ A115CCB61B9D769D00E89159 /* Debug */ = {
</ins><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><del>- PRODUCT_NAME = All;
</del><ins>+ PRODUCT_NAME = "$(TARGET_NAME)";
</ins><span class="cx"> };
</span><span class="cx"> name = Debug;
</span><span class="cx"> };
</span><del>- A185101C1B9ADE0B00744AEB /* Release */ = {
</del><ins>+ A115CCB71B9D769D00E89159 /* Release */ = {
</ins><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><del>- PRODUCT_NAME = All;
</del><ins>+ PRODUCT_NAME = "$(TARGET_NAME)";
</ins><span class="cx"> };
</span><span class="cx"> name = Release;
</span><span class="cx"> };
</span><del>- A185101D1B9ADE0B00744AEB /* Production */ = {
</del><ins>+ A115CCB81B9D769D00E89159 /* Production */ = {
</ins><span class="cx"> isa = XCBuildConfiguration;
</span><span class="cx"> buildSettings = {
</span><del>- PRODUCT_NAME = All;
</del><ins>+ PRODUCT_NAME = "$(TARGET_NAME)";
</ins><span class="cx"> };
</span><span class="cx"> name = Production;
</span><span class="cx"> };
</span><span class="lines">@@ -1195,15 +1181,14 @@
</span><span class="cx"> defaultConfigurationIsVisible = 0;
</span><span class="cx"> defaultConfigurationName = Production;
</span><span class="cx"> };
</span><del>- A185101E1B9ADE0B00744AEB /* Build configuration list for PBXNativeTarget "All" */ = {
</del><ins>+ A115CCB51B9D769D00E89159 /* Build configuration list for PBXAggregateTarget "All" */ = {
</ins><span class="cx"> isa = XCConfigurationList;
</span><span class="cx"> buildConfigurations = (
</span><del>- A185101B1B9ADE0B00744AEB /* Debug */,
- A185101C1B9ADE0B00744AEB /* Release */,
- A185101D1B9ADE0B00744AEB /* Production */,
</del><ins>+ A115CCB61B9D769D00E89159 /* Debug */,
+ A115CCB71B9D769D00E89159 /* Release */,
+ A115CCB81B9D769D00E89159 /* Production */,
</ins><span class="cx"> );
</span><span class="cx"> defaultConfigurationIsVisible = 0;
</span><del>- defaultConfigurationName = Production;
</del><span class="cx"> };
</span><span class="cx"> A185102D1B9ADE4800744AEB /* Build configuration list for PBXNativeTarget "WebKitTestRunner (Library)" */ = {
</span><span class="cx"> isa = XCConfigurationList;
</span></span></pre>
</div>
</div>
</body>
</html>