<!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>[177574] 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/177574">177574</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2014-12-19 09:23:10 -0800 (Fri, 19 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Switch from using PLATFORM_NAME to SDK selectors in WebCore, WebInspectorUI, WebKit, WebKit2
<http://webkit.org/b/139463>
Reviewed by Mark Rowe.
Source/JavaScriptCore:
* Configurations/JavaScriptCore.xcconfig:
- Simplify SECTORDER_FLAGS.
Source/WebCore:
Also remove all uses of SQLITE3_HEADER_SEARCH_PATHS and
WEBCORE_SQLITE3_HEADER_SEARCH_PATHS which were phased out in
<a href="http://trac.webkit.org/projects/webkit/changeset/132859">r132859</a> and needed for Leopard.
* Configurations/Base.xcconfig:
- Only set GCC_ENABLE_OBJC_GC, GCC_MODEL_TUNING and TOOLCHAINS
on OS X.
- Set GCC_OPTIMIZATION_LEVEL_normal based on SDK.
- Simplify SQLITE3_HEADER_SEARCH_PATHS.
* Configurations/DebugRelease.xcconfig:
- Only set MACOSX_DEPLOYMENT_TARGET and SDKROOT on OS X.
* Configurations/Version.xcconfig:
- Set SYSTEM_VERSION_PREFIX separately for iOS and OS X.
* Configurations/WebCore.xcconfig:
- Set EXPORTED_SYMBOLS_FILE_i386, EXPORTED_SYMBOLS_FILE_x86_64,
FRAMEWORK_SEARCH_PATHS, INSTALL_PATH, DYLIB_INSTALL_NAME_BASE,
OTHER_LDFLAGS, SECTORDER_FLAGS, NORMAL_WEBCORE_FRAMEWORKS_DIR,
WEBCORE_FRAMEWORKS_DIR, NORMAL_PRODUCTION_FRAMEWORKS_DIR,
PRODUCTION_FRAMEWORKS_DIR,
JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Production and
EXCLUDED_SOURCE_FILE_NAMES based on SDK.
- Make sure DYLIB_INSTALL_NAME_BASE and OTHER_LDFLAGS are
overrideable by WebCoreTestSupport.xcconfig.
* Configurations/WebCoreTestSupport.xcconfig:
- Set PRIVATE_HEADERS_FOLDER_PATH_Production and
INSTALL_PATH_Production based on SDK.
- Override SECT_ORDER_FLAGS from WebCore.xcconfig.
Source/WebInspectorUI:
* Configurations/Base.xcconfig:
- Only set TOOLCHAINS on OS X.
* Configurations/DebugRelease.xcconfig:
- Only set MACOSX_DEPLOYMENT_TARGET and SDKROOT on OS X.
* Configurations/Version.xcconfig:
- Set SYSTEM_VERSION_PREFIX separately for iOS and OS X.
* Configurations/WebInspectorUIFramework.xcconfig:
- Set NORMAL_PRODUCTION_FRAMEWORKS_DIR,
PRODUCTION_FRAMEWORKS_DIR and
JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Production by SDK.
Source/WebKit/mac:
* Configurations/Base.xcconfig:
- Only set GCC_ENABLE_OBJC_GC, GCC_MODEL_TUNING and TOOLCHAINS
on OS X.
- Set GCC_OPTIMIZATION_LEVEL_normal based on SDK.
* Configurations/DebugRelease.xcconfig:
- Only set MACOSX_DEPLOYMENT_TARGET and SDKROOT on OS X.
- Set WEBKIT_SYSTEM_INTERFACE_LIBRARY based on SDK.
* Configurations/Version.xcconfig:
- Set SYSTEM_VERSION_PREFIX separately for iOS and OS X.
* Configurations/WebKitLegacy.xcconfig:
- Set EXCLUDED_SOURCE_FILE_NAMES, EXPORTED_SYMBOLS_FILE_x86_64,
FRAMEWORK_SEARCH_PATHS, OTHER_CFLAGS, INSTALL_PATH,
DYLIB_INSTALL_NAME_BASE, OTHER_LDFLAGS, SECTORDER_FLAGS,
NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR,
WEBKIT_LEGACY_FRAMEWORKS_DIR, NORMAL_PRODUCTION_FRAMEWORKS_DIR,
PRODUCTION_FRAMEWORKS_DIR, PRODUCTION_ROOT,
WEBCORE_PRIVATE_HEADERS_DIR_Production and
WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering
based on SDK.
- Fix PRODUCTION_ROOT to actually be set properly.
- Simplify EXPORTED_SYMBOLS_FILE_i386.
* migrate-headers.sh:
- Get rid of unused WEBKIT2_FRAMEWORKS_DIR variable.
- Change WEBCORE_PRIVATE_HEADERS_DIR_macosx_Production to
WEBCORE_PRIVATE_HEADERS_DIR_Production based on changes to
WebKitLegacy.xcconfig.
Source/WebKit2:
* Configurations/All.xcconfig:
- Only set EXCLUDED_SOURCE_FILE_NAMES on iOS.
* Configurations/Base.xcconfig:
- Only set FRAMEWORK_CONTENT_DIRECTORY, GCC_ENABLE_OBJC_GC and
TOOLCHAINS on OS X.
* Configurations/BaseLegacyProcess.xcconfig:
- Only set SKIP_INSTALL on iOS.
* Configurations/BaseTarget.xcconfig:
- Set WEBKIT_FRAMEWORKS_DIR and UMBRELLA_FRAMEWORKS_DIR based on
SDK, and simply them.
* Configurations/BaseXPCService.xcconfig:
- Set INSTALL_PATH_ACTUAL_Normal based on SDK.
* Configurations/DebugRelease.xcconfig:
- Only set MACOSX_DEPLOYMENT_TARGET and SDKROOT on OS X.
- Set WEBKIT_SYSTEM_INTERFACE_LIBRARY based on SDK.
* Configurations/NetworkProcess.xcconfig:
- Only set EXCLUDED_SHIM_FILE_NAME and CODE_SIGN_ENTITLEMENTS on
iOS.
* Configurations/NetworkService.Development.xcconfig:
- Set INFOPLIST_FILE based on SDK.
- Simplify CODE_SIGN_ENTITLEMENTS for iOS.
* Configurations/NetworkService.xcconfig:
- Set INFOPLIST_FILE based on SDK.
- Simplify CODE_SIGN_ENTITLEMENTS for iOS.
* Configurations/PluginProcess.xcconfig:
- Only set EXCLUDED_SHIM_FILE_NAME and SKIP_INSTALL on iOS.
* Configurations/PluginProcessShim.xcconfig:
- Set OTHER_LDFLAGS based on SDK.
* Configurations/PluginService.32.xcconfig:
- Only set VALID_ARCHS on OS X.
- Set OTHER_LDFLAGS based on platform-specific values.
- Only set SKIP_INSTALL on iOS.
* Configurations/PluginService.64.xcconfig:
- Set ARCHS based on SDK.
- Set OTHER_LDFLAGS based on platform-specific values.
- Only set SKIP_INSTALL on iOS.
* Configurations/PluginService.Development.xcconfig:
- Only set SKIP_INSTALL on iOS.
- Set OTHER_LDFLAGS based on platform-specific values.
* Configurations/SecItemShim.xcconfig:
- Set OTHER_LDFLAGS based on platform-specific values.
* Configurations/Version.xcconfig:
- Set SYSTEM_VERSION_PREFIX separately for iOS and OS X.
* Configurations/WebContentProcess.xcconfig:
- Only set EXCLUDED_SHIM_FILE_NAME on iOS.
- Only set CODE_SIGN_ENTITLEMENTS on iOS Simulator.
* Configurations/WebContentService.Development.xcconfig:
- Set INFOPLIST_FILE and BUNDLE_LOCALIZATION_KEY based on SDK.
- Only set CODE_SIGN_ENTITLEMENTS on iOS hardware.
- Set OTHER_LDFLAGS based on platform-specific values.
* Configurations/WebContentService.xcconfig: Ditto.
* Configurations/WebKit.xcconfig:
- Set FRAMEWORK_AND_LIBRARY_LDFLAGS, SECTORDER_FLAGS, and
WK_API_AVAILABILITY_ENABLED based on SDK.
- Set OTHER_LDFLAGS based on platform-specific values.
- Only set EXCLUDED_SOURCE_FILE_NAMES on iOS.
* Configurations/WebKit2.xcconfig:
- Set INSTALL_PATH, INSTALL_PATH_ACTUAL, DYLIB_INSTALL_NAME_BASE,
NORMAL_WEBKIT2_FRAMEWORKS_DIR, WEBKIT2_FRAMEWORKS_DIR and
NORMAL_PRODUCTION_FRAMEWORKS_DIR based on SDK.
- Set SKIP_INSTALL on iOS.
* Configurations/WebProcessShim.xcconfig:
- Set OTHER_LDFLAGS based on platform-specific values.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsJavaScriptCorexcconfig">trunk/Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig</a></li>
<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="#trunkSourceWebCoreConfigurationsDebugReleasexcconfig">trunk/Source/WebCore/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsVersionxcconfig">trunk/Source/WebCore/Configurations/Version.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsWebCorexcconfig">trunk/Source/WebCore/Configurations/WebCore.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsWebCoreTestSupportxcconfig">trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig</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="#trunkSourceWebInspectorUIConfigurationsDebugReleasexcconfig">trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkSourceWebInspectorUIConfigurationsVersionxcconfig">trunk/Source/WebInspectorUI/Configurations/Version.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="#trunkSourceWebKitmacConfigurationsBasexcconfig">trunk/Source/WebKit/mac/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsDebugReleasexcconfig">trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsVersionxcconfig">trunk/Source/WebKit/mac/Configurations/Version.xcconfig</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsWebKitLegacyxcconfig">trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig</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="#trunkSourceWebKit2ConfigurationsAllxcconfig">trunk/Source/WebKit2/Configurations/All.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsBasexcconfig">trunk/Source/WebKit2/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsBaseLegacyProcessxcconfig">trunk/Source/WebKit2/Configurations/BaseLegacyProcess.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsBaseTargetxcconfig">trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsBaseXPCServicexcconfig">trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsDebugReleasexcconfig">trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsNetworkProcessxcconfig">trunk/Source/WebKit2/Configurations/NetworkProcess.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsNetworkServiceDevelopmentxcconfig">trunk/Source/WebKit2/Configurations/NetworkService.Development.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsNetworkServicexcconfig">trunk/Source/WebKit2/Configurations/NetworkService.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsPluginProcessxcconfig">trunk/Source/WebKit2/Configurations/PluginProcess.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsPluginProcessShimxcconfig">trunk/Source/WebKit2/Configurations/PluginProcessShim.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsPluginService32xcconfig">trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsPluginService64xcconfig">trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsPluginServiceDevelopmentxcconfig">trunk/Source/WebKit2/Configurations/PluginService.Development.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsSecItemShimxcconfig">trunk/Source/WebKit2/Configurations/SecItemShim.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsVersionxcconfig">trunk/Source/WebKit2/Configurations/Version.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsWebContentProcessxcconfig">trunk/Source/WebKit2/Configurations/WebContentProcess.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsWebContentServiceDevelopmentxcconfig">trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsWebContentServicexcconfig">trunk/Source/WebKit2/Configurations/WebContentService.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsWebKitxcconfig">trunk/Source/WebKit2/Configurations/WebKit.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsWebKit2xcconfig">trunk/Source/WebKit2/Configurations/WebKit2.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsWebProcessShimxcconfig">trunk/Source/WebKit2/Configurations/WebProcessShim.xcconfig</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-12-19 David Kilzer <ddkilzer@apple.com>
+
+ Switch from using PLATFORM_NAME to SDK selectors in WebCore, WebInspectorUI, WebKit, WebKit2
+ <http://webkit.org/b/139463>
+
+ Reviewed by Mark Rowe.
+
+ * Configurations/JavaScriptCore.xcconfig:
+ - Simplify SECTORDER_FLAGS.
+
</ins><span class="cx"> 2014-12-18 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsJavaScriptCorexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -40,10 +40,8 @@
</span><span class="cx"> OTHER_LDFLAGS[sdk=iphone*] = $(inherited) $(OTHER_LDFLAGS_BASE);
</span><span class="cx"> OTHER_LDFLAGS[sdk=macosx*] = $(inherited) $(OTHER_LDFLAGS_BASE) -sub_library libobjc -framework CoreServices;
</span><span class="cx">
</span><del>-SECTORDER_FLAGS[sdk=iphoneos*] = $(SECTORDER_FLAGS_ios_$(CONFIGURATION));
-SECTORDER_FLAGS_ios_Production = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/JavaScriptCore.order;
-SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(PLATFORM_NAME)_$(CONFIGURATION));
-SECTORDER_FLAGS_macosx_Production = -Wl,-order_file,JavaScriptCore.order;
</del><ins>+SECTORDER_FLAGS[sdk=iphoneos*][config=Production] = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/JavaScriptCore.order;
+SECTORDER_FLAGS[sdk=macosx*][config=Production] = -Wl,-order_file,JavaScriptCore.order;
</ins><span class="cx">
</span><span class="cx"> GCC_PREFIX_HEADER = JavaScriptCorePrefix.h;
</span><span class="cx"> GCC_SYMBOLS_PRIVATE_EXTERN = YES;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebCore/ChangeLog 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2014-12-19 David Kilzer <ddkilzer@apple.com>
+
+ Switch from using PLATFORM_NAME to SDK selectors in WebCore, WebInspectorUI, WebKit, WebKit2
+ <http://webkit.org/b/139463>
+
+ Reviewed by Mark Rowe.
+
+ Also remove all uses of SQLITE3_HEADER_SEARCH_PATHS and
+ WEBCORE_SQLITE3_HEADER_SEARCH_PATHS which were phased out in
+ r132859 and needed for Leopard.
+
+ * Configurations/Base.xcconfig:
+ - Only set GCC_ENABLE_OBJC_GC, GCC_MODEL_TUNING and TOOLCHAINS
+ on OS X.
+ - Set GCC_OPTIMIZATION_LEVEL_normal based on SDK.
+ - Simplify SQLITE3_HEADER_SEARCH_PATHS.
+ * Configurations/DebugRelease.xcconfig:
+ - Only set MACOSX_DEPLOYMENT_TARGET and SDKROOT on OS X.
+ * Configurations/Version.xcconfig:
+ - Set SYSTEM_VERSION_PREFIX separately for iOS and OS X.
+ * Configurations/WebCore.xcconfig:
+ - Set EXPORTED_SYMBOLS_FILE_i386, EXPORTED_SYMBOLS_FILE_x86_64,
+ FRAMEWORK_SEARCH_PATHS, INSTALL_PATH, DYLIB_INSTALL_NAME_BASE,
+ OTHER_LDFLAGS, SECTORDER_FLAGS, NORMAL_WEBCORE_FRAMEWORKS_DIR,
+ WEBCORE_FRAMEWORKS_DIR, NORMAL_PRODUCTION_FRAMEWORKS_DIR,
+ PRODUCTION_FRAMEWORKS_DIR,
+ JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Production and
+ EXCLUDED_SOURCE_FILE_NAMES based on SDK.
+ - Make sure DYLIB_INSTALL_NAME_BASE and OTHER_LDFLAGS are
+ overrideable by WebCoreTestSupport.xcconfig.
+ * Configurations/WebCoreTestSupport.xcconfig:
+ - Set PRIVATE_HEADERS_FOLDER_PATH_Production and
+ INSTALL_PATH_Production based on SDK.
+ - Override SECT_ORDER_FLAGS from WebCore.xcconfig.
+
</ins><span class="cx"> 2014-12-19 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Clean up StyleBuilderCustom and DeprecatedStyleBuilder
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/Base.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -47,17 +47,13 @@
</span><span class="cx"> GCC_ENABLE_CPP_EXCEPTIONS = NO;
</span><span class="cx"> GCC_ENABLE_CPP_RTTI = NO;
</span><span class="cx"> GCC_ENABLE_OBJC_EXCEPTIONS = YES;
</span><del>-GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME));
-GCC_ENABLE_OBJC_GC_iphoneos = NO;
-GCC_ENABLE_OBJC_GC_iphonesimulator = NO;
-GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(USE_INTERNAL_SDK));
</del><ins>+GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
</ins><span class="cx"> GCC_ENABLE_OBJC_GC_macosx_ = NO;
</span><span class="cx"> GCC_ENABLE_OBJC_GC_macosx_YES = supported;
</span><span class="cx"> GCC_ENABLE_SYMBOL_SEPARATION = NO;
</span><span class="cx"> GCC_FAST_OBJC_DISPATCH = YES;
</span><span class="cx"> GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
</span><del>-GCC_MODEL_TUNING = $(GCC_MODEL_TUNING_$(PLATFORM_NAME));
-GCC_MODEL_TUNING_macosx = G5;
</del><ins>+GCC_MODEL_TUNING[sdk=macosx*] = G5;
</ins><span class="cx"> GCC_OBJC_CALL_CXX_CDTORS = YES;
</span><span class="cx"> GCC_PRECOMPILE_PREFIX_HEADER = YES;
</span><span class="cx"> GCC_THREADSAFE_STATICS = NO;
</span><span class="lines">@@ -97,10 +93,8 @@
</span><span class="cx"> DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
</span><span class="cx">
</span><span class="cx"> GCC_OPTIMIZATION_LEVEL = $(GCC_OPTIMIZATION_LEVEL_$(CURRENT_VARIANT));
</span><del>-GCC_OPTIMIZATION_LEVEL_normal = $(GCC_OPTIMIZATION_LEVEL_normal_$(PLATFORM_NAME));
-GCC_OPTIMIZATION_LEVEL_normal_iphoneos = 3;
-GCC_OPTIMIZATION_LEVEL_normal_iphonesimulator = 3;
-GCC_OPTIMIZATION_LEVEL_normal_macosx = 2;
</del><ins>+GCC_OPTIMIZATION_LEVEL_normal[sdk=iphone*] = 3;
+GCC_OPTIMIZATION_LEVEL_normal[sdk=macosx*] = 2;
</ins><span class="cx"> GCC_OPTIMIZATION_LEVEL_debug = 0;
</span><span class="cx">
</span><span class="cx"> STRIP_INSTALLED_PRODUCT = $(STRIP_INSTALLED_PRODUCT_$(CURRENT_VARIANT));
</span><span class="lines">@@ -111,20 +105,14 @@
</span><span class="cx"> DEAD_CODE_STRIPPING_normal = YES;
</span><span class="cx"> DEAD_CODE_STRIPPING = $(DEAD_CODE_STRIPPING_$(CURRENT_VARIANT));
</span><span class="cx">
</span><del>-WEBCORE_SQLITE3_HEADER_SEARCH_PATHS = $(NEXT_ROOT)/usr/local/include/WebCoreSQLite3;
-SQLITE3_HEADER_SEARCH_PATHS = $(SQLITE3_HEADER_SEARCH_PATHS_$(PLATFORM_NAME));
-SQLITE3_HEADER_SEARCH_PATHS_macosx = $(SQLITE3_HEADER_SEARCH_PATHS_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-
</del><span class="cx"> GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
</span><span class="cx"> CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.8*] = line-tables-only;
</span><span class="cx"> CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.9*] = line-tables-only;
</span><span class="cx">
</span><span class="cx"> SDKROOT = macosx.internal;
</span><span class="cx">
</span><del>-TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME));
-TOOLCHAINS_iphoneos = $(TOOLCHAINS);
-TOOLCHAINS_iphonesimulator = $(TOOLCHAINS);
-TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
</del><ins>+TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
+TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
</ins><span class="cx"> TOOLCHAINS_macosx_1080 = default;
</span><span class="cx"> TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
</span><span class="cx"> TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/DebugRelease.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -27,10 +27,7 @@
</span><span class="cx">
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><del>-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME));
-MACOSX_DEPLOYMENT_TARGET_iphoneos = 10.5;
-MACOSX_DEPLOYMENT_TARGET_iphonesimulator = 10.5;
-MACOSX_DEPLOYMENT_TARGET_macosx = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</del><ins>+MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</ins><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_1080 = 10.8;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
</span><span class="lines">@@ -40,15 +37,11 @@
</span><span class="cx"> DEBUG_INFORMATION_FORMAT = dwarf;
</span><span class="cx"> CLANG_DEBUG_INFORMATION_LEVEL = default;
</span><span class="cx">
</span><del>-WEBCORE_SQLITE3_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/WebCoreSQLite3;
-
</del><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><span class="cx">
</span><del>-SDKROOT = $(SDKROOT_$(PLATFORM_NAME));
-SDKROOT_iphoneos = $(SDKROOT);
-SDKROOT_iphonesimulator = $(SDKROOT);
-SDKROOT_macosx = $(SDKROOT_macosx_$(USE_INTERNAL_SDK));
</del><ins>+SDKROOT[sdk=iphone*] = $(SDKROOT);
+SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
</ins><span class="cx"> SDKROOT_macosx_ = macosx;
</span><span class="cx"> SDKROOT_macosx_YES = macosx.internal;
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsVersionxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/Version.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/Version.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebCore/Configurations/Version.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -33,10 +33,8 @@
</span><span class="cx"> SHORT_VERSION_STRING = $(SHORT_VERSION_STRING_$(CONFIGURATION))
</span><span class="cx">
</span><span class="cx"> // The system version prefix is based on the current system version.
</span><del>-SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME));
-SYSTEM_VERSION_PREFIX_iphoneos = 8;
-SYSTEM_VERSION_PREFIX_iphonesimulator = $(SYSTEM_VERSION_PREFIX_iphoneos);
-SYSTEM_VERSION_PREFIX_macosx = $(SYSTEM_VERSION_PREFIX_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</del><ins>+SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
+SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</ins><span class="cx"> SYSTEM_VERSION_PREFIX_macosx_1080 = 8;
</span><span class="cx"> SYSTEM_VERSION_PREFIX_macosx_1090 = 9;
</span><span class="cx"> SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsWebCorexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -30,21 +30,15 @@
</span><span class="cx"> EXPORTED_SYMBOLS_FILE_armv7k = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.armv7k.exp;
</span><span class="cx"> EXPORTED_SYMBOLS_FILE_armv7s = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.armv7s.exp;
</span><span class="cx"> EXPORTED_SYMBOLS_FILE_arm64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.arm64.exp;
</span><del>-EXPORTED_SYMBOLS_FILE_i386 = $(EXPORTED_SYMBOLS_FILE_i386_$(PLATFORM_NAME));
-EXPORTED_SYMBOLS_FILE_i386_iphonesimulator = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.i386.exp;
-EXPORTED_SYMBOLS_FILE_i386_macosx = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.exp;
-EXPORTED_SYMBOLS_FILE_x86_64 = $(EXPORTED_SYMBOLS_FILE_x86_64_$(PLATFORM_NAME));
-EXPORTED_SYMBOLS_FILE_x86_64_iphonesimulator = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.x86_64.exp;
-EXPORTED_SYMBOLS_FILE_x86_64_macosx = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.exp;
</del><ins>+EXPORTED_SYMBOLS_FILE_i386[sdk=iphonesimulator*] = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.i386.exp;
+EXPORTED_SYMBOLS_FILE_i386[sdk=macosx*] = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.exp;
+EXPORTED_SYMBOLS_FILE_x86_64[sdk=iphonesimulator*] = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.x86_64.exp;
+EXPORTED_SYMBOLS_FILE_x86_64[sdk=macosx*] = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.exp;
</ins><span class="cx"> GCC_PREFIX_HEADER = WebCorePrefix.h;
</span><span class="cx"> GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST $(GCC_PREPROCESSOR_DEFINITIONS);
</span><del>-FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_$(PLATFORM_NAME));
-FRAMEWORK_SEARCH_PATHS_iphoneos = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION));
-FRAMEWORK_SEARCH_PATHS_iphoneos_Debug = $(BUILT_PRODUCTS_DIR) $(PRODUCTION_FRAMEWORKS_DIR);
-FRAMEWORK_SEARCH_PATHS_iphoneos_Release = $(FRAMEWORK_SEARCH_PATHS_iphoneos_Debug);
-FRAMEWORK_SEARCH_PATHS_iphoneos_Production = $(PRODUCTION_FRAMEWORKS_DIR);
-FRAMEWORK_SEARCH_PATHS_iphonesimulator = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION));
-FRAMEWORK_SEARCH_PATHS_macosx = $(STAGED_FRAMEWORKS_SEARCH_PATH) $(FRAMEWORK_SEARCH_PATHS);
</del><ins>+FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(BUILT_PRODUCTS_DIR) $(PRODUCTION_FRAMEWORKS_DIR);
+FRAMEWORK_SEARCH_PATHS[sdk=iphone*][config=Production] = $(PRODUCTION_FRAMEWORKS_DIR);
+FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(STAGED_FRAMEWORKS_SEARCH_PATH) $(FRAMEWORK_SEARCH_PATHS);
</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)/PrivateFrameworks;
</span><span class="cx"> OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
</span><span class="lines">@@ -54,65 +48,51 @@
</span><span class="cx">
</span><span class="cx"> WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions;
</span><span class="cx">
</span><del>-HEADER_SEARCH_PATHS = ForwardingHeaders icu /usr/include/libxslt /usr/include/libxml2 $(SQLITE3_HEADER_SEARCH_PATHS) "${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS);
</del><ins>+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);
</ins><span class="cx"> INFOPLIST_FILE = Info.plist;
</span><del>-INSTALL_PATH = $(INSTALL_PATH_$(PLATFORM_NAME));
-INSTALL_PATH_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-INSTALL_PATH_iphonesimulator = $(INDIGO_INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
-INSTALL_PATH_macosx = $(WEBCORE_FRAMEWORKS_DIR);
-INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(PLATFORM_NAME));
-INSTALL_PATH_ACTUAL_iphonesimulator = $(INSTALL_PATH_iphoneos);
-DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(PLATFORM_NAME));
-DYLIB_INSTALL_NAME_BASE_macosx = $(NORMAL_WEBCORE_FRAMEWORKS_DIR);
-DYLIB_INSTALL_NAME_BASE_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-DYLIB_INSTALL_NAME_BASE_iphonesimulator = $(DYLIB_INSTALL_NAME_BASE_iphoneos);
</del><ins>+INSTALL_PATH[sdk=iphoneos*] = $(INSTALL_PATH_ios);
+INSTALL_PATH[sdk=macosx*] = $(WEBCORE_FRAMEWORKS_DIR);
+INSTALL_PATH_ACTUAL[sdk=iphonesimulator*] = $(INSTALL_PATH_ios);
+INSTALL_PATH_ios = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_PLATFORM);
+DYLIB_INSTALL_NAME_BASE_PLATFORM[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+DYLIB_INSTALL_NAME_BASE_PLATFORM[sdk=macosx*] = $(NORMAL_WEBCORE_FRAMEWORKS_DIR);
</ins><span class="cx"> INSTALLHDRS_COPY_PHASE = YES;
</span><span class="cx"> INSTALLHDRS_SCRIPT_PHASE = YES;
</span><span class="cx"> PRODUCT_NAME = WebCore;
</span><ins>+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_PLATFORM);
</ins><span class="cx"> OTHER_LDFLAGS_BASE = -lsqlite3 -lobjc -lANGLE;
</span><del>-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
-OTHER_LDFLAGS_iphoneos = $(OTHER_LDFLAGS_iphonesimulator) -framework IOSurface -framework AppSupport;
-OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_BASE) -framework CFNetwork -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework OpenGLES -framework AppSupport -lMobileGestalt;
-OTHER_LDFLAGS_macosx = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -umbrella WebKit -allowable_client WebCoreTestSupport -allowable_client WebKit2 -allowable_client WebKitLegacy -framework ApplicationServices -framework AudioUnit -framework Carbon -framework Cocoa -framework IOSurface -framework OpenGL;
</del><ins>+OTHER_LDFLAGS_BASE_ios = $(OTHER_LDFLAGS_BASE) -framework AppSupport -framework CFNetwork -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework OpenGLES -lMobileGestalt;
+OTHER_LDFLAGS_PLATFORM[sdk=iphoneos*] = $(OTHER_LDFLAGS_BASE_ios) -framework IOSurface;
+OTHER_LDFLAGS_PLATFORM[sdk=iphonesimulator*] = $(OTHER_LDFLAGS_BASE_ios);
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = $(OTHER_LDFLAGS_BASE) -sub_library libobjc -umbrella WebKit -allowable_client WebCoreTestSupport -allowable_client WebKit2 -allowable_client WebKitLegacy -framework ApplicationServices -framework AudioUnit -framework Carbon -framework Cocoa -framework IOSurface -framework OpenGL;
</ins><span class="cx">
</span><del>-SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(CONFIGURATION)_$(PLATFORM_NAME));
-SECTORDER_FLAGS_Production_iphoneos = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebCore.order;
-SECTORDER_FLAGS_Production_macosx = -Wl,-order_file,WebCore.order;
</del><ins>+SECTORDER_FLAGS[sdk=iphoneos*][config=Production] = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebCore.order;
+SECTORDER_FLAGS[sdk=macosx*][config=Production] = -Wl,-order_file,WebCore.order;
</ins><span class="cx">
</span><del>-NORMAL_WEBCORE_FRAMEWORKS_DIR = $(NORMAL_WEBCORE_FRAMEWORKS_DIR_$(PLATFORM_NAME));
-NORMAL_WEBCORE_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR);
-NORMAL_WEBCORE_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR);
-NORMAL_WEBCORE_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
</del><ins>+NORMAL_WEBCORE_FRAMEWORKS_DIR[sdk=iphone*] = $(PRODUCTION_FRAMEWORKS_DIR);
+NORMAL_WEBCORE_FRAMEWORKS_DIR[sdk=macosx*] = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
</ins><span class="cx">
</span><del>-WEBCORE_FRAMEWORKS_DIR = $(WEBCORE_FRAMEWORKS_DIR_$(PLATFORM_NAME));
-WEBCORE_FRAMEWORKS_DIR_iphoneos = $(NORMAL_WEBCORE_FRAMEWORKS_DIR_iphoneos);
-WEBCORE_FRAMEWORKS_DIR_iphonesimulator = $(WEBCORE_FRAMEWORKS_DIR_iphoneos);
-WEBCORE_FRAMEWORKS_DIR_macosx = $(WEBCORE_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
</del><ins>+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));
</ins><span class="cx"> WEBCORE_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBCORE_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
</span><span class="cx"> WEBCORE_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_WEBCORE_FRAMEWORKS_DIR);
</span><span class="cx"> WEBCORE_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
</span><span class="cx">
</span><del>-NORMAL_PRODUCTION_FRAMEWORKS_DIR = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME));
-NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos);
-NORMAL_PRODUCTION_FRAMEWORKS_DIR_macosx = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
</del><ins>+NORMAL_PRODUCTION_FRAMEWORKS_DIR[sdk=iphone*] = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+NORMAL_PRODUCTION_FRAMEWORKS_DIR[sdk=macosx*] = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
</ins><span class="cx">
</span><del>-PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME));
-PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos);
-PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR_iphoneos);
-PRODUCTION_FRAMEWORKS_DIR_macosx = $(PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
</del><ins>+PRODUCTION_FRAMEWORKS_DIR[sdk=iphone*] = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR);
+PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
</ins><span class="cx"> PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
</span><del>-PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_macosx);
</del><ins>+PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR);
</ins><span class="cx"> PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
</span><span class="cx">
</span><del>-
</del><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="cx"> JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Debug = $(JAVASCRIPTCORE_PRIVATE_HEADERS_engineering);
</span><del>-JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Production = $(JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Production_$(PLATFORM_NAME));
-JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Production_iphoneos = $(SDKROOT)/$(SYSTEM_LIBRARY_DIR)/Frameworks/JavaScriptCore.framework/PrivateHeaders;
-JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Production_iphonesimulator = $(JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Production_iphoneos);
-JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Production_macosx = $(SDKROOT)$(PRODUCTION_FRAMEWORKS_DIR)/JavaScriptCore.framework/PrivateHeaders;
</del><ins>+JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Production[sdk=iphone*] = $(SDKROOT)/$(SYSTEM_LIBRARY_DIR)/Frameworks/JavaScriptCore.framework/PrivateHeaders;
+JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Production[sdk=macosx*] = $(SDKROOT)$(PRODUCTION_FRAMEWORKS_DIR)/JavaScriptCore.framework/PrivateHeaders;
</ins><span class="cx"> JAVASCRIPTCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/JavaScriptCore.framework/PrivateHeaders;
</span><span class="cx">
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES_FOR_TOUCH_EVENTS = $(EXCLUDED_SOURCE_FILE_NAMES_FOR_TOUCH_EVENTS_IF_ENABLED_$(ENABLE_TOUCH_EVENTS));
</span><span class="lines">@@ -121,7 +101,5 @@
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS = $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS_IF_ENABLED_$(ENABLE_IOS_GESTURE_EVENTS));
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS_IF_ENABLED_ = JSGesture* DOMGesture*;
</span><span class="cx">
</span><del>-EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.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 PluginMainThreadScheduler.cpp 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.
cpp $(EXCLUDED_SOURCE_FILE_NAMES_FOR_TOUCH_EVENTS) $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS);
-EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
-EXCLUDED_SOURCE_FILE_NAMES_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);
</del><ins>+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 PluginMainThreadScheduler.cpp 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 DisplayRef
reshMonitorMac.cpp $(EXCLUDED_SOURCE_FILE_NAMES_FOR_TOUCH_EVENTS) $(EXCLUDED_SOURCE_FILE_NAMES_FOR_GESTURE_EVENTS);
+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);
</ins></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsWebCoreTestSupportxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebCore/Configurations/WebCoreTestSupport.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -27,15 +27,13 @@
</span><span class="cx"> PRIVATE_HEADERS_FOLDER_PATH = $(PRIVATE_HEADERS_FOLDER_PATH_$(CONFIGURATION));
</span><span class="cx"> PRIVATE_HEADERS_FOLDER_PATH_Debug = WebCoreTestSupport;
</span><span class="cx"> PRIVATE_HEADERS_FOLDER_PATH_Release = $(PRIVATE_HEADERS_FOLDER_PATH_Debug);
</span><del>-PRIVATE_HEADERS_FOLDER_PATH_Production = $(PRIVATE_HEADERS_FOLDER_PATH_Production_$(PLATFORM_NAME));
-PRIVATE_HEADERS_FOLDER_PATH_Production_iphoneos = /usr/local/include/WebCoreTestSupport;
-PRIVATE_HEADERS_FOLDER_PATH_Production_iphonesimulator = $(INDIGO_INSTALL_PATH_PREFIX)$(PRIVATE_HEADERS_FOLDER_PATH_Production_iphoneos);
-PRIVATE_HEADERS_FOLDER_PATH_Production_macosx = /usr/local/include/WebCoreTestSupport;
</del><ins>+PRIVATE_HEADERS_FOLDER_PATH_Production[sdk=iphonesimulator*] = $(INDIGO_INSTALL_PATH_PREFIX)/usr/local/include/WebCoreTestSupport;
+PRIVATE_HEADERS_FOLDER_PATH_Production = /usr/local/include/WebCoreTestSupport;
</ins><span class="cx">
</span><del>-INSTALL_PATH = $(INSTALL_PATH_$(CONFIGURATION)_$(PLATFORM_NAME));
-INSTALL_PATH_Production_iphoneos = /usr/local/lib;
-INSTALL_PATH_Production_iphonesimulator = $(INDIGO_INSTALL_PATH_PREFIX)$(INSTALL_PATH_Production_iphoneos);
-INSTALL_PATH_Production_macosx = /usr/local/lib;
</del><ins>+// Use [sdk=] selectors to override settings in WebCore.xcconfig.
+INSTALL_PATH[sdk=iphoneos*][config=Production] = /usr/local/lib;
+INSTALL_PATH[sdk=macosx*][config=Production] = /usr/local/lib;
+INSTALL_PATH_ACTUAL[sdk=iphonesimulator*][config=Production] = /usr/local/lib;
</ins><span class="cx">
</span><span class="cx"> SKIP_INSTALL = $(SKIP_INSTALL_$(FORCE_TOOL_INSTALL));
</span><span class="cx"> SKIP_INSTALL_ = YES;
</span><span class="lines">@@ -44,6 +42,7 @@
</span><span class="cx">
</span><span class="cx"> DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(CONFIGURATION));
</span><span class="cx"> DYLIB_INSTALL_NAME_BASE_Production = $(INSTALL_PATH);
</span><ins>+DYLIB_INSTALL_NAME_BASE_Production[sdk=iphonesimulator*] = $(INSTALL_PATH_ACTUAL);
</ins><span class="cx"> DYLIB_INSTALL_NAME_BASE_Debug = @rpath;
</span><span class="cx"> DYLIB_INSTALL_NAME_BASE_Release = $(DYLIB_INSTALL_NAME_BASE_Debug);
</span><span class="cx">
</span><span class="lines">@@ -52,3 +51,4 @@
</span><span class="cx"> EXPORTED_SYMBOLS_FILE = ;
</span><span class="cx"> GCC_SYMBOLS_PRIVATE_EXTERN = YES;
</span><span class="cx"> OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
</span><ins>+SECT_ORDER_FLAGS = ;
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-12-19 David Kilzer <ddkilzer@apple.com>
+
+ Switch from using PLATFORM_NAME to SDK selectors in WebCore, WebInspectorUI, WebKit, WebKit2
+ <http://webkit.org/b/139463>
+
+ Reviewed by Mark Rowe.
+
+ * Configurations/Base.xcconfig:
+ - Only set TOOLCHAINS on OS X.
+ * Configurations/DebugRelease.xcconfig:
+ - Only set MACOSX_DEPLOYMENT_TARGET and SDKROOT on OS X.
+ * Configurations/Version.xcconfig:
+ - Set SYSTEM_VERSION_PREFIX separately for iOS and OS X.
+ * Configurations/WebInspectorUIFramework.xcconfig:
+ - Set NORMAL_PRODUCTION_FRAMEWORKS_DIR,
+ PRODUCTION_FRAMEWORKS_DIR and
+ JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Production by SDK.
+
</ins><span class="cx"> 2014-12-16 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: REGRESSION: Dragging undocked web inspector causes mouse to change from pointer to i-bar cursor over window title
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Configurations/Base.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Configurations/Base.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebInspectorUI/Configurations/Base.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -60,10 +60,8 @@
</span><span class="cx">
</span><span class="cx"> OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH = -Wl,-dyld_env -Wl,DYLD_VERSIONED_FRAMEWORK_PATH=/System/Library/StagedFrameworks/Safari;
</span><span class="cx">
</span><del>-TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME));
-TOOLCHAINS_iphoneos = $(TOOLCHAINS);
-TOOLCHAINS_iphonesimulator = $(TOOLCHAINS);
-TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
</del><ins>+TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
+TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
</ins><span class="cx"> TOOLCHAINS_macosx_1080 = default;
</span><span class="cx"> TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
</span><span class="cx"> TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -4,11 +4,11 @@
</span><span class="cx">
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><del>-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_1080 = 10.8;
-MACOSX_DEPLOYMENT_TARGET_1090 = 10.9;
-MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
-MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
</del><ins>+MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+MACOSX_DEPLOYMENT_TARGET_macosx_1080 = 10.8;
+MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
+MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
+MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
</ins><span class="cx">
</span><span class="cx"> ENGINEERING_BUILD = 1;
</span><span class="cx">
</span><span class="lines">@@ -19,9 +19,7 @@
</span><span class="cx"> OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
</span><span class="cx"> OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
</span><span class="cx">
</span><del>-SDKROOT = $(SDKROOT_$(PLATFORM_NAME));
-SDKROOT_iphoneos = $(SDKROOT);
-SDKROOT_iphonesimulator = $(SDKROOT);
-SDKROOT_macosx = $(SDKROOT_macosx_$(USE_INTERNAL_SDK));
</del><ins>+SDKROOT[sdk=iphone*] = $(SDKROOT);
+SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
</ins><span class="cx"> SDKROOT_macosx_ = macosx;
</span><span class="cx"> SDKROOT_macosx_YES = macosx.internal;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIConfigurationsVersionxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Configurations/Version.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Configurations/Version.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebInspectorUI/Configurations/Version.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -6,10 +6,8 @@
</span><span class="cx"> FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION);
</span><span class="cx">
</span><span class="cx"> // The system version prefix is based on the current system version.
</span><del>-SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME));
-SYSTEM_VERSION_PREFIX_iphoneos = 8;
-SYSTEM_VERSION_PREFIX_iphonesimulator = $(SYSTEM_VERSION_PREFIX_iphoneos);
-SYSTEM_VERSION_PREFIX_macosx = $(SYSTEM_VERSION_PREFIX_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</del><ins>+SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
+SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</ins><span class="cx"> SYSTEM_VERSION_PREFIX_macosx_1080 = 8;
</span><span class="cx"> SYSTEM_VERSION_PREFIX_macosx_1090 = 9;
</span><span class="cx"> SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIConfigurationsWebInspectorUIFrameworkxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -16,26 +16,20 @@
</span><span class="cx"> GCC_PRECOMPILE_PREFIX_HEADER = YES;
</span><span class="cx"> GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(inherited) FRAMEWORK_NAME=WebInspectorUI;
</span><span class="cx">
</span><del>-NORMAL_PRODUCTION_FRAMEWORKS_DIR = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME));
-NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos);
-NORMAL_PRODUCTION_FRAMEWORKS_DIR_macosx = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
</del><ins>+NORMAL_PRODUCTION_FRAMEWORKS_DIR[sdk=iphone*] = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+NORMAL_PRODUCTION_FRAMEWORKS_DIR[sdk=macosx*] = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
</ins><span class="cx">
</span><del>-PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME));
-PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos);
-PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR_iphoneos);
-PRODUCTION_FRAMEWORKS_DIR_macosx = $(PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
</del><ins>+PRODUCTION_FRAMEWORKS_DIR[sdk=iphone*] = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR);
+PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
</ins><span class="cx"> PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
</span><del>-PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_macosx);
</del><ins>+PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR);
</ins><span class="cx"> PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
</span><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="cx"> JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Debug = $(JAVASCRIPTCORE_PRIVATE_HEADERS_engineering);
</span><del>-JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Production = $(JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Production_$(PLATFORM_NAME));
-JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Production_iphoneos = $(SDKROOT)/$(SYSTEM_LIBRARY_DIR)/Frameworks/JavaScriptCore.framework/PrivateHeaders;
-JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Production_iphonesimulator = $(JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Production_iphoneos);
-JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Production_macosx = $(SDKROOT)$(PRODUCTION_FRAMEWORKS_DIR)/JavaScriptCore.framework/PrivateHeaders;
</del><ins>+JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Production[sdk=iphone*] = $(SDKROOT)/$(SYSTEM_LIBRARY_DIR)/Frameworks/JavaScriptCore.framework/PrivateHeaders;
+JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Production[sdk=macosx*] = $(SDKROOT)$(PRODUCTION_FRAMEWORKS_DIR)/JavaScriptCore.framework/PrivateHeaders;
</ins><span class="cx"> JAVASCRIPTCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/JavaScriptCore.framework/PrivateHeaders;
</span><span class="cx">
</span><span class="cx"> COMBINE_INSPECTOR_RESOURCES = $(COMBINE_INSPECTOR_RESOURCES_$(CONFIGURATION));
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2014-12-19 David Kilzer <ddkilzer@apple.com>
+
+ Switch from using PLATFORM_NAME to SDK selectors in WebCore, WebInspectorUI, WebKit, WebKit2
+ <http://webkit.org/b/139463>
+
+ Reviewed by Mark Rowe.
+
+ * Configurations/Base.xcconfig:
+ - Only set GCC_ENABLE_OBJC_GC, GCC_MODEL_TUNING and TOOLCHAINS
+ on OS X.
+ - Set GCC_OPTIMIZATION_LEVEL_normal based on SDK.
+ * Configurations/DebugRelease.xcconfig:
+ - Only set MACOSX_DEPLOYMENT_TARGET and SDKROOT on OS X.
+ - Set WEBKIT_SYSTEM_INTERFACE_LIBRARY based on SDK.
+ * Configurations/Version.xcconfig:
+ - Set SYSTEM_VERSION_PREFIX separately for iOS and OS X.
+ * Configurations/WebKitLegacy.xcconfig:
+ - Set EXCLUDED_SOURCE_FILE_NAMES, EXPORTED_SYMBOLS_FILE_x86_64,
+ FRAMEWORK_SEARCH_PATHS, OTHER_CFLAGS, INSTALL_PATH,
+ DYLIB_INSTALL_NAME_BASE, OTHER_LDFLAGS, SECTORDER_FLAGS,
+ NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR,
+ WEBKIT_LEGACY_FRAMEWORKS_DIR, NORMAL_PRODUCTION_FRAMEWORKS_DIR,
+ PRODUCTION_FRAMEWORKS_DIR, PRODUCTION_ROOT,
+ WEBCORE_PRIVATE_HEADERS_DIR_Production and
+ WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering
+ based on SDK.
+ - Fix PRODUCTION_ROOT to actually be set properly.
+ - Simplify EXPORTED_SYMBOLS_FILE_i386.
+
+ * migrate-headers.sh:
+ - Get rid of unused WEBKIT2_FRAMEWORKS_DIR variable.
+ - Change WEBCORE_PRIVATE_HEADERS_DIR_macosx_Production to
+ WEBCORE_PRIVATE_HEADERS_DIR_Production based on changes to
+ WebKitLegacy.xcconfig.
+
</ins><span class="cx"> 2014-12-18 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Ref-ify various Document-related things.
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/Base.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/Base.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit/mac/Configurations/Base.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -47,17 +47,13 @@
</span><span class="cx"> GCC_ENABLE_CPP_EXCEPTIONS = NO;
</span><span class="cx"> GCC_ENABLE_CPP_RTTI = NO;
</span><span class="cx"> GCC_ENABLE_OBJC_EXCEPTIONS = YES;
</span><del>-GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME));
-GCC_ENABLE_OBJC_GC_iphoneos = NO;
-GCC_ENABLE_OBJC_GC_iphonesimulator = NO;
-GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(USE_INTERNAL_SDK));
</del><ins>+GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
</ins><span class="cx"> GCC_ENABLE_OBJC_GC_macosx_ = NO;
</span><span class="cx"> GCC_ENABLE_OBJC_GC_macosx_YES = supported;
</span><span class="cx"> GCC_ENABLE_SYMBOL_SEPARATION = NO;
</span><span class="cx"> GCC_FAST_OBJC_DISPATCH = YES;
</span><span class="cx"> GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
</span><del>-GCC_MODEL_TUNING = $(GCC_MODEL_TUNING_$(PLATFORM_NAME));
-GCC_MODEL_TUNING_macosx = G5;
</del><ins>+GCC_MODEL_TUNING[sdk=macosx*] = G5;
</ins><span class="cx"> GCC_OBJC_CALL_CXX_CDTORS = YES;
</span><span class="cx"> GCC_PRECOMPILE_PREFIX_HEADER = YES;
</span><span class="cx"> GCC_THREADSAFE_STATICS = NO;
</span><span class="lines">@@ -90,10 +86,8 @@
</span><span class="cx"> DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
</span><span class="cx">
</span><span class="cx"> GCC_OPTIMIZATION_LEVEL = $(GCC_OPTIMIZATION_LEVEL_$(CURRENT_VARIANT));
</span><del>-GCC_OPTIMIZATION_LEVEL_normal = $(GCC_OPTIMIZATION_LEVEL_normal_$(PLATFORM_NAME));
-GCC_OPTIMIZATION_LEVEL_normal_iphoneos = 3;
-GCC_OPTIMIZATION_LEVEL_normal_iphonesimulator = 3;
-GCC_OPTIMIZATION_LEVEL_normal_macosx = 2;
</del><ins>+GCC_OPTIMIZATION_LEVEL_normal[sdk=iphone*] = 3;
+GCC_OPTIMIZATION_LEVEL_normal[sdk=macosx*] = 2;
</ins><span class="cx"> GCC_OPTIMIZATION_LEVEL_debug = 0;
</span><span class="cx">
</span><span class="cx"> STRIP_INSTALLED_PRODUCT = $(STRIP_INSTALLED_PRODUCT_$(CURRENT_VARIANT));
</span><span class="lines">@@ -108,10 +102,8 @@
</span><span class="cx">
</span><span class="cx"> SUPPORTED_PLATFORMS = iphonesimulator iphoneos macosx;
</span><span class="cx">
</span><del>-TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME));
-TOOLCHAINS_iphoneos = $(TOOLCHAINS);
-TOOLCHAINS_iphonesimulator = $(TOOLCHAINS);
-TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
</del><ins>+TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
+TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
</ins><span class="cx"> TOOLCHAINS_macosx_1080 = default;
</span><span class="cx"> TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
</span><span class="cx"> TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -27,10 +27,7 @@
</span><span class="cx">
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><del>-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME));
-MACOSX_DEPLOYMENT_TARGET_iphoneos = 10.8;
-MACOSX_DEPLOYMENT_TARGET_iphonesimulator = 10.8;
-MACOSX_DEPLOYMENT_TARGET_macosx = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</del><ins>+MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</ins><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_1080 = 10.8;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
</span><span class="lines">@@ -39,10 +36,9 @@
</span><span class="cx"> GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
</span><span class="cx"> DEBUG_INFORMATION_FORMAT = dwarf;
</span><span class="cx">
</span><del>-WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(PLATFORM_NAME));
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos = WebKitSystemInterfaceIOSDevice$(IPHONEOS_DEPLOYMENT_TARGET);
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphonesimulator = WebKitSystemInterfaceIOSSimulator$(IPHONEOS_DEPLOYMENT_TARGET);
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</del><ins>+WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphoneos*] = WebKitSystemInterfaceIOSDevice$(IPHONEOS_DEPLOYMENT_TARGET);
+WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphonesimulator*] = WebKitSystemInterfaceIOSSimulator$(IPHONEOS_DEPLOYMENT_TARGET);
+WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</ins><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1080 = WebKitSystemInterfaceMountainLion;
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceMavericks;
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
</span><span class="lines">@@ -52,9 +48,7 @@
</span><span class="cx"> OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
</span><span class="cx"> OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
</span><span class="cx">
</span><del>-SDKROOT = $(SDKROOT_$(PLATFORM_NAME));
-SDKROOT_iphoneos = $(SDKROOT);
-SDKROOT_iphonesimulator = $(SDKROOT);
-SDKROOT_macosx = $(SDKROOT_macosx_$(USE_INTERNAL_SDK));
</del><ins>+SDKROOT[sdk=iphone*] = $(SDKROOT);
+SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
</ins><span class="cx"> SDKROOT_macosx_ = macosx;
</span><span class="cx"> SDKROOT_macosx_YES = macosx.internal;
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsVersionxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/Version.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/Version.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit/mac/Configurations/Version.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -33,10 +33,8 @@
</span><span class="cx"> SHORT_VERSION_STRING = $(SHORT_VERSION_STRING_$(CONFIGURATION))
</span><span class="cx">
</span><span class="cx"> // The system version prefix is based on the current system version.
</span><del>-SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME));
-SYSTEM_VERSION_PREFIX_iphoneos = 8;
-SYSTEM_VERSION_PREFIX_iphonesimulator = $(SYSTEM_VERSION_PREFIX_iphoneos);
-SYSTEM_VERSION_PREFIX_macosx = $(SYSTEM_VERSION_PREFIX_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</del><ins>+SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
+SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</ins><span class="cx"> SYSTEM_VERSION_PREFIX_macosx_1080 = 8;
</span><span class="cx"> SYSTEM_VERSION_PREFIX_macosx_1090 = 9;
</span><span class="cx"> SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsWebKitLegacyxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -24,10 +24,8 @@
</span><span class="cx"> #include "FeatureDefines.xcconfig"
</span><span class="cx"> #include "Version.xcconfig"
</span><span class="cx">
</span><del>-EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.nib *.pdf *.tiff CarbonUtils.m CarbonWindowAdapter.mm CarbonWindowContentView.m CarbonWindowFrame.m HIViewAdapter.m HIWebView.mm OutlookQuirksUserScript.js PopupMenuMac.mm SearchPopupMenuMac.mm WebActionMenuController.* WebClipView.* WebDashboardRegion.* WebDynamicScrollBarsView.* WebIconDatabase.* WebIconDatabasePrivate.* WebInspectorClient.mm WebJavaScriptTextInputPanel.* WebKeyGenerator.* WebNetscapeContainerCheckContextInfo.* WebNetscapeContainerCheckPrivate.* WebNSEventExtras.* WebNSPasteboardExtras.* WebNSWindowExtras.* WebPanelAuthenticationHandler.* WebPluginsPrivate.* WebStringTruncator.* WebTextCompletionController.*;
-EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
-EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.mm MemoryMeasure.h WebCaretChangeListener.h WebFixedPositionContent.h WebFrameIOS.h WebFrameIPhone.h WebGeolocationCoreLocationProvider.h WebGeolocationPrivate.h WebGeolocationProviderIOS.h WebMIMETypeRegistry.h WebNSStringExtrasIOS.h WebNSStringExtrasIPhone.h WebPDFViewIOS.h WebPDFViewIPhone.h WebPDFViewPlaceholder.h WebSelectionRect.h WebUIKitDelegate.h WebUIKitSupport.h WebVisiblePosition.h;
</del><ins>+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.nib *.pdf *.tiff CarbonUtils.m CarbonWindowAdapter.mm CarbonWindowContentView.m CarbonWindowFrame.m HIViewAdapter.m HIWebView.mm OutlookQuirksUserScript.js PopupMenuMac.mm SearchPopupMenuMac.mm WebActionMenuController.* WebClipView.* WebDashboardRegion.* WebDynamicScrollBarsView.* WebIconDatabase.* WebIconDatabasePrivate.* WebInspectorClient.mm WebJavaScriptTextInputPanel.* WebKeyGenerator.* WebNetscapeContainerCheckContextInfo.* WebNetscapeContainerCheckPrivate.* WebNSEventExtras.* WebNSPasteboardExtras.* WebNSWindowExtras.* WebPanelAuthenticationHandler.* WebPluginsPrivate.* WebStringTruncator.* WebTextCompletionController.*;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = *IOS.mm MemoryMeasure.h WebCaretChangeListener.h WebFixedPositionContent.h WebFrameIOS.h WebFrameIPhone.h WebGeolocationCoreLocationProvider.h WebGeolocationPrivate.h WebGeolocationProviderIOS.h WebMIMETypeRegistry.h WebNSStringExtrasIOS.h WebNSStringExtrasIPhone.h WebPDFViewIOS.h WebPDFViewIPhone.h WebPDFViewPlaceholder.h WebSelectionRect.h WebUIKitDelegate.h WebUIKitSupport.h WebVisiblePosition.h;
</ins><span class="cx">
</span><span class="cx"> EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
</span><span class="cx"> EXPORTED_SYMBOLS_FILE_ = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
</span><span class="lines">@@ -35,26 +33,18 @@
</span><span class="cx"> EXPORTED_SYMBOLS_FILE_armv7k = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
</span><span class="cx"> EXPORTED_SYMBOLS_FILE_armv7s = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
</span><span class="cx"> EXPORTED_SYMBOLS_FILE_arm64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
</span><del>-EXPORTED_SYMBOLS_FILE_i386 = $(EXPORTED_SYMBOLS_FILE_i386_$(PLATFORM_NAME));
-EXPORTED_SYMBOLS_FILE_i386_iphonesimulator = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
-EXPORTED_SYMBOLS_FILE_i386_macosx = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
-EXPORTED_SYMBOLS_FILE_x86_64 = $(EXPORTED_SYMBOLS_FILE_x86_64_$(PLATFORM_NAME));
-EXPORTED_SYMBOLS_FILE_x86_64_iphonesimulator = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
-EXPORTED_SYMBOLS_FILE_x86_64_macosx = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.LP64.exp;
</del><ins>+EXPORTED_SYMBOLS_FILE_i386 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
+EXPORTED_SYMBOLS_FILE_x86_64[sdk=iphonesimulator*] = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.generated.exp;
+EXPORTED_SYMBOLS_FILE_x86_64[sdk=macosx*] = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebKitLegacy.LP64.exp;
</ins><span class="cx">
</span><del>-FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_$(PLATFORM_NAME));
-FRAMEWORK_SEARCH_PATHS_iphoneos = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION));
-FRAMEWORK_SEARCH_PATHS_iphoneos_Debug = $(BUILT_PRODUCTS_DIR) $(PRODUCTION_FRAMEWORKS_DIR);
-FRAMEWORK_SEARCH_PATHS_iphoneos_Release = $(FRAMEWORK_SEARCH_PATHS_iphoneos_Debug);
-FRAMEWORK_SEARCH_PATHS_iphoneos_Production = $(PRODUCTION_FRAMEWORKS_DIR);
-FRAMEWORK_SEARCH_PATHS_iphonesimulator = $(FRAMEWORK_SEARCH_PATHS_iphoneos_$(CONFIGURATION));
-FRAMEWORK_SEARCH_PATHS_macosx = $(STAGED_FRAMEWORKS_SEARCH_PATH) $(UMBRELLA_FRAMEWORKS_DIR) $(FRAMEWORK_SEARCH_PATHS);
</del><ins>+FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(BUILT_PRODUCTS_DIR) $(PRODUCTION_FRAMEWORKS_DIR);
+FRAMEWORK_SEARCH_PATHS[sdk=iphone*][config=Production] = $(PRODUCTION_FRAMEWORKS_DIR);
+FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(STAGED_FRAMEWORKS_SEARCH_PATH) $(UMBRELLA_FRAMEWORKS_DIR) $(FRAMEWORK_SEARCH_PATHS);
</ins><span class="cx">
</span><span class="cx"> STAGED_FRAMEWORKS_SEARCH_PATH = $(STAGED_FRAMEWORKS_SEARCH_PATH_$(USE_STAGING_INSTALL_PATH));
</span><span class="cx"> STAGED_FRAMEWORKS_SEARCH_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
</span><span class="cx">
</span><del>-OTHER_CFLAGS = $(OTHER_CFLAGS_$(PLATFORM_NAME));
-OTHER_CFLAGS_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;
</del><ins>+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;
</ins><span class="cx"> OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
</span><span class="cx">
</span><span class="cx"> WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING = $(WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span class="lines">@@ -65,72 +55,53 @@
</span><span class="cx"> GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKitLegacy WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST $(GCC_PREPROCESSOR_DEFINITIONS);
</span><span class="cx"> 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);
</span><span class="cx"> INFOPLIST_FILE = mac/Info.plist;
</span><del>-INSTALL_PATH = $(INSTALL_PATH_$(PLATFORM_NAME));
-INSTALL_PATH_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-INSTALL_PATH_iphonesimulator = $(INDIGO_INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
-INSTALL_PATH_macosx = $(WEBKIT_LEGACY_FRAMEWORKS_DIR);
-INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(PLATFORM_NAME));
-INSTALL_PATH_ACTUAL_iphonesimulator = $(INSTALL_PATH_iphoneos);
</del><ins>+INSTALL_PATH[sdk=iphoneos*] = $(INSTALL_PATH_ios);
+INSTALL_PATH[sdk=macosx*] = $(WEBKIT_LEGACY_FRAMEWORKS_DIR);
+INSTALL_PATH_ACTUAL[sdk=iphonesimulator*] = $(INSTALL_PATH_ios);
+INSTALL_PATH_ios = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</ins><span class="cx">
</span><del>-DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(PLATFORM_NAME));
-DYLIB_INSTALL_NAME_BASE_macosx = $(DYLIB_INSTALL_NAME_BASE_macosx_WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING_$(WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING));
</del><ins>+DYLIB_INSTALL_NAME_BASE[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(PLATFORM_NAME)_WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING_$(WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING));
</ins><span class="cx"> DYLIB_INSTALL_NAME_BASE_macosx_WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING_ = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR);
</span><span class="cx"> DYLIB_INSTALL_NAME_BASE_macosx_WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING_YES = $(WEBKIT_LEGACY_FRAMEWORKS_DIR);
</span><del>-DYLIB_INSTALL_NAME_BASE_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-DYLIB_INSTALL_NAME_BASE_iphonesimulator = $(DYLIB_INSTALL_NAME_BASE_iphoneos);
</del><span class="cx">
</span><span class="cx"> INSTALLHDRS_COPY_PHASE = YES;
</span><span class="cx"> INSTALLHDRS_SCRIPT_PHASE = YES;
</span><span class="cx"> PRODUCT_NAME = WebKitLegacy;
</span><span class="cx"> UMBRELLA_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
</span><span class="cx">
</span><del>-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
-OTHER_LDFLAGS_iphoneos = -lobjc -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework OpenGLES -lMobileGestalt;
-OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
-OTHER_LDFLAGS_macosx = -framework Carbon -framework Cocoa -framework DiskArbitration -framework IOKit -framework OpenGL;
</del><ins>+OTHER_LDFLAGS[sdk=iphone*] = $(inherited) -lobjc -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework OpenGLES -lMobileGestalt;
+OTHER_LDFLAGS[sdk=macosx*] = $(inherited) -framework Carbon -framework Cocoa -framework DiskArbitration -framework IOKit -framework OpenGL;
</ins><span class="cx">
</span><del>-SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(CONFIGURATION)_$(PLATFORM_NAME));
-SECTORDER_FLAGS_Production_iphoneos = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebKitLegacy.order;
-SECTORDER_FLAGS_Production_macosx = -Wl,-order_file,mac/WebKit.order;
</del><ins>+SECTORDER_FLAGS[sdk=iphoneos*][config=Production] = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebKitLegacy.order;
+SECTORDER_FLAGS[sdk=macosx*][config=Production] = -Wl,-order_file,mac/WebKit.order;
</ins><span class="cx">
</span><del>-NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_$(PLATFORM_NAME));
-NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR);
-NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR);
-NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
</del><ins>+NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR[sdk=iphone*] = $(PRODUCTION_FRAMEWORKS_DIR);
+NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR[sdk=macosx*] = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
</ins><span class="cx">
</span><del>-WEBKIT_LEGACY_FRAMEWORKS_DIR = $(WEBKIT_LEGACY_FRAMEWORKS_DIR_$(PLATFORM_NAME));
-WEBKIT_LEGACY_FRAMEWORKS_DIR_iphoneos = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR_iphoneos);
-WEBKIT_LEGACY_FRAMEWORKS_DIR_iphonesimulator = $(WEBKIT_LEGACY_FRAMEWORKS_DIR_iphoneos);
-WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx = $(WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
</del><ins>+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));
</ins><span class="cx"> WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
</span><span class="cx"> WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR);
</span><span class="cx"> WEBKIT_LEGACY_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
</span><span class="cx">
</span><del>-NORMAL_PRODUCTION_FRAMEWORKS_DIR = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME));
-NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos);
-NORMAL_PRODUCTION_FRAMEWORKS_DIR_macosx = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
</del><ins>+NORMAL_PRODUCTION_FRAMEWORKS_DIR[sdk=iphone*] = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+NORMAL_PRODUCTION_FRAMEWORKS_DIR[sdk=macosx*] = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
</ins><span class="cx">
</span><del>-PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME));
-PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos);
-PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR_iphoneos);
-PRODUCTION_FRAMEWORKS_DIR_macosx = $(PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
</del><ins>+PRODUCTION_FRAMEWORKS_DIR[sdk=iphone*] = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR);
+PRODUCTION_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
</ins><span class="cx"> PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
</span><del>-PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_macosx);
</del><ins>+PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR);
</ins><span class="cx"> PRODUCTION_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
</span><span class="cx">
</span><del>-PRODUCTION_ROOT = $(PRODUCTION_ROOT_$(REAL_PLATORM_NAME));
-PRODUCTION_ROOT_iphoneos = $(SDKROOT);
-PRODUCTION_ROOT_iphonesimulator = $(SDKROOT);
-PRODUCTION_ROOT_macosx = $(NEXT_ROOT);
</del><ins>+PRODUCTION_ROOT[sdk=iphone*] = $(SDKROOT);
+PRODUCTION_ROOT[sdk=macosx*] = $(NEXT_ROOT);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_PRIVATE_HEADERS_DIR = $(WEBCORE_PRIVATE_HEADERS_DIR_$(CONFIGURATION));
</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><del>-WEBCORE_PRIVATE_HEADERS_DIR_Production = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_$(PLATFORM_NAME));
-WEBCORE_PRIVATE_HEADERS_DIR_Production_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
-WEBCORE_PRIVATE_HEADERS_DIR_Production_iphonesimulator = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_iphoneos);
-WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx = $(SDKROOT)$(WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
</del><ins>+WEBCORE_PRIVATE_HEADERS_DIR_Production[sdk=iphone*] = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
+WEBCORE_PRIVATE_HEADERS_DIR_Production = $(SDKROOT)$(WEBCORE_PRIVATE_HEADERS_DIR_Production_$(PLATFORM_NAME)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
</ins><span class="cx"> WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_NO);
</span><span class="cx"> WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_NO = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
</span><span class="cx"> WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_YES = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
</span><span class="lines">@@ -140,8 +111,5 @@
</span><span class="cx"> WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Debug = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);
</span><span class="cx"> WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Release = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering);
</span><span class="cx"> WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_Production = $(PRODUCTION_ROOT)/usr/local/include;
</span><del>-WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_$(PLATFORM_NAME));
-WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_iphoneos = $(BUILT_PRODUCTS_DIR)/usr/local/include;
-WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_iphonesimulator = $(BUILT_PRODUCTS_DIR)$(PRODUCTION_ROOT_iphonesimulator)/usr/local/include;
-WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering_macosx = $(BUILT_PRODUCTS_DIR)/usr/local/include;
-
</del><ins>+WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering[sdk=iphonesimulator*] = $(BUILT_PRODUCTS_DIR)$(PRODUCTION_ROOT)/usr/local/include;
+WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH_engineering = $(BUILT_PRODUCTS_DIR)/usr/local/include;
</ins></span></pre></div>
<a id="trunkSourceWebKitmacmigrateheaderssh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/migrate-headers.sh (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/migrate-headers.sh 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit/mac/migrate-headers.sh 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -29,14 +29,9 @@
</span><span class="cx">
</span><span class="cx"> # If we didn't build WebCore, use the production copy of the headers
</span><span class="cx"> if [ ! -d "${WEBCORE_PRIVATE_HEADERS_DIR}" ]; then
</span><del>- export WEBCORE_PRIVATE_HEADERS_DIR="`eval 'echo ${WEBCORE_PRIVATE_HEADERS_DIR_'${PLATFORM_NAME}'_Production}'`"
</del><ins>+ export WEBCORE_PRIVATE_HEADERS_DIR="`eval 'echo ${WEBCORE_PRIVATE_HEADERS_DIR_Production}'`"
</ins><span class="cx"> fi
</span><span class="cx">
</span><del>-# If we didn't build WebKit2, use the production copy of the headers
-if [ ! -d "${WEBKIT2_FRAMEWORKS_DIR}/WebKit2.framework" ]; then
- export WEBKIT2_FRAMEWORKS_DIR="`eval 'echo ${WEBKIT2_FRAMEWORKS_DIR_Production}'/WebKit2.framework`"
-fi
-
</del><span class="cx"> if [ "${ACTION}" = "build" -o "${ACTION}" = "install" -o "${ACTION}" = "installhdrs" ]; then
</span><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 (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -1,3 +1,74 @@
</span><ins>+2014-12-19 David Kilzer <ddkilzer@apple.com>
+
+ Switch from using PLATFORM_NAME to SDK selectors in WebCore, WebInspectorUI, WebKit, WebKit2
+ <http://webkit.org/b/139463>
+
+ Reviewed by Mark Rowe.
+
+ * Configurations/All.xcconfig:
+ - Only set EXCLUDED_SOURCE_FILE_NAMES on iOS.
+ * Configurations/Base.xcconfig:
+ - Only set FRAMEWORK_CONTENT_DIRECTORY, GCC_ENABLE_OBJC_GC and
+ TOOLCHAINS on OS X.
+ * Configurations/BaseLegacyProcess.xcconfig:
+ - Only set SKIP_INSTALL on iOS.
+ * Configurations/BaseTarget.xcconfig:
+ - Set WEBKIT_FRAMEWORKS_DIR and UMBRELLA_FRAMEWORKS_DIR based on
+ SDK, and simply them.
+ * Configurations/BaseXPCService.xcconfig:
+ - Set INSTALL_PATH_ACTUAL_Normal based on SDK.
+ * Configurations/DebugRelease.xcconfig:
+ - Only set MACOSX_DEPLOYMENT_TARGET and SDKROOT on OS X.
+ - Set WEBKIT_SYSTEM_INTERFACE_LIBRARY based on SDK.
+ * Configurations/NetworkProcess.xcconfig:
+ - Only set EXCLUDED_SHIM_FILE_NAME and CODE_SIGN_ENTITLEMENTS on
+ iOS.
+ * Configurations/NetworkService.Development.xcconfig:
+ - Set INFOPLIST_FILE based on SDK.
+ - Simplify CODE_SIGN_ENTITLEMENTS for iOS.
+ * Configurations/NetworkService.xcconfig:
+ - Set INFOPLIST_FILE based on SDK.
+ - Simplify CODE_SIGN_ENTITLEMENTS for iOS.
+ * Configurations/PluginProcess.xcconfig:
+ - Only set EXCLUDED_SHIM_FILE_NAME and SKIP_INSTALL on iOS.
+ * Configurations/PluginProcessShim.xcconfig:
+ - Set OTHER_LDFLAGS based on SDK.
+ * Configurations/PluginService.32.xcconfig:
+ - Only set VALID_ARCHS on OS X.
+ - Set OTHER_LDFLAGS based on platform-specific values.
+ - Only set SKIP_INSTALL on iOS.
+ * Configurations/PluginService.64.xcconfig:
+ - Set ARCHS based on SDK.
+ - Set OTHER_LDFLAGS based on platform-specific values.
+ - Only set SKIP_INSTALL on iOS.
+ * Configurations/PluginService.Development.xcconfig:
+ - Only set SKIP_INSTALL on iOS.
+ - Set OTHER_LDFLAGS based on platform-specific values.
+ * Configurations/SecItemShim.xcconfig:
+ - Set OTHER_LDFLAGS based on platform-specific values.
+ * Configurations/Version.xcconfig:
+ - Set SYSTEM_VERSION_PREFIX separately for iOS and OS X.
+ * Configurations/WebContentProcess.xcconfig:
+ - Only set EXCLUDED_SHIM_FILE_NAME on iOS.
+ - Only set CODE_SIGN_ENTITLEMENTS on iOS Simulator.
+ * Configurations/WebContentService.Development.xcconfig:
+ - Set INFOPLIST_FILE and BUNDLE_LOCALIZATION_KEY based on SDK.
+ - Only set CODE_SIGN_ENTITLEMENTS on iOS hardware.
+ - Set OTHER_LDFLAGS based on platform-specific values.
+ * Configurations/WebContentService.xcconfig: Ditto.
+ * Configurations/WebKit.xcconfig:
+ - Set FRAMEWORK_AND_LIBRARY_LDFLAGS, SECTORDER_FLAGS, and
+ WK_API_AVAILABILITY_ENABLED based on SDK.
+ - Set OTHER_LDFLAGS based on platform-specific values.
+ - Only set EXCLUDED_SOURCE_FILE_NAMES on iOS.
+ * Configurations/WebKit2.xcconfig:
+ - Set INSTALL_PATH, INSTALL_PATH_ACTUAL, DYLIB_INSTALL_NAME_BASE,
+ NORMAL_WEBKIT2_FRAMEWORKS_DIR, WEBKIT2_FRAMEWORKS_DIR and
+ NORMAL_PRODUCTION_FRAMEWORKS_DIR based on SDK.
+ - Set SKIP_INSTALL on iOS.
+ * Configurations/WebProcessShim.xcconfig:
+ - Set OTHER_LDFLAGS based on platform-specific values.
+
</ins><span class="cx"> 2014-12-18 Jon Honeycutt <jhoneycutt@apple.com>
</span><span class="cx">
</span><span class="cx"> iOS build fix.
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsAllxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/All.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/All.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit2/Configurations/All.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -25,8 +25,6 @@
</span><span class="cx">
</span><span class="cx"> #include "BaseTarget.xcconfig"
</span><span class="cx">
</span><del>-EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = DatabaseProcess.app NetworkProcess.app PluginProcess.app WebProcess.app;
-EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
</del><ins>+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = DatabaseProcess.app NetworkProcess.app PluginProcess.app WebProcess.app;
</ins><span class="cx">
</span><span class="cx"> SKIP_INSTALL = YES;
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/Base.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/Base.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit2/Configurations/Base.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -47,10 +47,7 @@
</span><span class="cx"> GCC_ENABLE_CPP_EXCEPTIONS = NO;
</span><span class="cx"> GCC_ENABLE_CPP_RTTI = NO;
</span><span class="cx"> GCC_ENABLE_OBJC_EXCEPTIONS = YES;
</span><del>-GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME));
-GCC_ENABLE_OBJC_GC_iphoneos = NO;
-GCC_ENABLE_OBJC_GC_iphonesimulator = NO;
-GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(USE_INTERNAL_SDK));
</del><ins>+GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
</ins><span class="cx"> GCC_ENABLE_OBJC_GC_macosx_ = NO;
</span><span class="cx"> GCC_ENABLE_OBJC_GC_macosx_YES = supported;
</span><span class="cx"> GCC_ENABLE_SYMBOL_SEPARATION = NO;
</span><span class="lines">@@ -108,10 +105,8 @@
</span><span class="cx">
</span><span class="cx"> CODE_SIGN_IDENTITY = -;
</span><span class="cx">
</span><del>-TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME));
-TOOLCHAINS_iphoneos = $(TOOLCHAINS);
-TOOLCHAINS_iphonesimulator = $(TOOLCHAINS);
-TOOLCHAINS_macosx = $(TOOLCHAINS_macosx_$(MAC_OS_X_VERSION_MAJOR));
</del><ins>+TOOLCHAINS[sdk=iphone*] = $(TOOLCHAINS);
+TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
</ins><span class="cx"> TOOLCHAINS_macosx_1080 = default;
</span><span class="cx"> TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
</span><span class="cx"> TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
</span><span class="lines">@@ -119,7 +114,4 @@
</span><span class="cx">
</span><span class="cx"> SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator;
</span><span class="cx">
</span><del>-FRAMEWORK_CONTENT_DIRECTORY = $(FRAMEWORK_CONTENT_DIRECTORY_$(PLATFORM_NAME));
-FRAMEWORK_CONTENT_DIRECTORY_macosx = Versions/A;
-FRAMEWORK_CONTENT_DIRECTORY_iphoneos = ;
-FRAMEWORK_CONTENT_DIRECTORY_iphonesimulator = $(FRAMEWORK_CONTENT_DIRECTORY_iphoneos);
</del><ins>+FRAMEWORK_CONTENT_DIRECTORY[sdk=macosx*] = Versions/A;
</ins></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsBaseLegacyProcessxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/BaseLegacyProcess.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/BaseLegacyProcess.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit2/Configurations/BaseLegacyProcess.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -36,7 +36,4 @@
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES_Debug = $(EXCLUDED_SHIM_FILE_NAME);
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES_Release = $(EXCLUDED_SHIM_FILE_NAME);
</span><span class="cx">
</span><del>-SKIP_INSTALL = $(SKIP_INSTALL_$(PLATFORM_NAME));
-SKIP_INSTALL_macosx = $(SKIP_INSTALL);
-SKIP_INSTALL_iphoneos = YES;
-SKIP_INSTALL_iphonesimulator = $(SKIP_INSTALL_iphoneos);
</del><ins>+SKIP_INSTALL[sdk=iphone*] = YES;
</ins></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsBaseTargetxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit2/Configurations/BaseTarget.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -34,27 +34,20 @@
</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 = $(WEBKIT_FRAMEWORKS_DIR_$(PLATFORM_NAME));
-WEBKIT_FRAMEWORKS_DIR_macosx = $(WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
</del><ins>+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));
</ins><span class="cx"> WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
</span><span class="cx"> WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
</span><span class="cx"> WEBKIT_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
</span><del>-WEBKIT_FRAMEWORKS_DIR_iphoneos = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
-WEBKIT_FRAMEWORKS_DIR_iphonesimulator = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
</del><span class="cx">
</span><del>-UMBRELLA_FRAMEWORKS_DIR = $(UMBRELLA_FRAMEWORKS_DIR_$(PLATFORM_NAME));
-UMBRELLA_FRAMEWORKS_DIR_iphoneos = $(UMBRELLA_FRAMEWORKS_DIR_iphoneos_$(CONFIGURATION));
-UMBRELLA_FRAMEWORKS_DIR_iphoneos_Release = $(UMBRELLA_FRAMEWORKS_DIR_engineering);
-UMBRELLA_FRAMEWORKS_DIR_iphoneos_Debug = $(UMBRELLA_FRAMEWORKS_DIR_engineering);
-UMBRELLA_FRAMEWORKS_DIR_iphoneos_Production = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-UMBRELLA_FRAMEWORKS_DIR_iphonesimulator = $(UMBRELLA_FRAMEWORKS_DIR_iphoneos);
-UMBRELLA_FRAMEWORKS_DIR_macosx = $(UMBRELLA_FRAMEWORKS_DIR_macosx_$(CONFIGURATION));
-UMBRELLA_FRAMEWORKS_DIR_macosx_Release = $(UMBRELLA_FRAMEWORKS_DIR_engineering);
-UMBRELLA_FRAMEWORKS_DIR_macosx_Debug = $(UMBRELLA_FRAMEWORKS_DIR_engineering);
-UMBRELLA_FRAMEWORKS_DIR_macosx_Production = $(SDKROOT)$(UMBRELLA_FRAMEWORKS_DIR_macosx_Production_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-UMBRELLA_FRAMEWORKS_DIR_macosx_Production_USE_STAGING_INSTALL_PATH_ = $(UMBRELLA_FRAMEWORKS_DIR_macosx_Production_USE_STAGING_INSTALL_PATH_NO);
-UMBRELLA_FRAMEWORKS_DIR_macosx_Production_USE_STAGING_INSTALL_PATH_NO = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
-UMBRELLA_FRAMEWORKS_DIR_macosx_Production_USE_STAGING_INSTALL_PATH_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
</del><ins>+UMBRELLA_FRAMEWORKS_DIR = $(UMBRELLA_FRAMEWORKS_DIR_$(CONFIGURATION));
+UMBRELLA_FRAMEWORKS_DIR_Debug = $(UMBRELLA_FRAMEWORKS_DIR_engineering);
+UMBRELLA_FRAMEWORKS_DIR_Release = $(UMBRELLA_FRAMEWORKS_DIR_engineering);
+UMBRELLA_FRAMEWORKS_DIR_Production[sdk=iphone*] = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+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;
</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></pre></div>
<a id="trunkSourceWebKit2ConfigurationsBaseXPCServicexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit2/Configurations/BaseXPCService.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -27,10 +27,8 @@
</span><span class="cx">
</span><span class="cx"> INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(WK_XPC_SERVICE_VARIANT));
</span><span class="cx">
</span><del>-INSTALL_PATH_ACTUAL_Normal = $(INSTALL_PATH_ACTUAL_Normal_$(PLATFORM_NAME));
-INSTALL_PATH_ACTUAL_Normal_macosx = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/XPCServices;
-INSTALL_PATH_ACTUAL_Normal_iphoneos = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/XPCServices;
-INSTALL_PATH_ACTUAL_Normal_iphonesimulator = $(INSTALL_PATH_ACTUAL_Normal_iphoneos);
</del><ins>+INSTALL_PATH_ACTUAL_Normal[sdk=iphone*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/XPCServices;
+INSTALL_PATH_ACTUAL_Normal[sdk=macosx*] = $(WEBKIT_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/XPCServices;
</ins><span class="cx">
</span><span class="cx"> INSTALL_PATH_ACTUAL_Development = $(APPLE_INTERNAL_DIR)/WebKit/XPCServicesForDevelopment;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -27,19 +27,18 @@
</span><span class="cx">
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><del>-MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR));
-MACOSX_DEPLOYMENT_TARGET_1080 = 10.8;
-MACOSX_DEPLOYMENT_TARGET_1090 = 10.9;
-MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
-MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
</del><ins>+MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
+MACOSX_DEPLOYMENT_TARGET_macosx_1080 = 10.8;
+MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
+MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
+MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
</ins><span class="cx">
</span><span class="cx"> GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
</span><span class="cx"> DEBUG_INFORMATION_FORMAT = dwarf;
</span><span class="cx">
</span><del>-WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(PLATFORM_NAME));
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphoneos = WebKitSystemInterfaceIOSDevice$(IPHONEOS_DEPLOYMENT_TARGET);
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_iphonesimulator = WebKitSystemInterfaceIOSSimulator$(IPHONEOS_DEPLOYMENT_TARGET);
-WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</del><ins>+WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphoneos*] = WebKitSystemInterfaceIOSDevice$(IPHONEOS_DEPLOYMENT_TARGET);
+WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphonesimulator*] = WebKitSystemInterfaceIOSSimulator$(IPHONEOS_DEPLOYMENT_TARGET);
+WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</ins><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1080 = WebKitSystemInterfaceMountainLion;
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceMavericks;
</span><span class="cx"> WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
</span><span class="lines">@@ -51,9 +50,7 @@
</span><span class="cx">
</span><span class="cx"> DEBUG_OR_RELEASE = YES;
</span><span class="cx">
</span><del>-SDKROOT = $(SDKROOT_$(PLATFORM_NAME));
-SDKROOT_iphoneos = $(SDKROOT);
-SDKROOT_iphonesimulator = $(SDKROOT);
-SDKROOT_macosx = $(SDKROOT_macosx_$(USE_INTERNAL_SDK));
</del><ins>+SDKROOT[sdk=iphone*] = $(SDKROOT);
+SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));
</ins><span class="cx"> SDKROOT_macosx_ = macosx;
</span><span class="cx"> SDKROOT_macosx_YES = macosx.internal;
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsNetworkProcessxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/NetworkProcess.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/NetworkProcess.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit2/Configurations/NetworkProcess.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -26,9 +26,6 @@
</span><span class="cx"> PRODUCT_NAME = NetworkProcess;
</span><span class="cx"> INFOPLIST_FILE = NetworkProcess/EntryPoint/mac/LegacyProcess/Info.plist;
</span><span class="cx">
</span><del>-EXCLUDED_SHIM_FILE_NAME = $(EXCLUDED_SHIM_FILE_NAME_$(PLATFORM_NAME));
-EXCLUDED_SHIM_FILE_NAME_iphoneos = SecItemShim.dylib;
-EXCLUDED_SHIM_FILE_NAME_iphonesimulator = $(EXCLUDED_SHIM_FILE_NAME_iphoneos);
</del><ins>+EXCLUDED_SHIM_FILE_NAME[sdk=iphone*] = SecItemShim.dylib;
</ins><span class="cx">
</span><del>-CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = Configurations/Network-iOS.entitlements
-CODE_SIGN_ENTITLEMENTS[sdk=iphonesimulator*] = Configurations/Network-iOS.entitlements
</del><ins>+CODE_SIGN_ENTITLEMENTS[sdk=iphone*] = Configurations/Network-iOS.entitlements;
</ins></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsNetworkServiceDevelopmentxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/NetworkService.Development.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/NetworkService.Development.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit2/Configurations/NetworkService.Development.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -26,10 +26,7 @@
</span><span class="cx"> WK_XPC_SERVICE_VARIANT = Development;
</span><span class="cx">
</span><span class="cx"> PRODUCT_NAME = com.apple.WebKit.Networking.Development;
</span><del>-INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME));
-INFOPLIST_FILE_macosx = NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/Info-OSX.plist;
-INFOPLIST_FILE_iphoneos = NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/Info-iOS.plist;
-INFOPLIST_FILE_iphonesimulator = $(INFOPLIST_FILE_iphoneos);
</del><ins>+INFOPLIST_FILE[sdk=iphone*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/Info-iOS.plist;
+INFOPLIST_FILE[sdk=macosx*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/Info-OSX.plist;
</ins><span class="cx">
</span><del>-CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = Configurations/Network-iOS.entitlements
-CODE_SIGN_ENTITLEMENTS[sdk=iphonesimulator*] = Configurations/Network-iOS.entitlements
</del><ins>+CODE_SIGN_ENTITLEMENTS[sdk=iphone*] = Configurations/Network-iOS.entitlements;
</ins></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsNetworkServicexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/NetworkService.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/NetworkService.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit2/Configurations/NetworkService.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -26,10 +26,7 @@
</span><span class="cx"> WK_XPC_SERVICE_VARIANT = Normal;
</span><span class="cx">
</span><span class="cx"> PRODUCT_NAME = com.apple.WebKit.Networking;
</span><del>-INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME));
-INFOPLIST_FILE_macosx = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist;
-INFOPLIST_FILE_iphoneos = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist;
-INFOPLIST_FILE_iphonesimulator = $(INFOPLIST_FILE_iphoneos);
</del><ins>+INFOPLIST_FILE[sdk=iphone*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist;
+INFOPLIST_FILE[sdk=macosx*] = NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist;
</ins><span class="cx">
</span><del>-CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = Configurations/Network-iOS.entitlements
-CODE_SIGN_ENTITLEMENTS[sdk=iphonesimulator*] = Configurations/Network-iOS.entitlements
</del><ins>+CODE_SIGN_ENTITLEMENTS[sdk=iphone*] = Configurations/Network-iOS.entitlements;
</ins></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsPluginProcessxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/PluginProcess.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/PluginProcess.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit2/Configurations/PluginProcess.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -27,11 +27,6 @@
</span><span class="cx"> INFOPLIST_FILE = PluginProcess/EntryPoint/mac/LegacyProcess/Info.plist;
</span><span class="cx"> CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
</span><span class="cx">
</span><del>-EXCLUDED_SHIM_FILE_NAME = $(EXCLUDED_SHIM_FILE_NAME_$(PLATFORM_NAME));
-EXCLUDED_SHIM_FILE_NAME_iphoneos = PluginProcessShim.dylib;
-EXCLUDED_SHIM_FILE_NAME_iphonesimulator = $(EXCLUDED_SHIM_FILE_NAME_iphoneos);
</del><ins>+EXCLUDED_SHIM_FILE_NAME[sdk=iphone*] = PluginProcessShim.dylib;
</ins><span class="cx">
</span><del>-SKIP_INSTALL = $(SKIP_INSTALL_$(PLATFORM_NAME));
-SKIP_INSTALL_macosx = $(inherited);
-SKIP_INSTALL_iphoneos = YES;
-SKIP_INSTALL_iphonesimulator = $(SKIP_INSTALL_iphoneos);
</del><ins>+SKIP_INSTALL[sdk=iphone*] = YES;
</ins></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsPluginProcessShimxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/PluginProcessShim.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/PluginProcessShim.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit2/Configurations/PluginProcessShim.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -25,5 +25,5 @@
</span><span class="cx">
</span><span class="cx"> #include "Shim.xcconfig"
</span><span class="cx">
</span><del>-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
-OTHER_LDFLAGS_macosx = -framework AppKit -framework Carbon -framework QuartzCore;
</del><ins>+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM);
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit -framework Carbon -framework QuartzCore;
</ins></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsPluginService32xcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit2/Configurations/PluginService.32.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -25,13 +25,8 @@
</span><span class="cx">
</span><span class="cx"> WK_XPC_SERVICE_VARIANT = Normal;
</span><span class="cx">
</span><del>-VALID_ARCHS = $(VALID_ARCHS_$(PLATFORM_NAME));
-VALID_ARCHS_macosx = $(VALID_ARCHS_macosx_$(CONFIGURATION));
-VALID_ARCHS_macosx_Debug = $(ARCHS_STANDARD_32_64_BIT);
-VALID_ARCHS_macosx_Release = $(VALID_ARCHS_macosx_Debug);
-VALID_ARCHS_macosx_Production = i386;
-VALID_ARCHS_iphoneos = $(VALID_ARCHS);
-VALID_ARCHS_iphonesimulator = $(VALID_ARCHS_iphoneos);
</del><ins>+VALID_ARCHS[sdk=macosx*] = $(ARCHS_STANDARD_32_64_BIT);
+VALID_ARCHS[sdk=macosx*][config=Production] = i386;
</ins><span class="cx">
</span><span class="cx"> PRODUCT_NAME = com.apple.WebKit.Plugin.32;
</span><span class="cx"> INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
</span><span class="lines">@@ -45,12 +40,9 @@
</span><span class="cx"> FRAMEWORK_LDFLAGS_NO = -framework WebKit2;
</span><span class="cx"> FRAMEWORK_LDFLAGS_YES = ;
</span><span class="cx">
</span><del>-OTHER_LDFLAGS = $(FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_$(PLATFORM_NAME)) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
-OTHER_LDFLAGS_macosx = -framework AppKit;
</del><ins>+OTHER_LDFLAGS = $(FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit;
</ins><span class="cx">
</span><span class="cx"> CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
</span><span class="cx">
</span><del>-SKIP_INSTALL = $(SKIP_INSTALL_$(PLATFORM_NAME));
-SKIP_INSTALL_macosx = $(inherited);
-SKIP_INSTALL_iphoneos = YES;
-SKIP_INSTALL_iphonesimulator = $(SKIP_INSTALL_iphoneos);
</del><ins>+SKIP_INSTALL[sdk=iphone*] = YES;
</ins></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsPluginService64xcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit2/Configurations/PluginService.64.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -25,10 +25,7 @@
</span><span class="cx">
</span><span class="cx"> WK_XPC_SERVICE_VARIANT = Normal;
</span><span class="cx">
</span><del>-ARCHS = $(ARCHS_$(PLATFORM_NAME));
-ARCHS_macosx = x86_64;
-ARCHS_iphoneos = $(ARCHS_STANDARD_32_64_BIT);
-ARCHS_iphonesimulator = $(ARCHS_iphoneos);
</del><ins>+ARCHS[sdk=macosx*] = x86_64;
</ins><span class="cx">
</span><span class="cx"> PRODUCT_NAME = com.apple.WebKit.Plugin.64;
</span><span class="cx"> INFOPLIST_FILE = PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist;
</span><span class="lines">@@ -42,12 +39,9 @@
</span><span class="cx"> FRAMEWORK_LDFLAGS_NO = -framework WebKit2;
</span><span class="cx"> FRAMEWORK_LDFLAGS_YES = ;
</span><span class="cx">
</span><del>-OTHER_LDFLAGS = $(FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_$(PLATFORM_NAME)) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
-OTHER_LDFLAGS_macosx = -framework AppKit;
</del><ins>+OTHER_LDFLAGS = $(FRAMEWORK_LDFLAGS) $(OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH);
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit;
</ins><span class="cx">
</span><span class="cx"> CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
</span><span class="cx">
</span><del>-SKIP_INSTALL = $(SKIP_INSTALL_$(PLATFORM_NAME));
-SKIP_INSTALL_macosx = $(inherited);
-SKIP_INSTALL_iphoneos = YES;
-SKIP_INSTALL_iphonesimulator = $(SKIP_INSTALL_iphoneos);
</del><ins>+SKIP_INSTALL[sdk=iphone*] = YES;
</ins></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsPluginServiceDevelopmentxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/PluginService.Development.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/PluginService.Development.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit2/Configurations/PluginService.Development.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -30,10 +30,7 @@
</span><span class="cx">
</span><span class="cx"> CODE_SIGN_ENTITLEMENTS = Configurations/PluginService.entitlements;
</span><span class="cx">
</span><del>-SKIP_INSTALL = $(SKIP_INSTALL_$(PLATFORM_NAME));
-SKIP_INSTALL_macosx = $(inherited);
-SKIP_INSTALL_iphoneos = YES;
-SKIP_INSTALL_iphonesimulator = $(SKIP_INSTALL_iphoneos);
</del><ins>+SKIP_INSTALL[sdk=iphone*] = YES;
</ins><span class="cx">
</span><del>-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
-OTHER_LDFLAGS_macosx = -framework AppKit;
</del><ins>+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_PLATFORM);
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit;
</ins></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsSecItemShimxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/SecItemShim.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/SecItemShim.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit2/Configurations/SecItemShim.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -25,5 +25,5 @@
</span><span class="cx">
</span><span class="cx"> #include "Shim.xcconfig"
</span><span class="cx">
</span><del>-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
-OTHER_LDFLAGS_macosx = -framework Security;
</del><ins>+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM);
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework Security;
</ins></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsVersionxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/Version.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/Version.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit2/Configurations/Version.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -33,10 +33,8 @@
</span><span class="cx"> SHORT_VERSION_STRING = $(SHORT_VERSION_STRING_$(CONFIGURATION))
</span><span class="cx">
</span><span class="cx"> // The system version prefix is based on the current system version.
</span><del>-SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME));
-SYSTEM_VERSION_PREFIX_iphoneos = 8;
-SYSTEM_VERSION_PREFIX_iphonesimulator = $(SYSTEM_VERSION_PREFIX_iphoneos);
-SYSTEM_VERSION_PREFIX_macosx = $(SYSTEM_VERSION_PREFIX_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</del><ins>+SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
+SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</ins><span class="cx"> SYSTEM_VERSION_PREFIX_macosx_1080 = 8;
</span><span class="cx"> SYSTEM_VERSION_PREFIX_macosx_1090 = 9;
</span><span class="cx"> SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsWebContentProcessxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/WebContentProcess.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/WebContentProcess.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit2/Configurations/WebContentProcess.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> PRODUCT_NAME = WebProcess;
</span><span class="cx"> INFOPLIST_FILE = WebProcess/EntryPoint/mac/LegacyProcess/Info.plist;
</span><span class="cx">
</span><del>-EXCLUDED_SHIM_FILE_NAME = $(EXCLUDED_SHIM_FILE_NAME_$(PLATFORM_NAME));
-EXCLUDED_SHIM_FILE_NAME_iphoneos = WebProcessShim.dylib;
-EXCLUDED_SHIM_FILE_NAME_iphonesimulator = $(EXCLUDED_SHIM_FILE_NAME_iphoneos);
</del><ins>+EXCLUDED_SHIM_FILE_NAME[sdk=iphone*] = WebProcessShim.dylib;
</ins><span class="cx">
</span><del>-CODE_SIGN_ENTITLEMENTS[sdk=iphonesimulator*] = Configurations/WebContent-iOS.entitlements
</del><ins>+CODE_SIGN_ENTITLEMENTS[sdk=iphonesimulator*] = Configurations/WebContent-iOS.entitlements;
</ins></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsWebContentServiceDevelopmentxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit2/Configurations/WebContentService.Development.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -26,21 +26,17 @@
</span><span class="cx"> WK_XPC_SERVICE_VARIANT = Development;
</span><span class="cx">
</span><span class="cx"> PRODUCT_NAME = com.apple.WebKit.WebContent.Development;
</span><del>-INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME));
-INFOPLIST_FILE_macosx = WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-OSX.plist;
-INFOPLIST_FILE_iphoneos = WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-iOS.plist;
-INFOPLIST_FILE_iphonesimulator = $(INFOPLIST_FILE_iphoneos);
</del><ins>+INFOPLIST_FILE[sdk=iphone*] = WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-iOS.plist;
+INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info-OSX.plist;
</ins><span class="cx">
</span><del>-BUNDLE_LOCALIZATION_KEY = $(BUNDLE_LOCALIZATION_KEY_$(PLATFORM_NAME));
-BUNDLE_LOCALIZATION_KEY_iphoneos = CFBundleFollowParentLocalization;
-BUNDLE_LOCALIZATION_KEY_iphonesimulator = CFBundleFollowParentLocalization;
-BUNDLE_LOCALIZATION_KEY_macosx = $(BUNDLE_LOCALIZATION_KEY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</del><ins>+BUNDLE_LOCALIZATION_KEY[sdk=iphone*] = CFBundleFollowParentLocalization;
+BUNDLE_LOCALIZATION_KEY = $(BUNDLE_LOCALIZATION_KEY_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</ins><span class="cx"> BUNDLE_LOCALIZATION_KEY_macosx_1080 = CFBundleAllowMixedLocalizations;
</span><span class="cx"> BUNDLE_LOCALIZATION_KEY_macosx_1090 = CFBundleAllowMixedLocalizations;
</span><span class="cx"> BUNDLE_LOCALIZATION_KEY_macosx_101000 = CFBundleFollowParentLocalization;
</span><span class="cx"> BUNDLE_LOCALIZATION_KEY_macosx_101100 = CFBundleFollowParentLocalization;
</span><span class="cx">
</span><del>-CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = Configurations/WebContent-iOS.entitlements
</del><ins>+CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = Configurations/WebContent-iOS.entitlements;
</ins><span class="cx">
</span><del>-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
-OTHER_LDFLAGS_macosx = -framework AppKit;
</del><ins>+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_PLATFORM);
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit;
</ins></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsWebContentServicexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/WebContentService.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/WebContentService.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit2/Configurations/WebContentService.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -26,21 +26,17 @@
</span><span class="cx"> WK_XPC_SERVICE_VARIANT = Normal;
</span><span class="cx">
</span><span class="cx"> PRODUCT_NAME = com.apple.WebKit.WebContent;
</span><del>-INFOPLIST_FILE = $(INFOPLIST_FILE_$(PLATFORM_NAME));
-INFOPLIST_FILE_macosx = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist;
-INFOPLIST_FILE_iphoneos = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist;
-INFOPLIST_FILE_iphonesimulator = $(INFOPLIST_FILE_iphoneos);
</del><ins>+INFOPLIST_FILE[sdk=iphone*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist;
+INFOPLIST_FILE[sdk=macosx*] = WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist;
</ins><span class="cx">
</span><del>-BUNDLE_LOCALIZATION_KEY = $(BUNDLE_LOCALIZATION_KEY_$(PLATFORM_NAME));
-BUNDLE_LOCALIZATION_KEY_iphoneos = CFBundleFollowParentLocalization;
-BUNDLE_LOCALIZATION_KEY_iphonesimulator = CFBundleFollowParentLocalization;
-BUNDLE_LOCALIZATION_KEY_macosx = $(BUNDLE_LOCALIZATION_KEY_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</del><ins>+BUNDLE_LOCALIZATION_KEY[sdk=iphone*] = CFBundleFollowParentLocalization;
+BUNDLE_LOCALIZATION_KEY = $(BUNDLE_LOCALIZATION_KEY_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</ins><span class="cx"> BUNDLE_LOCALIZATION_KEY_macosx_1080 = CFBundleAllowMixedLocalizations;
</span><span class="cx"> BUNDLE_LOCALIZATION_KEY_macosx_1090 = CFBundleAllowMixedLocalizations;
</span><span class="cx"> BUNDLE_LOCALIZATION_KEY_macosx_101000 = CFBundleFollowParentLocalization;
</span><span class="cx"> BUNDLE_LOCALIZATION_KEY_macosx_101100 = CFBundleFollowParentLocalization;
</span><span class="cx">
</span><del>-CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = Configurations/WebContent-iOS.entitlements
</del><ins>+CODE_SIGN_ENTITLEMENTS[sdk=iphoneos*] = Configurations/WebContent-iOS.entitlements;
</ins><span class="cx">
</span><del>-OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
-OTHER_LDFLAGS_macosx = -framework AppKit;
</del><ins>+OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(OTHER_LDFLAGS_PLATFORM);
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework AppKit;
</ins></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsWebKitxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/WebKit.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/WebKit.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit2/Configurations/WebKit.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -29,33 +29,26 @@
</span><span class="cx"> INSTALL_PATH_ACTUAL = $(WEBKIT_FRAMEWORKS_DIR);
</span><span class="cx"> DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
</span><span class="cx">
</span><del>-FRAMEWORK_AND_LIBRARY_LDFLAGS = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_$(PLATFORM_NAME));
-FRAMEWORK_AND_LIBRARY_LDFLAGS_iphonesimulator = -lobjc -framework AssertionServices -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CorePDF -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework UIKit -framework OpenGLES -framework MobileCoreServices -lMobileGestalt;
-FRAMEWORK_AND_LIBRARY_LDFLAGS_iphoneos = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_iphonesimulator) -framework IOSurface;
-FRAMEWORK_AND_LIBRARY_LDFLAGS_macosx = -framework ApplicationServices -framework Carbon -framework Cocoa -framework CoreServices -framework IOKit -framework CoreAudio -framework IOSurface -framework OpenGL;
</del><ins>+FRAMEWORK_AND_LIBRARY_LDFLAGS_BASE_ios = -lobjc -framework AssertionServices -framework CFNetwork -framework CoreFoundation -framework CoreGraphics -framework CorePDF -framework CoreText -framework Foundation -framework GraphicsServices -framework ImageIO -framework UIKit -framework OpenGLES -framework MobileCoreServices -lMobileGestalt;
+FRAMEWORK_AND_LIBRARY_LDFLAGS[sdk=iphoneos*] = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_BASE_ios) -framework IOSurface;
+FRAMEWORK_AND_LIBRARY_LDFLAGS[sdk=iphonesimulator*] = $(FRAMEWORK_AND_LIBRARY_LDFLAGS_BASE_ios);
+FRAMEWORK_AND_LIBRARY_LDFLAGS[sdk=macosx*] = -framework ApplicationServices -framework Carbon -framework Cocoa -framework CoreServices -framework IOKit -framework CoreAudio -framework IOSurface -framework OpenGL;
</ins><span class="cx">
</span><span class="cx"> // Prevent C++ standard library operator new, delete and their related exception types from being exported as weak symbols.
</span><span class="cx"> UNEXPORTED_SYMBOL_LDFLAGS = -Wl,-unexported_symbol -Wl,__ZTISt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTISt9exception -Wl,-unexported_symbol -Wl,__ZTSSt9bad_alloc -Wl,-unexported_symbol -Wl,__ZTSSt9exception -Wl,-unexported_symbol -Wl,__ZdlPvS_ -Wl,-unexported_symbol -Wl,__ZnwmPv -Wl,-unexported_symbol -Wl,__Znwm -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2EOS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1EOS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSEDn -Wl,-unexported_symbol, -Wl,__ZNKSt3__18functionIFvN7WebCore12PolicyActionEEEclES2_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEE4swapERS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC1ERKS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEC2ERKS4_ -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore
12PolicyActionEEED1Ev -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEED2Ev -Wl,-unexported_symbol, -Wl,__ZNSt3__18functionIFvN7WebCore12PolicyActionEEEaSERKS4_ -Wl,-unexported_symbol, -Wl,__ZTVNSt3__117bad_function_callE;
</span><span class="cx">
</span><del>-OTHER_LDFLAGS = $(inherited) $(UNEXPORTED_SYMBOL_LDFLAGS) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
-OTHER_LDFLAGS_iphoneos = $(FRAMEWORK_AND_LIBRARY_LDFLAGS) -framework WebKitLegacy -sub_umbrella WebKitLegacy;
-OTHER_LDFLAGS_iphonesimulator = $(OTHER_LDFLAGS_iphoneos);
-OTHER_LDFLAGS_macosx = $(ASAN_OTHER_LDFLAGS) $(FRAMEWORK_AND_LIBRARY_LDFLAGS) -sub_umbrella WebCore -framework WebKitLegacy -sub_umbrella WebKitLegacy;
</del><ins>+OTHER_LDFLAGS = $(inherited) $(UNEXPORTED_SYMBOL_LDFLAGS) $(ASAN_OTHER_LDFLAGS) $(FRAMEWORK_AND_LIBRARY_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM) -framework WebKitLegacy -sub_umbrella WebKitLegacy;
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -sub_umbrella WebCore;
</ins><span class="cx">
</span><del>-SECTORDER_FLAGS = $(SECTORDER_FLAGS_$(CONFIGURATION)_$(PLATFORM_NAME));
-SECTORDER_FLAGS_Production_iphoneos = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebKit.order;
-SECTORDER_FLAGS_Production_macosx = -Wl,-order_file,mac/WebKit2.order;
</del><ins>+SECTORDER_FLAGS[sdk=iphoneos*][config=Production] = -Wl,-order_file,$(SDKROOT)/AppleInternal/OrderFiles/WebKit.order;
+SECTORDER_FLAGS[sdk=macosx*][config=Production] = -Wl,-order_file,mac/WebKit2.order;
</ins><span class="cx">
</span><del>-EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.pdf WKActionMenuController.* com.apple.WebKit.Databases.sb com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb PlugInSandboxProfiles/*.sb;
-EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
</del><ins>+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.pdf WKActionMenuController.* com.apple.WebKit.Databases.sb com.apple.WebKit.NetworkProcess.sb com.apple.WebProcess.sb PlugInSandboxProfiles/*.sb;
</ins><span class="cx">
</span><span class="cx"> INSTALLHDRS_SCRIPT_PHASE = YES;
</span><span class="cx">
</span><del>-WK_API_AVAILABILITY_ENABLED = $(WK_API_AVAILABILITY_ENABLED_$(PLATFORM_NAME));
-WK_API_AVAILABILITY_ENABLED_iphoneos = YES;
-WK_API_AVAILABILITY_ENABLED_iphonesimulator = YES;
-WK_API_AVAILABILITY_ENABLED_macosx = $(WK_API_AVAILABILITY_ENABLED_macosx_$(MAC_OS_X_VERSION_MAJOR));
</del><ins>+WK_API_AVAILABILITY_ENABLED[sdk=iphone*] = YES;
+WK_API_AVAILABILITY_ENABLED = $(WK_API_AVAILABILITY_ENABLED_$(PLATFORM_NAME)_$(MAC_OS_X_VERSION_MAJOR));
</ins><span class="cx"> WK_API_AVAILABILITY_ENABLED_macosx_1080 = NO;
</span><span class="cx"> WK_API_AVAILABILITY_ENABLED_macosx_1090 = NO;
</span><span class="cx"> WK_API_AVAILABILITY_ENABLED_macosx_101000 = YES;
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsWebKit2xcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/WebKit2.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/WebKit2.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit2/Configurations/WebKit2.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -28,39 +28,26 @@
</span><span class="cx">
</span><span class="cx"> OTHER_LDFLAGS = $(inherited) -framework WebKit -sub_umbrella WebKit;
</span><span class="cx">
</span><del>-INSTALL_PATH = $(INSTALL_PATH_$(PLATFORM_NAME));
-INSTALL_PATH_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-INSTALL_PATH_iphonesimulator = $(INDIGO_INSTALL_PATH_PREFIX)$(INSTALL_PATH_ACTUAL);
-INSTALL_PATH_macosx = $(WEBKIT2_FRAMEWORKS_DIR);
-INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(PLATFORM_NAME));
-INSTALL_PATH_ACTUAL_iphonesimulator = $(INSTALL_PATH_iphoneos);
</del><ins>+INSTALL_PATH[sdk=iphoneos*] = $(INSTALL_PATH_ios);
+INSTALL_PATH[sdk=macosx*] = $(WEBKIT2_FRAMEWORKS_DIR);
+INSTALL_PATH_ACTUAL[sdk=iphonesimulator*] = $(INSTALL_PATH_ios);
+INSTALL_PATH_ios = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</ins><span class="cx">
</span><del>-DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(PLATFORM_NAME));
-DYLIB_INSTALL_NAME_BASE_macosx = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
-DYLIB_INSTALL_NAME_BASE_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-DYLIB_INSTALL_NAME_BASE_iphonesimulator = $(DYLIB_INSTALL_NAME_BASE_iphoneos);
</del><ins>+DYLIB_INSTALL_NAME_BASE[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+DYLIB_INSTALL_NAME_BASE[sdk=macosx*] = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
</ins><span class="cx">
</span><del>-SKIP_INSTALL = $(SKIP_INSTALL_$(PLATFORM_NAME));
-SKIP_INSTALL_macosx = $(SKIP_INSTALL);
-SKIP_INSTALL_iphoneos = YES;
-SKIP_INSTALL_iphonesimulator = $(SKIP_INSTALL_iphoneos);
</del><ins>+SKIP_INSTALL[sdk=iphone*] = YES;
</ins><span class="cx">
</span><del>-NORMAL_WEBKIT2_FRAMEWORKS_DIR = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR_$(PLATFORM_NAME));
-NORMAL_WEBKIT2_FRAMEWORKS_DIR_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR);
-NORMAL_WEBKIT2_FRAMEWORKS_DIR_iphonesimulator = $(PRODUCTION_FRAMEWORKS_DIR);
-NORMAL_WEBKIT2_FRAMEWORKS_DIR_macosx = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</del><ins>+NORMAL_WEBKIT2_FRAMEWORKS_DIR[sdk=iphone*] = $(PRODUCTION_FRAMEWORKS_DIR);
+NORMAL_WEBKIT2_FRAMEWORKS_DIR[sdk=macosx*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</ins><span class="cx">
</span><del>-WEBKIT2_FRAMEWORKS_DIR = $(WEBKIT2_FRAMEWORKS_DIR_$(PLATFORM_NAME));
-WEBKIT2_FRAMEWORKS_DIR_iphoneos = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR_iphoneos);
-WEBKIT2_FRAMEWORKS_DIR_iphonesimulator = $(WEBKIT2_FRAMEWORKS_DIR_iphoneos);
-WEBKIT2_FRAMEWORKS_DIR_macosx = $(WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
</del><ins>+WEBKIT2_FRAMEWORKS_DIR[sdk=iphone*] = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
+WEBKIT2_FRAMEWORKS_DIR = $(WEBKIT2_FRAMEWORKS_DIR_$(PLATFORM_NAME)_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
</ins><span class="cx"> WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO);
</span><span class="cx"> WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_NO = $(NORMAL_WEBKIT2_FRAMEWORKS_DIR);
</span><span class="cx"> WEBKIT2_FRAMEWORKS_DIR_macosx_USE_STAGING_INSTALL_PATH_YES = $(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
</span><span class="cx">
</span><del>-NORMAL_PRODUCTION_FRAMEWORKS_DIR = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_$(PLATFORM_NAME));
-NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
-NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphonesimulator = $(NORMAL_PRODUCTION_FRAMEWORKS_DIR_iphoneos);
-NORMAL_PRODUCTION_FRAMEWORKS_DIR_macosx = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</del><ins>+NORMAL_PRODUCTION_FRAMEWORKS_DIR[sdk=iphone*] = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+NORMAL_PRODUCTION_FRAMEWORKS_DIR[sdk=macosx*] = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</ins><span class="cx">
</span><span class="cx"> INSTALLHDRS_SCRIPT_PHASE = YES;
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsWebProcessShimxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/WebProcessShim.xcconfig (177573 => 177574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/WebProcessShim.xcconfig 2014-12-19 10:02:54 UTC (rev 177573)
+++ trunk/Source/WebKit2/Configurations/WebProcessShim.xcconfig 2014-12-19 17:23:10 UTC (rev 177574)
</span><span class="lines">@@ -25,5 +25,5 @@
</span><span class="cx">
</span><span class="cx"> #include "Shim.xcconfig"
</span><span class="cx">
</span><del>-OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(OTHER_LDFLAGS_$(PLATFORM_NAME));
-OTHER_LDFLAGS_macosx = -framework CoreServices -framework Security;
</del><ins>+OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS) $(OTHER_LDFLAGS_PLATFORM);
+OTHER_LDFLAGS_PLATFORM[sdk=macosx*] = -framework CoreServices -framework Security;
</ins></span></pre>
</div>
</div>
</body>
</html>