<!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>[194821] trunk/Source</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/194821">194821</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2016-01-09 12:13:57 -0800 (Sat, 09 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] Allow overriding the frameworks directory independently of using a staging install path
https://bugs.webkit.org/show_bug.cgi?id=152926
Reviewed by Tim Horton.
Introduce a new build setting, WK_OVERRIDE_FRAMEWORKS_DIR. When not empty, it determines
where the frameworks are installed. Setting USE_STAGING_INSTALL_PATH to YES sets
WK_OVERRIDE_FRAMEWORKS_DIR to $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari.
Account for the possibility of WK_OVERRIDE_FRAMEWORKS_DIR containing spaces.
Source/JavaScriptCore:
* Configurations/Base.xcconfig:
- Replace STAGED_FRAMEWORKS_SEARCH_PATH in FRAMEWORK_SEARCH_PATHS with
WK_OVERRIDE_FRAMEWORKS_DIR and add quotes to account for spaces.
- Define JAVASCRIPTCORE_FRAMEWORKS_DIR based on WK_OVERRIDE_FRAMEWORKS_DIR.
* Configurations/JSC.xcconfig:
Add quotes to account for spaces.
* Configurations/ToolExecutable.xcconfig:
Ditto.
* postprocess-headers.sh:
Ditto.
Source/ThirdParty:
* gtest/xcode/Config/General.xcconfig:
Add quotes to account for spaces.
* gtest/xcode/Config/ProductionProject.xcconfig:
- Replace STAGED_FRAMEWORKS_SEARCH_PATH in FRAMEWORK_SEARCH_PATHS with
WK_OVERRIDE_FRAMEWORKS_DIR and add quotes to account for spaces.
- Define WEBCORE_FRAMEWORKS_DIR based on WK_OVERRIDE_FRAMEWORKS_DIR.
Source/WebCore:
* Configurations/WebCore.xcconfig:
- Replace STAGED_FRAMEWORKS_SEARCH_PATH in FRAMEWORK_SEARCH_PATHS with
WK_OVERRIDE_FRAMEWORKS_DIR and add quotes to account for spaces.
- Define WEBCORE_FRAMEWORKS_DIR and PRODUCTION_FRAMEWORKS_DIR based on
WK_OVERRIDE_FRAMEWORKS_DIR.
* WebCore.xcodeproj/project.pbxproj: Work around make’s inability to handle spaces in paths
by creating a symlink to JAVASCRIPTCORE_PRIVATE_HEADERS_DIR under BUILT_PRODUCTS_DIR and
using the symlink as the value of JavaScriptCore_SCRIPTS_DIR.
Source/WebInspectorUI:
* Configurations/Base.xcconfig:
- Replace STAGED_FRAMEWORKS_SEARCH_PATH in FRAMEWORK_SEARCH_PATHS with
WK_OVERRIDE_FRAMEWORKS_DIR and add quotes to account for spaces.
* Configurations/WebInspectorUIFramework.xcconfig:
- Define INSTALL_PATH and PRODUCTION_FRAMEWORKS_DIR based on WK_OVERRIDE_FRAMEWORKS_DIR.
Source/WebKit/mac:
* Configurations/WebKitLegacy.xcconfig:
- Replace STAGED_FRAMEWORKS_SEARCH_PATH in FRAMEWORK_SEARCH_PATHS with
WK_OVERRIDE_FRAMEWORKS_DIR and add quotes to account for spaces.
- Define WEBKIT_LEGACY_FRAMEWORKS_DIR, PRODUCTION_FRAMEWORKS_DIR, and
WEBCORE_PRIVATE_HEADERS_DIR based on WK_OVERRIDE_FRAMEWORKS_DIR.
* MigrateHeaders.make:
Use a symlink under BUILT_PRODUCTS_DIR to the WebCore Private Headers. Use a
BUILT_PRODUCTS_DIR-based path to the framework instead of a TARGET_BUILD_DIR-based one in
order to avoid spaces.
* migrate-headers.sh:
Make the symlink to WEBCORE_PRIVATE_HEADERS_DIR that the makefile now uses.
Source/WebKit2:
* Configurations/BaseTarget.xcconfig:
- Add quotes to account for spaces.
- Define WEBKIT_FRAMEWORKS_DIR and UMBRELLA_FRAMEWORKS_DIR based on
WK_OVERRIDE_FRAMEWORKS_DIR.
* WebKit2.xcodeproj/project.pbxproj:
- In the Migrate WebKitLegacy Headers build phase, work around make’s inability to handle
spaces in paths by creating a symlink to WEBKIT_LEGACY_PRIVATE_HEADERS_DIR under
BUILT_PRODUCTS_DIR and using the symlink as the value of
WEBKIT_LEGACY_PRIVATE_HEADERS_DIR.
- In the Postprocess WKBase.h and Postprocess WKFoundation.h build phases, add quotes to
account for spaces.
* mac/MigrateHeadersFromWebKitLegacy.make:
Use a BUILT_PRODUCTS_DIR-based path to the framework instead of a TARGET_BUILD_DIR-based
one in order to avoid spaces.
* mac/postprocess-framework-headers.sh:
Add quotes to account for spaces.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsBasexcconfig">trunk/Source/JavaScriptCore/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsJSCxcconfig">trunk/Source/JavaScriptCore/Configurations/JSC.xcconfig</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsToolExecutablexcconfig">trunk/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig</a></li>
<li><a href="#trunkSourceJavaScriptCorepostprocessheaderssh">trunk/Source/JavaScriptCore/postprocess-headers.sh</a></li>
<li><a href="#trunkSourceThirdPartyChangeLog">trunk/Source/ThirdParty/ChangeLog</a></li>
<li><a href="#trunkSourceThirdPartygtestxcodeConfigGeneralxcconfig">trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig</a></li>
<li><a href="#trunkSourceThirdPartygtestxcodeConfigProductionProjectxcconfig">trunk/Source/ThirdParty/gtest/xcode/Config/ProductionProject.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsWebCorexcconfig">trunk/Source/WebCore/Configurations/WebCore.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIConfigurationsBasexcconfig">trunk/Source/WebInspectorUI/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceWebInspectorUIConfigurationsWebInspectorUIFrameworkxcconfig">trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsWebKitLegacyxcconfig">trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig</a></li>
<li><a href="#trunkSourceWebKitmacMigrateHeadersmake">trunk/Source/WebKit/mac/MigrateHeaders.make</a></li>
<li><a href="#trunkSourceWebKitmacmigrateheaderssh">trunk/Source/WebKit/mac/migrate-headers.sh</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsBaseTargetxcconfig">trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2macMigrateHeadersFromWebKitLegacymake">trunk/Source/WebKit2/mac/MigrateHeadersFromWebKitLegacy.make</a></li>
<li><a href="#trunkSourceWebKit2macpostprocessframeworkheaderssh">trunk/Source/WebKit2/mac/postprocess-framework-headers.sh</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (194820 => 194821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-01-09 15:23:56 UTC (rev 194820)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-01-09 20:13:57 UTC (rev 194821)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-01-09 Dan Bernstein <mitz@apple.com>
+
+ [Cocoa] Allow overriding the frameworks directory independently of using a staging install path
+ https://bugs.webkit.org/show_bug.cgi?id=152926
+
+ Reviewed by Tim Horton.
+
+ Introduce a new build setting, WK_OVERRIDE_FRAMEWORKS_DIR. When not empty, it determines
+ where the frameworks are installed. Setting USE_STAGING_INSTALL_PATH to YES sets
+ WK_OVERRIDE_FRAMEWORKS_DIR to $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari.
+
+ Account for the possibility of WK_OVERRIDE_FRAMEWORKS_DIR containing spaces.
+
+ * Configurations/Base.xcconfig:
+ - Replace STAGED_FRAMEWORKS_SEARCH_PATH in FRAMEWORK_SEARCH_PATHS with
+ WK_OVERRIDE_FRAMEWORKS_DIR and add quotes to account for spaces.
+ - Define JAVASCRIPTCORE_FRAMEWORKS_DIR based on WK_OVERRIDE_FRAMEWORKS_DIR.
+ * Configurations/JSC.xcconfig:
+ Add quotes to account for spaces.
+ * Configurations/ToolExecutable.xcconfig:
+ Ditto.
+ * postprocess-headers.sh:
+ Ditto.
+
</ins><span class="cx"> 2016-01-09 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> The FTL allocated spill slots for BinaryOps is sometimes inaccurate.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/Base.xcconfig (194820 => 194821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/Base.xcconfig 2016-01-09 15:23:56 UTC (rev 194820)
+++ trunk/Source/JavaScriptCore/Configurations/Base.xcconfig 2016-01-09 20:13:57 UTC (rev 194821)
</span><span class="lines">@@ -93,18 +93,13 @@
</span><span class="cx">
</span><span class="cx"> SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
</span><span class="cx">
</span><del>-FRAMEWORK_SEARCH_PATHS = $(STAGED_FRAMEWORKS_SEARCH_PATH);
</del><ins>+FRAMEWORK_SEARCH_PATHS = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR);
</ins><span class="cx">
</span><del>-STAGED_FRAMEWORKS_SEARCH_PATH = $(STAGED_FRAMEWORKS_SEARCH_PATH_$(USE_STAGING_INSTALL_PATH));
-STAGED_FRAMEWORKS_SEARCH_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
-
</del><span class="cx"> NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/Frameworks;
</span><span class="cx">
</span><del>-JAVASCRIPTCORE_FRAMEWORKS_DIR[sdk=iphone*] = $(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR);
-JAVASCRIPTCORE_FRAMEWORKS_DIR = $(JAVASCRIPTCORE_FRAMEWORKS_DIR_$(PLATFORM_NAME)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-JAVASCRIPTCORE_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(JAVASCRIPTCORE_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
-JAVASCRIPTCORE_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR);
-JAVASCRIPTCORE_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
</del><ins>+JAVASCRIPTCORE_FRAMEWORKS_DIR = $(JAVASCRIPTCORE_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+JAVASCRIPTCORE_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_JAVASCRIPTCORE_FRAMEWORKS_DIR);
+JAVASCRIPTCORE_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
</ins><span class="cx">
</span><span class="cx"> JAVASCRIPTCORE_CONTENTS_DIR[sdk=iphone*] = JavaScriptCore.framework;
</span><span class="cx"> JAVASCRIPTCORE_CONTENTS_DIR[sdk=macosx*] = JavaScriptCore.framework/Versions/A;
</span><span class="lines">@@ -135,3 +130,15 @@
</span><span class="cx"> OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
</span><span class="cx"> OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
</span><span class="cx"> OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
</span><ins>+
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
+WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
+
+WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
+WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
+
+WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsJSCxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/JSC.xcconfig (194820 => 194821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/JSC.xcconfig 2016-01-09 15:23:56 UTC (rev 194820)
+++ trunk/Source/JavaScriptCore/Configurations/JSC.xcconfig 2016-01-09 20:13:57 UTC (rev 194821)
</span><span class="lines">@@ -29,4 +29,4 @@
</span><span class="cx"> CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = entitlements.plist;
</span><span class="cx">
</span><span class="cx"> // Explicitly add the PrivateHeaders directory to the search path so that generated header files can be found in production builds.
</span><del>-HEADER_SEARCH_PATHS = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/JavaScriptCore.framework/PrivateHeaders $(inherited);
</del><ins>+HEADER_SEARCH_PATHS = "$(JAVASCRIPTCORE_FRAMEWORKS_DIR)/JavaScriptCore.framework/PrivateHeaders" $(inherited);
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsToolExecutablexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig (194820 => 194821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig 2016-01-09 15:23:56 UTC (rev 194820)
+++ trunk/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig 2016-01-09 20:13:57 UTC (rev 194821)
</span><span class="lines">@@ -50,4 +50,4 @@
</span><span class="cx"> OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
</span><span class="cx">
</span><span class="cx"> // Explicitly add the PrivateHeaders directory to the search path so that generated header files can be found in production builds.
</span><del>-HEADER_SEARCH_PATHS = $(JAVASCRIPTCORE_FRAMEWORKS_DIR)/JavaScriptCore.framework/PrivateHeaders $(inherited);
</del><ins>+HEADER_SEARCH_PATHS = "$(JAVASCRIPTCORE_FRAMEWORKS_DIR)/JavaScriptCore.framework/PrivateHeaders" $(inherited);
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCorepostprocessheaderssh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/postprocess-headers.sh (194820 => 194821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/postprocess-headers.sh 2016-01-09 15:23:56 UTC (rev 194820)
+++ trunk/Source/JavaScriptCore/postprocess-headers.sh 2016-01-09 20:13:57 UTC (rev 194821)
</span><span class="lines">@@ -4,13 +4,13 @@
</span><span class="cx">
</span><span class="cx"> for ((i = 0; i < ${SCRIPT_INPUT_FILE_COUNT}; ++i)); do
</span><span class="cx"> eval HEADER=\${SCRIPT_INPUT_FILE_${i}};
</span><del>- unifdef -B ${UNIFDEF_OPTIONS} -o ${HEADER}.unifdef ${HEADER}
</del><ins>+ unifdef -B ${UNIFDEF_OPTIONS} -o "${HEADER}".unifdef "${HEADER}"
</ins><span class="cx"> case $? in
</span><span class="cx"> 0)
</span><del>- rm ${HEADER}.unifdef
</del><ins>+ rm "${HEADER}".unifdef
</ins><span class="cx"> ;;
</span><span class="cx"> 1)
</span><del>- mv ${HEADER}{.unifdef,}
</del><ins>+ mv "${HEADER}"{.unifdef,}
</ins><span class="cx"> ;;
</span><span class="cx"> *)
</span><span class="cx"> exit 1
</span></span></pre></div>
<a id="trunkSourceThirdPartyChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ChangeLog (194820 => 194821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ChangeLog 2016-01-09 15:23:56 UTC (rev 194820)
+++ trunk/Source/ThirdParty/ChangeLog 2016-01-09 20:13:57 UTC (rev 194821)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-01-09 Dan Bernstein <mitz@apple.com>
+
+ [Cocoa] Allow overriding the frameworks directory independently of using a staging install path
+ https://bugs.webkit.org/show_bug.cgi?id=152926
+
+ Reviewed by Tim Horton.
+
+ Introduce a new build setting, WK_OVERRIDE_FRAMEWORKS_DIR. When not empty, it determines
+ where the frameworks are installed. Setting USE_STAGING_INSTALL_PATH to YES sets
+ WK_OVERRIDE_FRAMEWORKS_DIR to $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari.
+
+ Account for the possibility of WK_OVERRIDE_FRAMEWORKS_DIR containing spaces.
+
+ * gtest/xcode/Config/General.xcconfig:
+ Add quotes to account for spaces.
+ * gtest/xcode/Config/ProductionProject.xcconfig:
+ - Replace STAGED_FRAMEWORKS_SEARCH_PATH in FRAMEWORK_SEARCH_PATHS with
+ WK_OVERRIDE_FRAMEWORKS_DIR and add quotes to account for spaces.
+ - Define WEBCORE_FRAMEWORKS_DIR based on WK_OVERRIDE_FRAMEWORKS_DIR.
+
</ins><span class="cx"> 2016-01-04 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> gtest should use the same SDK as other projects
</span></span></pre></div>
<a id="trunkSourceThirdPartygtestxcodeConfigGeneralxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig (194820 => 194821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig 2016-01-09 15:23:56 UTC (rev 194820)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/General.xcconfig 2016-01-09 20:13:57 UTC (rev 194821)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx">
</span><span class="cx"> ARCHS = $(ARCHS_STANDARD_32_64_BIT);
</span><span class="cx">
</span><del>-HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders ../ ../include/
</del><ins>+HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" ../ ../include/
</ins><span class="cx">
</span><span class="cx"> // Zerolink prevents link warnings so turn it off
</span><span class="cx"> ZERO_LINK = NO
</span></span></pre></div>
<a id="trunkSourceThirdPartygtestxcodeConfigProductionProjectxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/gtest/xcode/Config/ProductionProject.xcconfig (194820 => 194821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/gtest/xcode/Config/ProductionProject.xcconfig 2016-01-09 15:23:56 UTC (rev 194820)
+++ trunk/Source/ThirdParty/gtest/xcode/Config/ProductionProject.xcconfig 2016-01-09 20:13:57 UTC (rev 194821)
</span><span class="lines">@@ -11,16 +11,24 @@
</span><span class="cx"> #include "ReleaseProject.xcconfig"
</span><span class="cx">
</span><span class="cx"> // Used by HEADER_SEARCH_PATHS in General.xcconfig
</span><del>-WEBCORE_PRIVATE_HEADERS_DIR = $(WEBCORE_PRIVATE_HEADERS_DIR_$(USE_STAGING_INSTALL_PATH));
-WEBCORE_PRIVATE_HEADERS_DIR_ = $(WEBCORE_PRIVATE_HEADERS_DIR_NO);
-WEBCORE_PRIVATE_HEADERS_DIR_NO = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks/WebCore.framework/PrivateHeaders;
-WEBCORE_PRIVATE_HEADERS_DIR_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari/WebCore.framework/PrivateHeaders;
</del><ins>+WEBCORE_PRIVATE_HEADERS_DIR = $(WEBCORE_PRIVATE_HEADERS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WEBCORE_PRIVATE_HEADERS_DIR_NO = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks/WebCore.framework/PrivateHeaders;
+WEBCORE_PRIVATE_HEADERS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
</ins><span class="cx">
</span><del>-FRAMEWORK_SEARCH_PATHS = $(STAGED_FRAMEWORKS_SEARCH_PATH) $(FRAMEWORK_SEARCH_PATHS);
</del><ins>+FRAMEWORK_SEARCH_PATHS = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR) $(inherited);
</ins><span class="cx">
</span><del>-STAGED_FRAMEWORKS_SEARCH_PATH = $(STAGED_FRAMEWORKS_SEARCH_PATH_$(USE_STAGING_INSTALL_PATH));
-STAGED_FRAMEWORKS_SEARCH_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
-
</del><span class="cx"> ONLY_ACTIVE_ARCH = NO
</span><span class="cx">
</span><span class="cx"> SDKROOT = macosx.internal;
</span><ins>+
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
+WK_USE_OVERRIDE_FRAMEWORKS_DIR[sdk=macosx*] = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
+
+WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
+WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
+
+WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194820 => 194821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-09 15:23:56 UTC (rev 194820)
+++ trunk/Source/WebCore/ChangeLog 2016-01-09 20:13:57 UTC (rev 194821)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-01-09 Dan Bernstein <mitz@apple.com>
+
+ [Cocoa] Allow overriding the frameworks directory independently of using a staging install path
+ https://bugs.webkit.org/show_bug.cgi?id=152926
+
+ Reviewed by Tim Horton.
+
+ Introduce a new build setting, WK_OVERRIDE_FRAMEWORKS_DIR. When not empty, it determines
+ where the frameworks are installed. Setting USE_STAGING_INSTALL_PATH to YES sets
+ WK_OVERRIDE_FRAMEWORKS_DIR to $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari.
+
+ Account for the possibility of WK_OVERRIDE_FRAMEWORKS_DIR containing spaces.
+
+ * Configurations/WebCore.xcconfig:
+ - Replace STAGED_FRAMEWORKS_SEARCH_PATH in FRAMEWORK_SEARCH_PATHS with
+ WK_OVERRIDE_FRAMEWORKS_DIR and add quotes to account for spaces.
+ - Define WEBCORE_FRAMEWORKS_DIR and PRODUCTION_FRAMEWORKS_DIR based on
+ WK_OVERRIDE_FRAMEWORKS_DIR.
+
+ * WebCore.xcodeproj/project.pbxproj: Work around make’s inability to handle spaces in paths
+ by creating a symlink to JAVASCRIPTCORE_PRIVATE_HEADERS_DIR under BUILT_PRODUCTS_DIR and
+ using the symlink as the value of JavaScriptCore_SCRIPTS_DIR.
+
</ins><span class="cx"> 2016-01-09 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Use NeverDestroyed instead of DEPRECATED_DEFINE_STATIC_LOCAL
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsWebCorexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (194820 => 194821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2016-01-09 15:23:56 UTC (rev 194820)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2016-01-09 20:13:57 UTC (rev 194821)
</span><span class="lines">@@ -30,14 +30,11 @@
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS_ios_Debug = $(BUILT_PRODUCTS_DIR) $(PRODUCTION_FRAMEWORKS_DIR);
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS_ios_Release = $(FRAMEWORK_SEARCH_PATHS_ios_Debug);
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS_ios_Production = $(PRODUCTION_FRAMEWORKS_DIR);
</span><del>-FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(STAGED_FRAMEWORKS_SEARCH_PATH) $(FRAMEWORK_SEARCH_PATHS) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</del><ins>+FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR) $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</ins><span class="cx">
</span><span class="cx"> OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</span><span class="cx"> OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
</span><span class="cx">
</span><del>-STAGED_FRAMEWORKS_SEARCH_PATH = $(STAGED_FRAMEWORKS_SEARCH_PATH_$(USE_STAGING_INSTALL_PATH));
-STAGED_FRAMEWORKS_SEARCH_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
-
</del><span class="cx"> WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions;
</span><span class="cx">
</span><span class="cx"> HEADER_SEARCH_PATHS = ForwardingHeaders icu /usr/include/libxslt /usr/include/libxml2 "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS);
</span><span class="lines">@@ -65,20 +62,17 @@
</span><span class="cx"> NORMAL_WEBCORE_FRAMEWORKS_DIR[sdk=iphone*] = $(PRODUCTION_FRAMEWORKS_DIR);
</span><span class="cx"> NORMAL_WEBCORE_FRAMEWORKS_DIR[sdk=macosx*] = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
</span><span class="cx">
</span><del>-WEBCORE_FRAMEWORKS_DIR[sdk=iphone*] = $(NORMAL_WEBCORE_FRAMEWORKS_DIR);
-WEBCORE_FRAMEWORKS_DIR = $(WEBCORE_FRAMEWORKS_DIR_$(PLATFORM_NAME)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WEBCORE_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBCORE_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
-WEBCORE_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR);
-WEBCORE_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
</del><ins>+WEBCORE_FRAMEWORKS_DIR = $(WEBCORE_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WEBCORE_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR);
+WEBCORE_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
</ins><span class="cx">
</span><span class="cx"> NORMAL_PRODUCTION_FRAMEWORKS_DIR[sdk=iphone*] = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</span><span class="cx"> NORMAL_PRODUCTION_FRAMEWORKS_DIR[sdk=macosx*] = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
</span><span class="cx">
</span><span class="cx"> PRODUCTION_FRAMEWORKS_DIR[sdk=iphone*] = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR);
</span><del>-PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
-PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR);
-PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
</del><ins>+PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+PRODUCTION_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR);
+PRODUCTION_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
</ins><span class="cx">
</span><span class="cx"> JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = $(JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_$(CONFIGURATION));
</span><span class="cx"> JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Release = $(JAVASCRIPTCORE_PRIVATE_HEADERS_engineering);
</span><span class="lines">@@ -95,3 +89,15 @@
</span><span class="cx">
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.tiff *Cursor.png AccessibilityObjectMac.mm AXObjectCacheMac.mm ColorMac.mm Cursor.cpp CursorMac.mm DataTransferMac.mm EditorMac.mm EventHandlerMac.mm EventLoopMac.mm GeolocationServiceMac.mm GraphicsContext3DOpenGLES.cpp IconDatabase.cpp IconMac.mm KillRingMac.mm LocalCurrentGraphicsContext.mm MIMETypeRegistryMac.mm MediaPlayerPrivateQTKit.mm NSScrollerImpDetails.mm NetworkStateNotifierMac.cpp PasteboardMac.mm PlatformEventFactoryMac.mm PlatformMouseEventMac.mm PlatformPasteboardMac.mm PlatformScreenMac.mm PlatformSpeechSynthesizerMac.mm RunLoopMac.mm SSLKeyGeneratorMac.cpp ScrollViewMac.mm ScrollbarThemeMac.mm SharedTimerMac.mm SoundMac.mm SystemTimeMac.cpp ThemeMac.mm ThreadCheck.mm UserAgentMac.mm WebAccessibilityObjectWrapperMac.mm WebCoreSystemInterface.mm WebCoreView.m WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm WidgetMac.mm DisplayRefreshMonitorMac.cp
p npapi.h npfunctions.h npruntime.h npruntime_internal.h $(EXCLUDED_SOURCE_FILE_NAMES_FOR_TOUCH_EVENTS) $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS);
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = *IOS.h *IOS.cpp *IOS.mm KillRingNone.cpp WAKAppKitStubs.h WAKClipView.h WAKResponder.h WAKScrollView.h WAKView.h WAKViewPrivate.h WAKWindow.h WKContentObservation.h WKGraphics.h WKTypes.h WKUtilities.h WKView.h WKViewPrivate.h WebCoreThread.h WebCoreThreadMessage.h WebCoreThreadRun.h WebCoreThreadSystemInterface.h $(EXCLUDED_SOURCE_FILE_NAMES_FOR_TOUCH_EVENTS) $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS);
</span><ins>+
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
+WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
+
+WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
+WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
+
+WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
</ins></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (194820 => 194821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-01-09 15:23:56 UTC (rev 194820)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-01-09 20:13:57 UTC (rev 194821)
</span><span class="lines">@@ -28459,7 +28459,7 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> shellPath = /bin/sh;
</span><del>- shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\n\n/bin/ln -sfh \"${SRCROOT}\" WebCore\nexport WebCore=\"WebCore\"\nexport JavaScriptCore_SCRIPTS_DIR=\"${JAVASCRIPTCORE_PRIVATE_HEADERS_DIR}\"\n\nif [ ! $CC ]; then\n export CC=\"`xcrun -find clang`\"\nfi\n\nif [ ! $GPERF ]; then\n export GPERF=\"`xcrun -find gperf`\"\nfi\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n make --no-builtin-rules -f \"WebCore/DerivedSources.make\" -j `/usr/sbin/sysctl -n hw.activecpu` SDKROOT=\"${SDKROOT}\"\nfi\n";
</del><ins>+ shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\n\n/bin/ln -sfh \"${SRCROOT}\" WebCore\nexport WebCore=\"WebCore\"\n/bin/ln -sfh \"${JAVASCRIPTCORE_PRIVATE_HEADERS_DIR}\" JavaScriptCorePrivateHeaders\nexport JavaScriptCore_SCRIPTS_DIR=\"JavaScriptCorePrivateHeaders\"\n\nif [ ! $CC ]; then\n export CC=\"`xcrun -find clang`\"\nfi\n\nif [ ! $GPERF ]; then\n export GPERF=\"`xcrun -find gperf`\"\nfi\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n make --no-builtin-rules -f \"WebCore/DerivedSources.make\" -j `/usr/sbin/sysctl -n hw.activecpu` SDKROOT=\"${SDKROOT}\"\nfi\n";
</ins><span class="cx"> };
</span><span class="cx"> /* End PBXShellScriptBuildPhase section */
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (194820 => 194821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-01-09 15:23:56 UTC (rev 194820)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-01-09 20:13:57 UTC (rev 194821)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-01-09 Dan Bernstein <mitz@apple.com>
+
+ [Cocoa] Allow overriding the frameworks directory independently of using a staging install path
+ https://bugs.webkit.org/show_bug.cgi?id=152926
+
+ Reviewed by Tim Horton.
+
+ Introduce a new build setting, WK_OVERRIDE_FRAMEWORKS_DIR. When not empty, it determines
+ where the frameworks are installed. Setting USE_STAGING_INSTALL_PATH to YES sets
+ WK_OVERRIDE_FRAMEWORKS_DIR to $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari.
+
+ Account for the possibility of WK_OVERRIDE_FRAMEWORKS_DIR containing spaces.
+
+ * Configurations/Base.xcconfig:
+ - Replace STAGED_FRAMEWORKS_SEARCH_PATH in FRAMEWORK_SEARCH_PATHS with
+ WK_OVERRIDE_FRAMEWORKS_DIR and add quotes to account for spaces.
+ * Configurations/WebInspectorUIFramework.xcconfig:
+ - Define INSTALL_PATH and PRODUCTION_FRAMEWORKS_DIR based on WK_OVERRIDE_FRAMEWORKS_DIR.
+
</ins><span class="cx"> 2016-01-08 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Test Resources should not be included in Production builds unless FORCE_TOOL_INSTALL
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Configurations/Base.xcconfig (194820 => 194821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Configurations/Base.xcconfig 2016-01-09 15:23:56 UTC (rev 194820)
+++ trunk/Source/WebInspectorUI/Configurations/Base.xcconfig 2016-01-09 20:13:57 UTC (rev 194821)
</span><span class="lines">@@ -8,11 +8,8 @@
</span><span class="cx"> COPY_PHASE_STRIP = NO;
</span><span class="cx"> DEAD_CODE_STRIPPING = YES;
</span><span class="cx"> DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
</span><del>-FRAMEWORK_SEARCH_PATHS = $(STAGED_FRAMEWORKS_SEARCH_PATH) $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(FRAMEWORK_SEARCH_PATHS_$(TARGET_MAC_OS_X_VERSION_MAJOR)) $(inherited);
</del><ins>+FRAMEWORK_SEARCH_PATHS = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR) $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(inherited);
</ins><span class="cx">
</span><del>-STAGED_FRAMEWORKS_SEARCH_PATH = $(STAGED_FRAMEWORKS_SEARCH_PATH_$(USE_STAGING_INSTALL_PATH));
-STAGED_FRAMEWORKS_SEARCH_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
-
</del><span class="cx"> CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
</span><span class="cx"> CLANG_CXX_LIBRARY = libc++;
</span><span class="cx"> CLANG_WARN_BOOL_CONVERSION = YES;
</span><span class="lines">@@ -69,3 +66,15 @@
</span><span class="cx">
</span><span class="cx"> COMBINE_INSPECTOR_RESOURCES = YES;
</span><span class="cx"> COMBINE_TEST_RESOURCES = NO;
</span><ins>+
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
+WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
+
+WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
+WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
+
+WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIConfigurationsWebInspectorUIFrameworkxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig (194820 => 194821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig 2016-01-09 15:23:56 UTC (rev 194820)
+++ trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig 2016-01-09 20:13:57 UTC (rev 194821)
</span><span class="lines">@@ -5,10 +5,9 @@
</span><span class="cx"> FRAMEWORK_VERSION = A;
</span><span class="cx">
</span><span class="cx"> INFOPLIST_FILE = Info.plist
</span><del>-INSTALL_PATH = $(INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-INSTALL_PATH_ = $(INSTALL_PATH_NO);
</del><ins>+INSTALL_PATH = $(INSTALL_PATH_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
</ins><span class="cx"> INSTALL_PATH_NO = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</span><del>-INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
</del><ins>+INSTALL_PATH_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
</ins><span class="cx"> DYLIB_INSTALL_NAME_BASE = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</span><span class="cx"> PRODUCT_NAME = WebInspectorUI;
</span><span class="cx">
</span><span class="lines">@@ -20,10 +19,9 @@
</span><span class="cx"> NORMAL_PRODUCTION_FRAMEWORKS_DIR[sdk=macosx*] = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
</span><span class="cx">
</span><span class="cx"> PRODUCTION_FRAMEWORKS_DIR[sdk=iphone*] = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR);
</span><del>-PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
-PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR);
-PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
</del><ins>+PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+PRODUCTION_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR);
+PRODUCTION_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
</ins><span class="cx">
</span><span class="cx"> JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = $(JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_$(CONFIGURATION));
</span><span class="cx"> JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Release = $(JAVASCRIPTCORE_PRIVATE_HEADERS_engineering);
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (194820 => 194821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-01-09 15:23:56 UTC (rev 194820)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-01-09 20:13:57 UTC (rev 194821)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-01-09 Dan Bernstein <mitz@apple.com>
+
+ [Cocoa] Allow overriding the frameworks directory independently of using a staging install path
+ https://bugs.webkit.org/show_bug.cgi?id=152926
+
+ Reviewed by Tim Horton.
+
+ Introduce a new build setting, WK_OVERRIDE_FRAMEWORKS_DIR. When not empty, it determines
+ where the frameworks are installed. Setting USE_STAGING_INSTALL_PATH to YES sets
+ WK_OVERRIDE_FRAMEWORKS_DIR to $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari.
+
+ Account for the possibility of WK_OVERRIDE_FRAMEWORKS_DIR containing spaces.
+
+ * Configurations/WebKitLegacy.xcconfig:
+ - Replace STAGED_FRAMEWORKS_SEARCH_PATH in FRAMEWORK_SEARCH_PATHS with
+ WK_OVERRIDE_FRAMEWORKS_DIR and add quotes to account for spaces.
+ - Define WEBKIT_LEGACY_FRAMEWORKS_DIR, PRODUCTION_FRAMEWORKS_DIR, and
+ WEBCORE_PRIVATE_HEADERS_DIR based on WK_OVERRIDE_FRAMEWORKS_DIR.
+
+ * MigrateHeaders.make:
+ Use a symlink under BUILT_PRODUCTS_DIR to the WebCore Private Headers. Use a
+ BUILT_PRODUCTS_DIR-based path to the framework instead of a TARGET_BUILD_DIR-based one in
+ order to avoid spaces.
+ * migrate-headers.sh:
+ Make the symlink to WEBCORE_PRIVATE_HEADERS_DIR that the makefile now uses.
+
</ins><span class="cx"> 2016-01-07 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Can't play inline video in a stock WK1 WebView on Mac
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsWebKitLegacyxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig (194820 => 194821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig 2016-01-09 15:23:56 UTC (rev 194820)
+++ trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig 2016-01-09 20:13:57 UTC (rev 194821)
</span><span class="lines">@@ -41,17 +41,14 @@
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS_ios_Debug = $(BUILT_PRODUCTS_DIR) $(PRODUCTION_FRAMEWORKS_DIR);
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS_ios_Release = $(FRAMEWORK_SEARCH_PATHS_ios_Debug);
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS_ios_Production = $(PRODUCTION_FRAMEWORKS_DIR);
</span><del>-FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(STAGED_FRAMEWORKS_SEARCH_PATH) $(UMBRELLA_FRAMEWORKS_DIR) $(FRAMEWORK_SEARCH_PATHS);
</del><ins>+FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR) $(UMBRELLA_FRAMEWORKS_DIR) $(inherited);
</ins><span class="cx">
</span><del>-STAGED_FRAMEWORKS_SEARCH_PATH = $(STAGED_FRAMEWORKS_SEARCH_PATH_$(USE_STAGING_INSTALL_PATH));
-STAGED_FRAMEWORKS_SEARCH_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
-
</del><span class="cx"> OTHER_CFLAGS[sdk=macosx*] = $(OTHER_CFLAGS) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</span><span class="cx"> OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
</span><span class="cx">
</span><span class="cx"> GCC_PREFIX_HEADER = mac/WebKitPrefix.h;
</span><span class="cx"> GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKitLegacy $(inherited);
</span><del>-HEADER_SEARCH_PATHS = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH) $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(HEADER_SEARCH_PATHS);
</del><ins>+HEADER_SEARCH_PATHS = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH) "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" "$(WEBCORE_PRIVATE_HEADERS_DIR)/icu" "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(HEADER_SEARCH_PATHS);
</ins><span class="cx"> INFOPLIST_FILE = mac/Info.plist;
</span><span class="cx"> INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</span><span class="cx"> INSTALL_PATH[sdk=macosx*] = $(WEBKIT_LEGACY_FRAMEWORKS_DIR);
</span><span class="lines">@@ -74,20 +71,17 @@
</span><span class="cx"> NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR[sdk=iphone*] = $(PRODUCTION_FRAMEWORKS_DIR);
</span><span class="cx"> NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR[sdk=macosx*] = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
</span><span class="cx">
</span><del>-WEBKIT_LEGACY_FRAMEWORKS_DIR[sdk=iphone*] = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR);
-WEBKIT_LEGACY_FRAMEWORKS_DIR = $(WEBKIT_LEGACY_FRAMEWORKS_DIR_$(PLATFORM_NAME)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
-WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR);
-WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
</del><ins>+WEBKIT_LEGACY_FRAMEWORKS_DIR = $(WEBKIT_LEGACY_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WEBKIT_LEGACY_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR);
+WEBKIT_LEGACY_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
</ins><span class="cx">
</span><span class="cx"> NORMAL_PRODUCTION_FRAMEWORKS_DIR[sdk=iphone*] = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</span><span class="cx"> NORMAL_PRODUCTION_FRAMEWORKS_DIR[sdk=macosx*] = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
</span><span class="cx">
</span><span class="cx"> PRODUCTION_FRAMEWORKS_DIR[sdk=iphone*] = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR);
</span><del>-PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
-PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR);
-PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
</del><ins>+PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+PRODUCTION_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR);
+PRODUCTION_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
</ins><span class="cx">
</span><span class="cx"> PRODUCTION_ROOT[sdk=iphone*] = $(SDKROOT);
</span><span class="cx"> PRODUCTION_ROOT[sdk=macosx*] = $(NEXT_ROOT);
</span><span class="lines">@@ -96,10 +90,9 @@
</span><span class="cx"> WEBCORE_PRIVATE_HEADERS_DIR_Release = $(WEBCORE_PRIVATE_HEADERS_engineering);
</span><span class="cx"> WEBCORE_PRIVATE_HEADERS_DIR_Debug = $(WEBCORE_PRIVATE_HEADERS_engineering);
</span><span class="cx"> WEBCORE_PRIVATE_HEADERS_DIR_Production[sdk=iphone*] = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
</span><del>-WEBCORE_PRIVATE_HEADERS_DIR_Production = $(SDKROOT)$(WEBCORE_PRIVATE_HEADERS_DIR_Production_$(PLATFORM_NAME)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_NO);
-WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_NO = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
-WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_YES = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
</del><ins>+WEBCORE_PRIVATE_HEADERS_DIR_Production = $(SDKROOT)$(WEBCORE_PRIVATE_HEADERS_DIR_Production_$(PLATFORM_NAME)_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
+WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
</ins><span class="cx"> WEBCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
</span><span class="cx">
</span><span class="cx"> WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_$(CONFIGURATION));
</span><span class="lines">@@ -108,3 +101,15 @@
</span><span class="cx"> WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Production = $(PRODUCTION_ROOT)/usr/local/include;
</span><span class="cx"> WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering[sdk=iphonesimulator*] = $(BUILT_PRODUCTS_DIR)$(PRODUCTION_ROOT)/usr/local/include;
</span><span class="cx"> WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering = $(BUILT_PRODUCTS_DIR)/usr/local/include;
</span><ins>+
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
+WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
+
+WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
+WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
+
+WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
</ins></span></pre></div>
<a id="trunkSourceWebKitmacMigrateHeadersmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/MigrateHeaders.make (194820 => 194821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/MigrateHeaders.make 2016-01-09 15:23:56 UTC (rev 194820)
+++ trunk/Source/WebKit/mac/MigrateHeaders.make 2016-01-09 20:13:57 UTC (rev 194821)
</span><span class="lines">@@ -25,11 +25,11 @@
</span><span class="cx"> # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
</span><span class="cx"> # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><del>-VPATH = $(WEBCORE_PRIVATE_HEADERS_DIR)
</del><ins>+VPATH = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebCorePrivateHeaders
</ins><span class="cx">
</span><span class="cx"> INTERNAL_HEADERS_DIR = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy
</span><del>-PUBLIC_HEADERS_DIR = $(TARGET_BUILD_DIR)/$(PUBLIC_HEADERS_FOLDER_PATH)
-PRIVATE_HEADERS_DIR = $(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)
</del><ins>+PUBLIC_HEADERS_DIR = $(BUILT_PRODUCTS_DIR)/$(PUBLIC_HEADERS_FOLDER_PATH)
+PRIVATE_HEADERS_DIR = $(BUILT_PRODUCTS_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)
</ins><span class="cx">
</span><span class="cx"> .PHONY : all
</span><span class="cx"> all : \
</span></span></pre></div>
<a id="trunkSourceWebKitmacmigrateheaderssh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/migrate-headers.sh (194820 => 194821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/migrate-headers.sh 2016-01-09 15:23:56 UTC (rev 194820)
+++ trunk/Source/WebKit/mac/migrate-headers.sh 2016-01-09 20:13:57 UTC (rev 194821)
</span><span class="lines">@@ -33,5 +33,6 @@
</span><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> if [ "${ACTION}" = "build" -o "${ACTION}" = "install" -o "${ACTION}" = "installhdrs" ]; then
</span><ins>+ ln -sfh "${WEBCORE_PRIVATE_HEADERS_DIR}" "${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitLegacy/WebCorePrivateHeaders"
</ins><span class="cx"> make -C mac -f "MigrateHeaders.make" -j `/usr/sbin/sysctl -n hw.activecpu`
</span><span class="cx"> fi
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (194820 => 194821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-01-09 15:23:56 UTC (rev 194820)
+++ trunk/Source/WebKit2/ChangeLog 2016-01-09 20:13:57 UTC (rev 194821)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2016-01-09 Dan Bernstein <mitz@apple.com>
+
+ [Cocoa] Allow overriding the frameworks directory independently of using a staging install path
+ https://bugs.webkit.org/show_bug.cgi?id=152926
+
+ Reviewed by Tim Horton.
+
+ Introduce a new build setting, WK_OVERRIDE_FRAMEWORKS_DIR. When not empty, it determines
+ where the frameworks are installed. Setting USE_STAGING_INSTALL_PATH to YES sets
+ WK_OVERRIDE_FRAMEWORKS_DIR to $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari.
+
+ Account for the possibility of WK_OVERRIDE_FRAMEWORKS_DIR containing spaces.
+
+ * Configurations/BaseTarget.xcconfig:
+ - Add quotes to account for spaces.
+ - Define WEBKIT_FRAMEWORKS_DIR and UMBRELLA_FRAMEWORKS_DIR based on
+ WK_OVERRIDE_FRAMEWORKS_DIR.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ - In the Migrate WebKitLegacy Headers build phase, work around make’s inability to handle
+ spaces in paths by creating a symlink to WEBKIT_LEGACY_PRIVATE_HEADERS_DIR under
+ BUILT_PRODUCTS_DIR and using the symlink as the value of
+ WEBKIT_LEGACY_PRIVATE_HEADERS_DIR.
+ - In the Postprocess WKBase.h and Postprocess WKFoundation.h build phases, add quotes to
+ account for spaces.
+
+ * mac/MigrateHeadersFromWebKitLegacy.make:
+ Use a BUILT_PRODUCTS_DIR-based path to the framework instead of a TARGET_BUILD_DIR-based
+ one in order to avoid spaces.
+
+ * mac/postprocess-framework-headers.sh:
+ Add quotes to account for spaces.
+
</ins><span class="cx"> 2016-01-08 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Implement download authentication with NetworkSession
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsBaseTargetxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig (194820 => 194821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig 2016-01-09 15:23:56 UTC (rev 194820)
+++ trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig 2016-01-09 20:13:57 UTC (rev 194821)
</span><span class="lines">@@ -24,33 +24,30 @@
</span><span class="cx"> #include "FeatureDefines.xcconfig"
</span><span class="cx"> #include "Version.xcconfig"
</span><span class="cx">
</span><del>-FRAMEWORK_SEARCH_PATHS_base = $(UMBRELLA_FRAMEWORKS_DIR) $(FRAMEWORK_SEARCH_PATHS);
</del><ins>+FRAMEWORK_SEARCH_PATHS_base = "$(UMBRELLA_FRAMEWORKS_DIR)" $(FRAMEWORK_SEARCH_PATHS);
</ins><span class="cx"> FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(FRAMEWORK_SEARCH_PATHS_base) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_base);
</span><span class="cx">
</span><span class="cx"> GCC_PREFIX_HEADER = WebKit2Prefix.h;
</span><span class="cx"> GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) $(WK_MANUAL_SANDBOXING_DEFINES) FRAMEWORK_NAME=WebKit
</span><del>-HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2 $(HEADER_SEARCH_PATHS);
</del><ins>+HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" "$(WEBCORE_PRIVATE_HEADERS_DIR)/icu" $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2 $(HEADER_SEARCH_PATHS);
</ins><span class="cx">
</span><span class="cx"> OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</span><span class="cx"> OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
</span><span class="cx">
</span><span class="cx"> NORMAL_WEBKIT_FRAMEWORKS_DIR = $(SYSTEM_LIBRARY_DIR)/Frameworks;
</span><span class="cx">
</span><del>-WEBKIT_FRAMEWORKS_DIR[sdk=iphone*] = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
-WEBKIT_FRAMEWORKS_DIR = $(WEBKIT_FRAMEWORKS_DIR_$(PLATFORM_NAME)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
-WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
-WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
</del><ins>+WEBKIT_FRAMEWORKS_DIR = $(WEBKIT_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+WEBKIT_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
+WEBKIT_FRAMEWORKS_DIR_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
</ins><span class="cx">
</span><span class="cx"> UMBRELLA_FRAMEWORKS_DIR = $(UMBRELLA_FRAMEWORKS_DIR_$(CONFIGURATION));
</span><span class="cx"> UMBRELLA_FRAMEWORKS_DIR_Debug = $(UMBRELLA_FRAMEWORKS_DIR_engineering);
</span><span class="cx"> UMBRELLA_FRAMEWORKS_DIR_Release = $(UMBRELLA_FRAMEWORKS_DIR_engineering);
</span><span class="cx"> UMBRELLA_FRAMEWORKS_DIR_Production[sdk=iphone*] = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</span><del>-UMBRELLA_FRAMEWORKS_DIR_Production[sdk=macosx*] = $(SDKROOT)$(UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_ = $(UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_NO);
-UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_NO = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
-UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
</del><ins>+UMBRELLA_FRAMEWORKS_DIR_Production[sdk=macosx*] = $(SDKROOT)$(UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
+UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_NO = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
+UMBRELLA_FRAMEWORKS_DIR_Production_macosx_USE_OVERRIDE_FRAMEWORKS_DIR_YES = $(WK_OVERRIDE_FRAMEWORKS_DIR);
</ins><span class="cx"> UMBRELLA_FRAMEWORKS_DIR_engineering = $(BUILT_PRODUCTS_DIR);
</span><span class="cx">
</span><span class="cx"> WEBCORE_PRIVATE_HEADERS_DIR = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
</span><span class="lines">@@ -67,7 +64,13 @@
</span><span class="cx"> WK_DONT_LINK_SHIM = $(WK_DONT_LINK_SHIM_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span class="cx"> WK_DONT_LINK_SHIM_101000 = YES;
</span><span class="cx">
</span><del>-WK_LINK_SHIM[sdk=macosx*] = $(WK_LINK_SHIM_$(WK_DONT_LINK_SHIM));
-WK_LINK_SHIM_ = $(WK_LINK_SHIM_NO);
-WK_LINK_SHIM_NO = YES;
-WK_LINK_SHIM_YES = NO;
</del><ins>+WK_LINK_SHIM[sdk=macosx*] = $(WK_NOT_$(WK_DONT_LINK_SHIM));
+
+WK_EMPTY_ = YES;
+WK_NOT_ = YES;
+WK_NOT_YES = NO;
+
+WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
+
+WK_OVERRIDE_FRAMEWORKS_DIR = $(WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
+WK_OVERRIDE_FRAMEWORKS_DIR_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (194820 => 194821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-01-09 15:23:56 UTC (rev 194820)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-01-09 20:13:57 UTC (rev 194821)
</span><span class="lines">@@ -9052,7 +9052,7 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> shellPath = /bin/sh;
</span><del>- shellScript = "if [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\nmake -C mac -f \"MigrateHeadersFromWebKitLegacy.make\" -j `/usr/sbin/sysctl -n hw.activecpu`\nfi\n";
</del><ins>+ shellScript = "if [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit2\"\n ln -sfh \"${WEBKIT_LEGACY_PRIVATE_HEADERS_DIR}\" \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit2/WebKitLegacyPrivateHeaders\"\n export WEBKIT_LEGACY_PRIVATE_HEADERS_DIR=\"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit2/WebKitLegacyPrivateHeaders\"\n make -C mac -f \"MigrateHeadersFromWebKitLegacy.make\" -j `/usr/sbin/sysctl -n hw.activecpu`\nfi\n";
</ins><span class="cx"> };
</span><span class="cx"> 1AD98ECF191D867300CAA6DF /* Postprocess WKFoundation.h */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><span class="lines">@@ -9067,7 +9067,7 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> shellPath = /bin/sh;
</span><del>- shellScript = "WKFOUNDATION_H=${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}/WKFoundation.h\n\nif [[ \"${WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED}\" == \"YES\" ]]; then\n UNIFDEF_OPTIONS=\"-UWK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED\";\nelse\n UNIFDEF_OPTIONS=\"-DWK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED\";\nfi\n\nunifdef -B ${UNIFDEF_OPTIONS} -o ${WKFOUNDATION_H}.unifdef ${WKFOUNDATION_H}\n\ncase $? in\n0)\n rm ${WKFOUNDATION_H}.unifdef\n ;;\n1)\n mv ${WKFOUNDATION_H}{.unifdef,}\n ;;\n*)\n exit 1\nesac\n";
</del><ins>+ shellScript = "WKFOUNDATION_H=${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}/WKFoundation.h\n\nif [[ \"${WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED}\" == \"YES\" ]]; then\n UNIFDEF_OPTIONS=\"-UWK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED\";\nelse\n UNIFDEF_OPTIONS=\"-DWK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED\";\nfi\n\nunifdef -B ${UNIFDEF_OPTIONS} -o \"${WKFOUNDATION_H}\".unifdef \"${WKFOUNDATION_H}\"\n\ncase $? in\n0)\n rm \"${WKFOUNDATION_H}\".unifdef\n ;;\n1)\n mv \"${WKFOUNDATION_H}\"{.unifdef,}\n ;;\n*)\n exit 1\nesac\n";
</ins><span class="cx"> };
</span><span class="cx"> 1ADAE12F1919A90C00F48E21 /* Update Info.plist with version information */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><span class="lines">@@ -9133,7 +9133,7 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> shellPath = /bin/sh;
</span><del>- shellScript = "WKBASE_H=${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}/WKBase.h\n\nunifdef -B -D__APPLE__ -UBUILDING_GTK__ -UUSE_SOUP -UBUILDING_EFL__ -UBUILDING_QT__ -o ${WKBASE_H}.unifdef ${WKBASE_H}\n\ncase $? in\n0)\n rm ${WKBASE_H}.unifdef\n ;;\n1)\n mv ${WKBASE_H}{.unifdef,}\n ;;\n*)\n exit 1\nesac\n";
</del><ins>+ shellScript = "WKBASE_H=${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}/WKBase.h\n\nunifdef -B -D__APPLE__ -UBUILDING_GTK__ -UUSE_SOUP -UBUILDING_EFL__ -UBUILDING_QT__ -o \"${WKBASE_H}\".unifdef \"${WKBASE_H}\"\n\ncase $? in\n0)\n rm \"${WKBASE_H}\".unifdef\n ;;\n1)\n mv \"${WKBASE_H}\"{.unifdef,}\n ;;\n*)\n exit 1\nesac\n";
</ins><span class="cx"> };
</span><span class="cx"> 37E531011B2391090074F0DF /* Copy iOS Sandbox Profiles for Manual Sandboxing */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span></span></pre></div>
<a id="trunkSourceWebKit2macMigrateHeadersFromWebKitLegacymake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/mac/MigrateHeadersFromWebKitLegacy.make (194820 => 194821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/mac/MigrateHeadersFromWebKitLegacy.make 2016-01-09 15:23:56 UTC (rev 194820)
+++ trunk/Source/WebKit2/mac/MigrateHeadersFromWebKitLegacy.make 2016-01-09 20:13:57 UTC (rev 194821)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx">
</span><span class="cx"> # Migration of WebKit Legacy headers to WebKit.
</span><span class="cx">
</span><del>-PRIVATE_HEADERS_DIR = $(TARGET_BUILD_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)
-PUBLIC_HEADERS_DIR = $(TARGET_BUILD_DIR)/$(PUBLIC_HEADERS_FOLDER_PATH)
</del><ins>+PRIVATE_HEADERS_DIR = $(BUILT_PRODUCTS_DIR)/$(PRIVATE_HEADERS_FOLDER_PATH)
+PUBLIC_HEADERS_DIR = $(BUILT_PRODUCTS_DIR)/$(PUBLIC_HEADERS_FOLDER_PATH)
</ins><span class="cx">
</span><span class="cx"> ifeq ($(PLATFORM_NAME), macosx)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2macpostprocessframeworkheaderssh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/mac/postprocess-framework-headers.sh (194820 => 194821)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/mac/postprocess-framework-headers.sh 2016-01-09 15:23:56 UTC (rev 194820)
+++ trunk/Source/WebKit2/mac/postprocess-framework-headers.sh 2016-01-09 20:13:57 UTC (rev 194821)
</span><span class="lines">@@ -87,11 +87,11 @@
</span><span class="cx">
</span><span class="cx"> SED_OPTIONS+=(${OTHER_SED_OPTIONS[*]})
</span><span class="cx">
</span><del>- for HEADER_PATH in $1/*.h; do
- if [[ $HEADER_PATH -nt $TIMESTAMP_PATH ]]; then
- ditto ${HEADER_PATH} ${TARGET_TEMP_DIR}/${HEADER_PATH##*/}
- sed -i .tmp -E ${SED_OPTIONS[*]} ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $?
- mv ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} $HEADER_PATH
</del><ins>+ for HEADER_PATH in "${1}/"*.h; do
+ if [[ "$HEADER_PATH" -nt $TIMESTAMP_PATH ]]; then
+ ditto "${HEADER_PATH}" "${TARGET_TEMP_DIR}/${HEADER_PATH##*/}"
+ sed -i .tmp -E ${SED_OPTIONS[*]} "${TARGET_TEMP_DIR}/${HEADER_PATH##*/}" || exit $?
+ mv "${TARGET_TEMP_DIR}/${HEADER_PATH##*/}" "$HEADER_PATH"
</ins><span class="cx"> fi
</span><span class="cx"> done
</span><span class="cx"> }
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx">
</span><span class="cx"> process_definitions "${BUILT_PRODUCTS_DIR}/${DEFINITIONS_PATH}" || process_definitions "${SDKROOT}/${DEFINITIONS_PATH}"
</span><span class="cx">
</span><del>-rewrite_headers ${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}
-rewrite_headers ${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}
</del><ins>+rewrite_headers "${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}"
+rewrite_headers "${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}"
</ins><span class="cx">
</span><span class="cx"> touch ${TIMESTAMP_PATH}
</span></span></pre>
</div>
</div>
</body>
</html>