<!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>[164870] branches/safari-537.75-branch</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/164870">164870</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-02-28 10:36:03 -0800 (Fri, 28 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WTF: Unreviewed build fix: Pass build environment to sub-processes via command line.
<rdar://problem/16197002>
* WTF.vcxproj/build-generated-files.sh: Pass WEBKIT_LIBRARIES via argument, rather than
relying on global environment.
WebKitLibraries: Unreviewed build fix: Pass WEBKIT_LIBRARIES as argument to sub-process build steps.
<rdar://problem/16197002>
* win/tools/vsprops/common.props: Pass WEBKIT_LIBRARIES directly to sub-processes, rather
than relying on global environment already having these values set.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53775branchSourceWTFChangeLog">branches/safari-537.75-branch/Source/WTF/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceWTFWTFvcxprojbuildgeneratedfilessh">branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/build-generated-files.sh</a></li>
<li><a href="#branchessafari53775branchWebKitLibrariesChangeLog">branches/safari-537.75-branch/WebKitLibraries/ChangeLog</a></li>
<li><a href="#branchessafari53775branchWebKitLibrarieswintoolsvspropscommonprops">branches/safari-537.75-branch/WebKitLibraries/win/tools/vsprops/common.props</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 (164869 => 164870)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WTF/ChangeLog 2014-02-28 18:34:48 UTC (rev 164869)
+++ branches/safari-537.75-branch/Source/WTF/ChangeLog 2014-02-28 18:36:03 UTC (rev 164870)
</span><span class="lines">@@ -1,3 +1,11 @@
</span><ins>+2014-02-28 Brent Fulgham <bfulgham@apple.com>
+
+ Unreviewed build fix: Pass build environment to sub-processes via command line.
+ <rdar://problem/16197002>
+
+ * WTF.vcxproj/build-generated-files.sh: Pass WEBKIT_LIBRARIES via argument, rather than
+ relying on global environment.
+
</ins><span class="cx"> 2014-02-25 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix.
</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 (164869 => 164870)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/build-generated-files.sh 2014-02-28 18:34:48 UTC (rev 164869)
+++ branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/build-generated-files.sh 2014-02-28 18:36:03 UTC (rev 164870)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx"> #!/usr/bin/bash
</span><span class="cx">
</span><span class="cx"> # Determine whether we have the versioned ICU 4.0 or the unversioned ICU 4.4
</span><del>-UNVERSIONED_ICU_LIB_PATH=$(cygpath -u "${WEBKIT_LIBRARIES}/lib${4}/libicuuc${3}.lib")
-ICUVERSION_H_PATH=$(cygpath -u "${CONFIGURATIONBUILDDIR}/include/private/ICUVersion.h")
</del><ins>+UNVERSIONED_ICU_LIB_PATH=$(cygpath -u "${2}/lib${4}/libicuuc${3}.lib")
+ICUVERSION_H_PATH=$(cygpath -u "${1}/include/private/ICUVersion.h")
</ins><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></span></pre></div>
<a id="branchessafari53775branchWebKitLibrariesChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/WebKitLibraries/ChangeLog (164869 => 164870)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/WebKitLibraries/ChangeLog 2014-02-28 18:34:48 UTC (rev 164869)
+++ branches/safari-537.75-branch/WebKitLibraries/ChangeLog 2014-02-28 18:36:03 UTC (rev 164870)
</span><span class="lines">@@ -1,3 +1,11 @@
</span><ins>+2014-02-28 Brent Fulgham <bfulgham@apple.com>
+
+ Unreviewed build fix: Pass WEBKIT_LIBRARIES as argument to sub-process build steps.
+ <rdar://problem/16197002>
+
+ * win/tools/vsprops/common.props: Pass WEBKIT_LIBRARIES directly to sub-processes, rather
+ than relying on global environment already having these values set.
+
</ins><span class="cx"> 2014-02-25 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix.
</span></span></pre></div>
<a id="branchessafari53775branchWebKitLibrarieswintoolsvspropscommonprops"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/WebKitLibraries/win/tools/vsprops/common.props (164869 => 164870)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/WebKitLibraries/win/tools/vsprops/common.props 2014-02-28 18:34:48 UTC (rev 164869)
+++ branches/safari-537.75-branch/WebKitLibraries/win/tools/vsprops/common.props 2014-02-28 18:36:03 UTC (rev 164870)
</span><span class="lines">@@ -12,11 +12,15 @@
</span><span class="cx"> <LinkIncremental>false</LinkIncremental>
</span><span class="cx"> <NMakeBuildCommandLine>%SystemDrive%\cygwin\bin\which.exe bash
</span><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><ins>+set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
</ins><span class="cx"> set PLATFORMARCHITECTURE=$(PlatformArchitecture)
</span><ins>+set WEBKIT_LIBRARIES=$(WEBKIT_LIBRARIES)
</ins><span class="cx"> nmake /nologo -f $(ProjectName).make</NMakeBuildCommandLine>
</span><span class="cx"> <NMakeReBuildCommandLine>%SystemDrive%\cygwin\bin\which.exe bash
</span><span class="cx"> if errorlevel 1 set PATH=%SystemDrive%\cygwin\bin;%PATH%
</span><ins>+set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
</ins><span class="cx"> set PLATFORMARCHITECTURE=$(PlatformArchitecture)
</span><ins>+set WEBKIT_LIBRARIES=$(WEBKIT_LIBRARIES)
</ins><span class="cx"> nmake /nologo -f $(ProjectName).make clean
</span><span class="cx"> nmake /nologo -f $(ProjectName).make</NMakeReBuildCommandLine>
</span><span class="cx"> <NMakeCleanCommandLine>%SystemDrive%\cygwin\bin\which.exe bash
</span><span class="lines">@@ -27,6 +31,7 @@
</span><span class="cx"> REM VS2010 has a known bug where the clean command does not recognize environment variables properly unless explicitly set here
</span><span class="cx"> set CONFIGURATIONBUILDDIR=$(ConfigurationBuildDir)
</span><span class="cx"> set PLATFORMARCHITECTURE=$(PlatformArchitecture)
</span><ins>+set WEBKIT_LIBRARIES=$(WEBKIT_LIBRARIES)
</ins><span class="cx"> nmake /nologo -f $(ProjectName).make clean</NMakeCleanCommandLine>
</span><span class="cx"> <TargetName>$(ProjectName)$(DebugSuffix)</TargetName>
</span><span class="cx"> </PropertyGroup>
</span></span></pre>
</div>
</div>
</body>
</html>