<!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>[204627] 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/204627">204627</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-18 20:07:15 -0700 (Thu, 18 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ld warns of non-existent PrivateFrameworks directory when building WebKit with the public iOS 9.3 SDK
https://bugs.webkit.org/show_bug.cgi?id=160979
Rubber-stamped by Simon Fraser.
Only add the SDK PrivateFrameworks directory to the FRAMEWORK_SEARCH_PATH when building for
iOS Simulator, building with an iOS SDK that does not support text-based stubs, or building
an Apple-internal build.
Source/WebCore:
* Configurations/Base.xcconfig: Define WK_TARGET_IOS_VERSION_MAJOR.
* Configurations/WebCore.xcconfig:
Source/WebKit/mac:
* Configurations/WebKitLegacy.xcconfig:
Source/WebKit2:
* Configurations/BaseTarget.xcconfig:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsBasexcconfig">trunk/Source/WebCore/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsWebCorexcconfig">trunk/Source/WebCore/Configurations/WebCore.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="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsBaseTargetxcconfig">trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204626 => 204627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-19 02:53:58 UTC (rev 204626)
+++ trunk/Source/WebCore/ChangeLog 2016-08-19 03:07:15 UTC (rev 204627)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-08-18 Daniel Bates <dabates@apple.com>
+
+ Ld warns of non-existent PrivateFrameworks directory when building WebKit with the public iOS 9.3 SDK
+ https://bugs.webkit.org/show_bug.cgi?id=160979
+
+ Rubber-stamped by Simon Fraser.
+
+ Only add the SDK PrivateFrameworks directory to the FRAMEWORK_SEARCH_PATH when building for
+ iOS Simulator, building with an iOS SDK that does not support text-based stubs, or building
+ an Apple-internal build.
+
+ * Configurations/Base.xcconfig: Define WK_TARGET_IOS_VERSION_MAJOR.
+ * Configurations/WebCore.xcconfig:
+
</ins><span class="cx"> 2016-08-18 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Re-landing:
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (204626 => 204627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/Base.xcconfig 2016-08-19 02:53:58 UTC (rev 204626)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig 2016-08-19 03:07:15 UTC (rev 204627)
</span><span class="lines">@@ -85,6 +85,8 @@
</span><span class="cx"> TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
</span><span class="cx"> TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
</span><span class="cx">
</span><ins>+WK_TARGET_IOS_VERSION_MAJOR = $(IPHONEOS_DEPLOYMENT_TARGET:base); // iOS 9.3 => 9
+
</ins><span class="cx"> SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
</span><span class="cx">
</span><span class="cx"> // DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsWebCorexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (204626 => 204627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2016-08-19 02:53:58 UTC (rev 204626)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2016-08-19 03:07:15 UTC (rev 204627)
</span><span class="lines">@@ -28,11 +28,15 @@
</span><span class="cx"> GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) $(inherited);
</span><span class="cx">
</span><span class="cx"> WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
</span><del>-WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphoneos*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphoneos_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS)_$(USE_INTERNAL_SDK));
-WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphoneos_YES_ = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(IPHONEOS_DEPLOYMENT_TARGET:base);
</del><ins>+WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
+WK_PRIVATE_FRAMEWORKS_DIR_YES = $(PRODUCTION_FRAMEWORKS_DIR);
+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphonesimulator*] = $(PRODUCTION_FRAMEWORKS_DIR);
+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphoneos*] = $(WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS));
+WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_YES = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
+WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_NO = $(PRODUCTION_FRAMEWORKS_DIR);
</ins><span class="cx">
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(FRAMEWORK_SEARCH_PATHS_ios_$(CONFIGURATION));
</span><del>-FRAMEWORK_SEARCH_PATHS_ios_Debug = $(BUILT_PRODUCTS_DIR) $(WK_PRIVATE_FRAMEWORK_STUBS_DIR) $(PRODUCTION_FRAMEWORKS_DIR);
</del><ins>+FRAMEWORK_SEARCH_PATHS_ios_Debug = $(BUILT_PRODUCTS_DIR) $(WK_PRIVATE_FRAMEWORKS_DIR);
</ins><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><span class="cx"> FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR) $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (204626 => 204627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-08-19 02:53:58 UTC (rev 204626)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-08-19 03:07:15 UTC (rev 204627)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-08-18 Daniel Bates <dabates@apple.com>
+
+ Ld warns of non-existent PrivateFrameworks directory when building WebKit with the public iOS 9.3 SDK
+ https://bugs.webkit.org/show_bug.cgi?id=160979
+
+ Rubber-stamped by Simon Fraser.
+
+ Only add the SDK PrivateFrameworks directory to the FRAMEWORK_SEARCH_PATH when building for
+ iOS Simulator, building with an iOS SDK that does not support text-based stubs, or building
+ an Apple-internal build.
+
+ * Configurations/WebKitLegacy.xcconfig:
+
</ins><span class="cx"> 2016-08-18 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Move an NPAPI-only function from WebCore to WebKit
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsWebKitLegacyxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig (204626 => 204627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig 2016-08-19 02:53:58 UTC (rev 204626)
+++ trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig 2016-08-19 03:07:15 UTC (rev 204627)
</span><span class="lines">@@ -38,11 +38,15 @@
</span><span class="cx"> EXPORTED_SYMBOLS_FILE_x86_64[sdk=macosx*] = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.LP64.exp;
</span><span class="cx">
</span><span class="cx"> WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
</span><del>-WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphoneos*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphoneos_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS)_$(USE_INTERNAL_SDK));
-WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphoneos_YES_ = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
</del><ins>+WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
+WK_PRIVATE_FRAMEWORKS_DIR_YES = $(PRODUCTION_FRAMEWORKS_DIR);
+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphonesimulator*] = $(PRODUCTION_FRAMEWORKS_DIR);
+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphoneos*] = $(WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS));
+WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_YES = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
+WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_NO = $(PRODUCTION_FRAMEWORKS_DIR);
</ins><span class="cx">
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(FRAMEWORK_SEARCH_PATHS_ios_$(CONFIGURATION));
</span><del>-FRAMEWORK_SEARCH_PATHS_ios_Debug = $(BUILT_PRODUCTS_DIR) $(WK_PRIVATE_FRAMEWORK_STUBS_DIR) $(PRODUCTION_FRAMEWORKS_DIR);
</del><ins>+FRAMEWORK_SEARCH_PATHS_ios_Debug = $(BUILT_PRODUCTS_DIR) $(WK_PRIVATE_FRAMEWORKS_DIR);
</ins><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><span class="cx"> FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR) "$(UMBRELLA_FRAMEWORKS_DIR)" $(inherited);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (204626 => 204627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-08-19 02:53:58 UTC (rev 204626)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-19 03:07:15 UTC (rev 204627)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-08-18 Daniel Bates <dabates@apple.com>
+
+ Ld warns of non-existent PrivateFrameworks directory when building WebKit with the public iOS 9.3 SDK
+ https://bugs.webkit.org/show_bug.cgi?id=160979
+
+ Rubber-stamped by Simon Fraser.
+
+ Only add the SDK PrivateFrameworks directory to the FRAMEWORK_SEARCH_PATH when building for
+ iOS Simulator, building with an iOS SDK that does not support text-based stubs, or building
+ an Apple-internal build.
+
+ * Configurations/BaseTarget.xcconfig:
+
</ins><span class="cx"> 2016-08-18 Hunseop Jeong <hs85.jeong@samsung.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, Fix CMake build after r204614
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsBaseTargetxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig (204626 => 204627)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig 2016-08-19 02:53:58 UTC (rev 204626)
+++ trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig 2016-08-19 03:07:15 UTC (rev 204627)
</span><span class="lines">@@ -25,11 +25,15 @@
</span><span class="cx"> #include "Version.xcconfig"
</span><span class="cx">
</span><span class="cx"> WK_XCODE_SUPPORTS_TEXT_BASED_STUBS = $(WK_NOT_$(WK_EMPTY_$(TAPI_VERIFY_MODE)));
</span><del>-WK_PRIVATE_FRAMEWORK_STUBS_DIR[sdk=iphoneos*] = $(WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphoneos_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS)_$(USE_INTERNAL_SDK));
-WK_PRIVATE_FRAMEWORK_STUBS_DIR_iphoneos_YES_ = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
</del><ins>+WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
+WK_PRIVATE_FRAMEWORKS_DIR_YES = $(PRODUCTION_FRAMEWORKS_DIR);
+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphonesimulator*] = $(PRODUCTION_FRAMEWORKS_DIR);
+WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphoneos*] = $(WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_$(WK_XCODE_SUPPORTS_TEXT_BASED_STUBS));
+WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_YES = $(SRCROOT)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
+WK_PRIVATE_FRAMEWORKS_DIR_iphoneos_NO = $(PRODUCTION_FRAMEWORKS_DIR);
</ins><span class="cx">
</span><span class="cx"> FRAMEWORK_SEARCH_PATHS_base = "$(UMBRELLA_FRAMEWORKS_DIR)" $(FRAMEWORK_SEARCH_PATHS);
</span><del>-FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(FRAMEWORK_SEARCH_PATHS_base) $(WK_PRIVATE_FRAMEWORK_STUBS_DIR) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</del><ins>+FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(FRAMEWORK_SEARCH_PATHS_base) $(WK_PRIVATE_FRAMEWORKS_DIR);
</ins><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></pre>
</div>
</div>
</body>
</html>