<!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>[198481] trunk</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/198481">198481</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2016-03-20 22:11:38 -0700 (Sun, 20 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
https://bugs.webkit.org/show_bug.cgi?id=155707
<rdar://problem/24980691>
Reviewed by Darin Adler.
Source/bmalloc:
* Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
component of MACOSX_DEPLOYMENT_TARGET.
* Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
Source/JavaScriptCore:
* Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
component of MACOSX_DEPLOYMENT_TARGET.
* Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
Source/ThirdParty/ANGLE:
* Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
component of MACOSX_DEPLOYMENT_TARGET.
* Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
Source/WebCore:
* Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
component of MACOSX_DEPLOYMENT_TARGET.
* Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
Source/WebInspectorUI:
* Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
component of MACOSX_DEPLOYMENT_TARGET.
* Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
Source/WebKit/mac:
* Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
component of MACOSX_DEPLOYMENT_TARGET.
* Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
Source/WebKit2:
* Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
component of MACOSX_DEPLOYMENT_TARGET.
* Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
Source/WTF:
* Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
component of MACOSX_DEPLOYMENT_TARGET.
* Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
Tools:
* ContentExtensionTester/Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR
based on the last component of MACOSX_DEPLOYMENT_TARGET.
* ContentExtensionTester/Configurations/DebugRelease.xcconfig: For engineering builds,
preserve the behavior of TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
Similarly for these projects:
* DumpRenderTree/mac/Configurations/Base.xcconfig:
* DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
* LayoutTestRelay/Configurations/Base.xcconfig:
* LayoutTestRelay/Configurations/DebugRelease.xcconfig:
* MiniBrowser/Configurations/Base.xcconfig:
* MiniBrowser/Configurations/DebugRelease.xcconfig:
* TestWebKitAPI/Configurations/Base.xcconfig:
* TestWebKitAPI/Configurations/DebugRelease.xcconfig:
* WebEditingTester/Configurations/Base.xcconfig:
* WebEditingTester/Configurations/DebugRelease.xcconfig:
* WebKitTestRunner/Configurations/Base.xcconfig:
* WebKitTestRunner/Configurations/DebugRelease.xcconfig:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsBasexcconfig">trunk/Source/JavaScriptCore/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceJavaScriptCoreConfigurationsDebugReleasexcconfig">trunk/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkSourceThirdPartyANGLEChangeLog">trunk/Source/ThirdParty/ANGLE/ChangeLog</a></li>
<li><a href="#trunkSourceThirdPartyANGLEConfigurationsBasexcconfig">trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceThirdPartyANGLEConfigurationsDebugReleasexcconfig">trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFConfigurationsBasexcconfig">trunk/Source/WTF/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceWTFConfigurationsDebugReleasexcconfig">trunk/Source/WTF/Configurations/DebugRelease.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="#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="#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="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsBasexcconfig">trunk/Source/WebKit2/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourceWebKit2ConfigurationsDebugReleasexcconfig">trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkSourcebmallocChangeLog">trunk/Source/bmalloc/ChangeLog</a></li>
<li><a href="#trunkSourcebmallocConfigurationsBasexcconfig">trunk/Source/bmalloc/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkSourcebmallocConfigurationsDebugReleasexcconfig">trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsContentExtensionTesterConfigurationsBasexcconfig">trunk/Tools/ContentExtensionTester/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkToolsContentExtensionTesterConfigurationsDebugReleasexcconfig">trunk/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkToolsDumpRenderTreemacConfigurationsBasexcconfig">trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkToolsDumpRenderTreemacConfigurationsDebugReleasexcconfig">trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkToolsLayoutTestRelayConfigurationsBasexcconfig">trunk/Tools/LayoutTestRelay/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkToolsLayoutTestRelayConfigurationsDebugReleasexcconfig">trunk/Tools/LayoutTestRelay/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkToolsMiniBrowserConfigurationsBasexcconfig">trunk/Tools/MiniBrowser/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkToolsMiniBrowserConfigurationsDebugReleasexcconfig">trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkToolsTestWebKitAPIConfigurationsBasexcconfig">trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkToolsTestWebKitAPIConfigurationsDebugReleasexcconfig">trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkToolsWebEditingTesterConfigurationsBasexcconfig">trunk/Tools/WebEditingTester/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkToolsWebEditingTesterConfigurationsDebugReleasexcconfig">trunk/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig</a></li>
<li><a href="#trunkToolsWebKitTestRunnerConfigurationsBasexcconfig">trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig</a></li>
<li><a href="#trunkToolsWebKitTestRunnerConfigurationsDebugReleasexcconfig">trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-03-20 Dan Bernstein <mitz@apple.com>
+
+ [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
+ https://bugs.webkit.org/show_bug.cgi?id=155707
+ <rdar://problem/24980691>
+
+ Reviewed by Darin Adler.
+
+ * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
+ component of MACOSX_DEPLOYMENT_TARGET.
+ * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
+ TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
+
</ins><span class="cx"> 2016-03-20 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash in stress/regexp-matches-array-slow-put.js due to stomping on memory when having bad time
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/Base.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/JavaScriptCore/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -88,7 +88,11 @@
</span><span class="cx">
</span><span class="cx"> HEADER_SEARCH_PATHS = . icu $(LLVM_LOCAL_HEADER_PATH) "${BUILT_PRODUCTS_DIR}/ExtraIncludesForLocalLLVMBuild" $(LLVM_SYSTEM_HEADER_PATH) "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);
</span><span class="cx">
</span><del>-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
</del><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
</ins><span class="cx">
</span><span class="cx"> SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/JavaScriptCore/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx">
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
</ins><span class="cx"> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2016-03-20 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><ins>+ [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
+ https://bugs.webkit.org/show_bug.cgi?id=155707
+ <rdar://problem/24980691>
+
+ Reviewed by Darin Adler.
+
+ * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
+ component of MACOSX_DEPLOYMENT_TARGET.
+ * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
+ TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
+
+2016-03-20 Dan Bernstein <mitz@apple.com>
+
</ins><span class="cx"> Update build settings
</span><span class="cx">
</span><span class="cx"> Rubber-stamped by Andy Estes.
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -45,7 +45,11 @@
</span><span class="cx">
</span><span class="cx"> SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
</span><span class="cx">
</span><del>-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
</del><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
</ins><span class="cx">
</span><span class="cx"> SDKROOT = macosx.internal;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceThirdPartyANGLEConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -4,6 +4,8 @@
</span><span class="cx">
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
</ins><span class="cx"> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WTF/ChangeLog 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2016-03-20 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><ins>+ [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
+ https://bugs.webkit.org/show_bug.cgi?id=155707
+ <rdar://problem/24980691>
+
+ Reviewed by Darin Adler.
+
+ * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
+ component of MACOSX_DEPLOYMENT_TARGET.
+ * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
+ TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
+
+2016-03-20 Dan Bernstein <mitz@apple.com>
+
</ins><span class="cx"> Update build settings
</span><span class="cx">
</span><span class="cx"> Rubber-stamped by Andy Estes.
</span></span></pre></div>
<a id="trunkSourceWTFConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/Configurations/Base.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WTF/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -82,7 +82,11 @@
</span><span class="cx"> WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
</span><span class="cx"> HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(DSTROOT)/usr/local/include icu $(HEADER_SEARCH_PATHS);
</span><span class="cx">
</span><del>-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
</del><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
</ins><span class="cx">
</span><span class="cx"> SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/Configurations/DebugRelease.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WTF/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> ARCHS = $(ARCHS_STANDARD_32_64_BIT);
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
</ins><span class="cx"> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WebCore/ChangeLog 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-03-20 Dan Bernstein <mitz@apple.com>
+
+ [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
+ https://bugs.webkit.org/show_bug.cgi?id=155707
+ <rdar://problem/24980691>
+
+ Reviewed by Darin Adler.
+
+ * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
+ component of MACOSX_DEPLOYMENT_TARGET.
+ * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
+ TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
+
</ins><span class="cx"> 2016-03-20 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><span class="cx"> Added implementations of AXObjectCache methods for !HAVE(ACCESSIBILITY).
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -79,7 +79,11 @@
</span><span class="cx"> PREBINDING = NO;
</span><span class="cx"> WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wno-unknown-warning-option;
</span><span class="cx">
</span><del>-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
</del><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
</ins><span class="cx">
</span><span class="cx"> SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/DebugRelease.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx">
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
</ins><span class="cx"> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2016-03-20 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><ins>+ [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
+ https://bugs.webkit.org/show_bug.cgi?id=155707
+ <rdar://problem/24980691>
+
+ Reviewed by Darin Adler.
+
+ * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
+ component of MACOSX_DEPLOYMENT_TARGET.
+ * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
+ TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
+
+2016-03-20 Dan Bernstein <mitz@apple.com>
+
</ins><span class="cx"> Update build settings
</span><span class="cx">
</span><span class="cx"> Rubber-stamped by Andy Estes.
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Configurations/Base.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WebInspectorUI/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -53,7 +53,11 @@
</span><span class="cx">
</span><span class="cx"> SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
</span><span class="cx">
</span><del>-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
</del><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
</ins><span class="cx">
</span><span class="cx"> SDKROOT = macosx.internal;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -4,6 +4,8 @@
</span><span class="cx">
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
</ins><span class="cx"> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-03-20 Dan Bernstein <mitz@apple.com>
+
+ [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
+ https://bugs.webkit.org/show_bug.cgi?id=155707
+ <rdar://problem/24980691>
+
+ Reviewed by Darin Adler.
+
+ * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
+ component of MACOSX_DEPLOYMENT_TARGET.
+ * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
+ TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
+
</ins><span class="cx"> 2016-03-20 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Disable Caches in Safari's Develop menu does not disable caches.
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/Base.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WebKit/mac/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -73,7 +73,11 @@
</span><span class="cx"> PREBINDING = NO;
</span><span class="cx"> WARNING_CFLAGS = -Wall -Wextra -Wchar-subscripts -Wextra-tokens -Wformat-security -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
</span><span class="cx">
</span><del>-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
</del><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> // DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx">
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
</ins><span class="cx"> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-03-20 Dan Bernstein <mitz@apple.com>
+
+ [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
+ https://bugs.webkit.org/show_bug.cgi?id=155707
+ <rdar://problem/24980691>
+
+ Reviewed by Darin Adler.
+
+ * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
+ component of MACOSX_DEPLOYMENT_TARGET.
+ * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
+ TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
+
</ins><span class="cx"> 2016-03-20 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Disable Caches in Safari's Develop menu does not disable caches.
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/Base.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WebKit2/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -73,7 +73,11 @@
</span><span class="cx"> PREBINDING = NO;
</span><span class="cx"> WARNING_CFLAGS = -Wall -Wextra -Wchar-subscripts -Wextra-tokens -Wformat-security -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
</span><span class="cx">
</span><del>-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
</del><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
</ins><span class="cx">
</span><span class="cx"> // DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.
</span><span class="cx"> // We set up the values for each variant here, and have the Debug configuration in the Xcode project use the _debug variant.
</span></span></pre></div>
<a id="trunkSourceWebKit2ConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/WebKit2/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx">
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
</ins><span class="cx"> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
</span></span></pre></div>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/bmalloc/ChangeLog 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2016-03-20 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><ins>+ [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
+ https://bugs.webkit.org/show_bug.cgi?id=155707
+ <rdar://problem/24980691>
+
+ Reviewed by Darin Adler.
+
+ * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
+ component of MACOSX_DEPLOYMENT_TARGET.
+ * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
+ TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
+
+2016-03-20 Dan Bernstein <mitz@apple.com>
+
</ins><span class="cx"> Update build settings
</span><span class="cx">
</span><span class="cx"> Rubber-stamped by Andy Estes.
</span></span></pre></div>
<a id="trunkSourcebmallocConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/Configurations/Base.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/bmalloc/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -80,7 +80,11 @@
</span><span class="cx"> PREBINDING = NO;
</span><span class="cx"> WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
</span><span class="cx">
</span><del>-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
</del><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
</ins><span class="cx">
</span><span class="cx"> SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcebmallocConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Source/bmalloc/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> ARCHS = $(ARCHS_STANDARD_32_64_BIT);
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
</ins><span class="cx"> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/ChangeLog 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2016-03-20 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><ins>+ [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
+ https://bugs.webkit.org/show_bug.cgi?id=155707
+ <rdar://problem/24980691>
+
+ Reviewed by Darin Adler.
+
+ * ContentExtensionTester/Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR
+ based on the last component of MACOSX_DEPLOYMENT_TARGET.
+ * ContentExtensionTester/Configurations/DebugRelease.xcconfig: For engineering builds,
+ preserve the behavior of TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
+
+ Similarly for these projects:
+
+ * DumpRenderTree/mac/Configurations/Base.xcconfig:
+ * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
+ * LayoutTestRelay/Configurations/Base.xcconfig:
+ * LayoutTestRelay/Configurations/DebugRelease.xcconfig:
+ * MiniBrowser/Configurations/Base.xcconfig:
+ * MiniBrowser/Configurations/DebugRelease.xcconfig:
+ * TestWebKitAPI/Configurations/Base.xcconfig:
+ * TestWebKitAPI/Configurations/DebugRelease.xcconfig:
+ * WebEditingTester/Configurations/Base.xcconfig:
+ * WebEditingTester/Configurations/DebugRelease.xcconfig:
+ * WebKitTestRunner/Configurations/Base.xcconfig:
+ * WebKitTestRunner/Configurations/DebugRelease.xcconfig:
+
+2016-03-20 Dan Bernstein <mitz@apple.com>
+
</ins><span class="cx"> Update build settings
</span><span class="cx">
</span><span class="cx"> Rubber-stamped by Andy Estes.
</span></span></pre></div>
<a id="trunkToolsContentExtensionTesterConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ContentExtensionTester/Configurations/Base.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ContentExtensionTester/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/ContentExtensionTester/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -65,7 +65,11 @@
</span><span class="cx"> GCC_WARN_UNUSED_VARIABLE = YES;
</span><span class="cx"> WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
</span><span class="cx">
</span><del>-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
</del><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
</ins><span class="cx">
</span><span class="cx"> // DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.
</span><span class="cx"> // We set up the values for each variant here, and have the Debug configuration in the Xcode project use the _debug variant.
</span></span></pre></div>
<a id="trunkToolsContentExtensionTesterConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -25,8 +25,9 @@
</span><span class="cx">
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
</ins><span class="cx"> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><del>-MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
</del><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -69,7 +69,11 @@
</span><span class="cx"> DEBUG_DEFINES_normal = NDEBUG;
</span><span class="cx"> DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
</span><span class="cx">
</span><del>-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
</del><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
</ins><span class="cx">
</span><span class="cx"> SDKROOT = macosx.internal;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx">
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
</ins><span class="cx"> MACOSX_DEPLOYMENT_TARGET[sdk=macosx*] = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
</span></span></pre></div>
<a id="trunkToolsLayoutTestRelayConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/LayoutTestRelay/Configurations/Base.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/LayoutTestRelay/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/LayoutTestRelay/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -51,7 +51,11 @@
</span><span class="cx"> DEBUG_DEFINES_normal = NDEBUG;
</span><span class="cx"> DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
</span><span class="cx">
</span><del>-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
</del><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
</ins><span class="cx">
</span><span class="cx"> SDKROOT = macosx.internal;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsLayoutTestRelayConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/LayoutTestRelay/Configurations/DebugRelease.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/LayoutTestRelay/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/LayoutTestRelay/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -25,6 +25,8 @@
</span><span class="cx">
</span><span class="cx"> ARCHS = $(ARCHS_STANDARD_64_BIT);
</span><span class="cx">
</span><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
</ins><span class="cx"> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
</span></span></pre></div>
<a id="trunkToolsMiniBrowserConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/Configurations/Base.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/MiniBrowser/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -57,7 +57,11 @@
</span><span class="cx">
</span><span class="cx"> SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
</span><span class="cx">
</span><del>-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
</del><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
</ins><span class="cx">
</span><span class="cx"> SDKROOT = macosx.internal;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsMiniBrowserConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx">
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
</ins><span class="cx"> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -72,7 +72,11 @@
</span><span class="cx">
</span><span class="cx"> SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
</span><span class="cx">
</span><del>-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
</del><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> SDKROOT = macosx.internal;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx">
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
</ins><span class="cx"> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
</span></span></pre></div>
<a id="trunkToolsWebEditingTesterConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebEditingTester/Configurations/Base.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebEditingTester/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/WebEditingTester/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -54,7 +54,11 @@
</span><span class="cx"> WARNING_CFLAGS = -Wall -W -Wno-unused-parameter
</span><span class="cx"> CLANG_ENABLE_OBJC_ARC = YES;
</span><span class="cx">
</span><del>-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
</del><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
</ins><span class="cx">
</span><span class="cx"> SDKROOT = macosx.internal;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebEditingTesterConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -27,8 +27,9 @@
</span><span class="cx">
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
</ins><span class="cx"> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
</span><del>-MACOSX_DEPLOYMENT_TARGET_1090 = 10.9;
</del><span class="cx"> MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_101200 = 10.12;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerConfigurationsBasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -53,7 +53,11 @@
</span><span class="cx"> DEBUG_DEFINES_normal = NDEBUG;
</span><span class="cx"> DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
</span><span class="cx">
</span><del>-TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
</del><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
+TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
+TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
+TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
+TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
</ins><span class="cx">
</span><span class="cx"> SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerConfigurationsDebugReleasexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig (198480 => 198481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig 2016-03-21 01:26:13 UTC (rev 198480)
+++ trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig 2016-03-21 05:11:38 UTC (rev 198481)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx">
</span><span class="cx"> ONLY_ACTIVE_ARCH = YES;
</span><span class="cx">
</span><ins>+TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
+
</ins><span class="cx"> MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
</span><span class="cx"> MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
</span></span></pre>
</div>
</div>
</body>
</html>