<!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>[162851] branches/safari-537.75-branch/Source/WTF</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/162851">162851</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-01-27 11:54:16 -0800 (Mon, 27 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/162850">r162850</a>
2014-01-27 Brent Fulgham <bfulgham@apple.com>
[Win] Unreviewed build correction.
* WTF.vcxproj/WTFGeneratedCommon.props: Export PLATFORMARCHITECTURE
macro for use in Makefiles and shell scripts.
* WTF.vcxproj/build-generated-files.sh: Output header search path to
identify when the build is confused about build architecture.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53775branchSourceWTFChangeLog">branches/safari-537.75-branch/Source/WTF/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceWTFWTFvcxprojWTFGeneratedCommonprops">branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/WTFGeneratedCommon.props</a></li>
<li><a href="#branchessafari53775branchSourceWTFWTFvcxprojbuildgeneratedfilessh">branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/build-generated-files.sh</a></li>
<li><a href="#branchessafari53775branchSourceWTFWTFvcxprojcopyfilescmd">branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/copy-files.cmd</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53775branchSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WTF/ChangeLog (162850 => 162851)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WTF/ChangeLog 2014-01-27 19:49:10 UTC (rev 162850)
+++ branches/safari-537.75-branch/Source/WTF/ChangeLog 2014-01-27 19:54:16 UTC (rev 162851)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-01-27 Brent Fulgham <bfulgham@apple.com>
+
+ Merge r162850
+
+ 2014-01-27 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Unreviewed build correction.
+
+ * WTF.vcxproj/WTFGeneratedCommon.props: Export PLATFORMARCHITECTURE
+ macro for use in Makefiles and shell scripts.
+ * WTF.vcxproj/build-generated-files.sh: Output header search path to
+ identify when the build is confused about build architecture.
+
</ins><span class="cx"> 2014-01-23 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r162621
</span></span></pre></div>
<a id="branchessafari53775branchSourceWTFWTFvcxprojWTFGeneratedCommonprops"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/WTFGeneratedCommon.props (162850 => 162851)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/WTFGeneratedCommon.props 2014-01-27 19:49:10 UTC (rev 162850)
+++ branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/WTFGeneratedCommon.props 2014-01-27 19:54:16 UTC (rev 162851)
</span><span class="lines">@@ -1,7 +1,9 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><span class="cx"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</span><span class="cx"> <ImportGroup Label="PropertySheets" />
</span><del>- <PropertyGroup Label="UserMacros" />
</del><ins>+ <PropertyGroup Label="UserMacros">
+ <PLATFORMARCHITECTURE>32</PLATFORMARCHITECTURE>
+ </PropertyGroup>
</ins><span class="cx"> <PropertyGroup />
</span><span class="cx"> <PropertyGroup />
</span><span class="cx"> <PropertyGroup />
</span><span class="lines">@@ -11,5 +13,10 @@
</span><span class="cx"> <ItemDefinitionGroup>
</span><span class="cx"> <BuildLog />
</span><span class="cx"> </ItemDefinitionGroup>
</span><del>- <ItemGroup />
</del><ins>+ <ItemGroup>
+ <BuildMacro Include="PLATFORMARCHITECTURE">
+ <Value>$(PLATFORMARCHITECTURE)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
+ </ItemGroup>
</ins><span class="cx"> </Project>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari53775branchSourceWTFWTFvcxprojbuildgeneratedfilessh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/build-generated-files.sh (162850 => 162851)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/build-generated-files.sh 2014-01-27 19:49:10 UTC (rev 162850)
+++ branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/build-generated-files.sh 2014-01-27 19:54:16 UTC (rev 162851)
</span><span class="lines">@@ -6,6 +6,7 @@
</span><span class="cx"> if test \( ! -f "${ICUVERSION_H_PATH}" \) -o \( -f "${UNVERSIONED_ICU_LIB_PATH}" -a \( "${UNVERSIONED_ICU_LIB_PATH}" -nt "${ICUVERSION_H_PATH}" \) \)
</span><span class="cx"> then
</span><span class="cx"> mkdir -p "$(dirname "${ICUVERSION_H_PATH}")"
</span><ins>+ echo "Checking ${UNVERSIONED_ICU_LIB_PATH}"
</ins><span class="cx"> test ! -f "${UNVERSIONED_ICU_LIB_PATH}"
</span><span class="cx"> echo "#define U_DISABLE_RENAMING $?" > "${ICUVERSION_H_PATH}"
</span><span class="cx"> fi
</span></span></pre></div>
<a id="branchessafari53775branchSourceWTFWTFvcxprojcopyfilescmd"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/copy-files.cmd (162850 => 162851)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/copy-files.cmd 2014-01-27 19:49:10 UTC (rev 162850)
+++ branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/copy-files.cmd 2014-01-27 19:54:16 UTC (rev 162851)
</span><span class="lines">@@ -1,5 +1,8 @@
</span><span class="cx"> @echo off
</span><span class="cx">
</span><ins>+setlocal
+REM limit path to DOS-only for this file to avoid confusion between DOS rmdir and Cygwin's variant
+set PATH=%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem
</ins><span class="cx"> set PrivateHeadersDirectory=%CONFIGURATIONBUILDDIR%\include\private
</span><span class="cx">
</span><span class="cx"> if "%1" EQU "clean" goto :clean
</span><span class="lines">@@ -34,3 +37,5 @@
</span><span class="cx">
</span><span class="cx"> echo Deleting copied files...
</span><span class="cx"> if exist "%PrivateHeadersDirectory%" rmdir /s /q "%PrivateHeadersDirectory%" >NUL
</span><ins>+endlocal
+
</ins></span></pre>
</div>
</div>
</body>
</html>