<!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>[165393] 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/165393">165393</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-03-10 12:09:40 -0700 (Mon, 10 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/JavaScriptCore: [Win] Pass environment to Pre-Build, Pre-link, and Post-Build Stages.
https://bugs.webkit.org/show_bug.cgi?id=130023
Reviewed by Dean Jackson.
* JavaScriptCore.vcxproj/JavaScriptCore.proj: Avoid trailing backslashes in
path names to avoid accidental escaping of later string substitutions.
Source/WebCore: [Win] Pass environment to Pre-Build, Pre-Link, and Post-Build Stages.
https://bugs.webkit.org/show_bug.cgi?id=130023.
Reviewed by Dean Jackson.
* WebCore.vcxproj/WebCore.proj: Avoid trailing slashes in path values to
prevent escaping during later string substitution.
Source/WebKit: [Win] Pass environment to Pre-Build, Pre-Link, and Post-Build Stages.
https://bugs.webkit.org/show_bug.cgi?id=130023
Reviewed by Dean Jackson.
* WebKit.vcxproj/WebKit.make: Removed.
* WebKit.vcxproj/WebKit/WebKitPostBuild.cmd: Use %PlatformArchitecture% rather than
hard-coded 32-bit path.
Source/WTF: [Win] Pass environment to Pre-Build, Pre-Link, and Post-Build Stages.
https://bugs.webkit.org/show_bug.cgi?id=130023.
Reviewed by Dean Jackson.
* WTF.vcxproj/WTF.proj: Avoid putting trailing slashes in system paths to avoid
escaping during later string substitution.
* WTF.vcxproj/build-generated-files.sh: Accept environment values passed by VS.
Tools: [Win] Pass environment to Pre-Build, Pre-Link, and Post-Build Stages.
https://bugs.webkit.org/show_bug.cgi?id=130023
Reviewed by Dean Jackson.
* DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj: Add missing
/SAFESEH flag to DLL launcher process.
WebKitLibraries: [Win] Pass environment to Pre-Build, Pre-Link, and Post-Build Stages.
https://bugs.webkit.org/show_bug.cgi?id=130023
Reviewed by Dean Jackson.
* win/tools/vsprops/common.props: Pass WEBKIT_LIBRARIES value to subprocesses.
* win/tools/vsprops/debugsuffix.props: Make sure OFFICIAL_BUILD is set.
* win/tools/vsprops/production.props: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojWTFproj">trunk/Source/WTF/WTF.vcxproj/WTF.proj</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojbuildgeneratedfilessh">trunk/Source/WTF/WTF.vcxproj/build-generated-files.sh</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCoreproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitWebKitPostBuildcmd">trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeDumpRenderTreevcxprojDumpRenderTreeDumpRenderTreeLaunchervcxproj">trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj</a></li>
<li><a href="#trunkWebKitLibrariesChangeLog">trunk/WebKitLibraries/ChangeLog</a></li>
<li><a href="#trunkWebKitLibrarieswintoolsvspropscommonprops">trunk/WebKitLibraries/win/tools/vsprops/common.props</a></li>
<li><a href="#trunkWebKitLibrarieswintoolsvspropsdebugsuffixprops">trunk/WebKitLibraries/win/tools/vsprops/debugsuffix.props</a></li>
<li><a href="#trunkWebKitLibrarieswintoolsvspropsproductionprops">trunk/WebKitLibraries/win/tools/vsprops/production.props</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitmake">trunk/Source/WebKit/WebKit.vcxproj/WebKit.make</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (165392 => 165393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-03-10 18:57:34 UTC (rev 165392)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-03-10 19:09:40 UTC (rev 165393)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-03-10 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Pass environment to Pre-Build, Pre-link, and Post-Build Stages.
+ https://bugs.webkit.org/show_bug.cgi?id=130023
+
+ Reviewed by Dean Jackson.
+
+ * JavaScriptCore.vcxproj/JavaScriptCore.proj: Avoid trailing backslashes in
+ path names to avoid accidental escaping of later string substitutions.
+
</ins><span class="cx"> 2014-03-10 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> [X86_64] Smaller code for testb_i8r when register is accumulator.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj (165392 => 165393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj 2014-03-10 18:57:34 UTC (rev 165392)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj 2014-03-10 19:09:40 UTC (rev 165393)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> <!-- Wrapper to build JavaScriptCore for both win32 and x64. -->
</span><span class="cx"> <PropertyGroup>
</span><span class="cx"> <OFFICIAL_BUILD>1</OFFICIAL_BUILD>
</span><del>- <WebKit_Libraries>$(SRCROOT)\AppleInternal\</WebKit_Libraries>
</del><ins>+ <WebKit_Libraries>$(SRCROOT)\AppleInternal</WebKit_Libraries>
</ins><span class="cx"> <WebKit_OutputDir>$(OBJROOT)</WebKit_OutputDir>
</span><span class="cx"> <AppleInternal>$(DSTROOT)\AppleInternal</AppleInternal>
</span><span class="cx"> <AppleInternalLib32>$(AppleInternal)\lib32</AppleInternalLib32>
</span><span class="lines">@@ -21,8 +21,8 @@
</span><span class="cx"> <AppleInternalBin64>$(AppleInternal)\bin64</AppleInternalBin64>
</span><span class="cx"> <AppleInternal32Symbols>$(AppleInternal)\public32\sym</AppleInternal32Symbols>
</span><span class="cx"> <AppleInternal64Symbols>$(AppleInternal)\public64\sym</AppleInternal64Symbols>
</span><del>- <ProgramFilesAAS32>Program Files (x86)\Common Files\Apple\Apple Application Support\</ProgramFilesAAS32>
- <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support\</ProgramFilesAAS64>
</del><ins>+ <ProgramFilesAAS32>Program Files (x86)\Common Files\Apple\Apple Application Support</ProgramFilesAAS32>
+ <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
</ins><span class="cx"> <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>
</span><span class="cx"> <OutputDirectory>$(DSTROOT)</OutputDirectory>
</span><span class="cx"> </PropertyGroup>
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (165392 => 165393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-03-10 18:57:34 UTC (rev 165392)
+++ trunk/Source/WTF/ChangeLog 2014-03-10 19:09:40 UTC (rev 165393)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-03-10 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Pass environment to Pre-Build, Pre-Link, and Post-Build Stages.
+ https://bugs.webkit.org/show_bug.cgi?id=130023.
+
+ Reviewed by Dean Jackson.
+
+ * WTF.vcxproj/WTF.proj: Avoid putting trailing slashes in system paths to avoid
+ escaping during later string substitution.
+ * WTF.vcxproj/build-generated-files.sh: Accept environment values passed by VS.
+
</ins><span class="cx"> 2014-03-10 Mark Hahnenberg <mhahnenberg@apple.com>
</span><span class="cx">
</span><span class="cx"> Turn on GenGC on other 64-bit platforms
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTF.proj (165392 => 165393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/WTF.proj 2014-03-10 18:57:34 UTC (rev 165392)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.proj 2014-03-10 19:09:40 UTC (rev 165393)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> <!-- Wrapper to build WTF for both win32 and x64. -->
</span><span class="cx"> <PropertyGroup>
</span><span class="cx"> <OFFICIAL_BUILD>1</OFFICIAL_BUILD>
</span><del>- <WebKit_Libraries>$(SRCROOT)\AppleInternal\</WebKit_Libraries>
</del><ins>+ <WebKit_Libraries>$(SRCROOT)\AppleInternal</WebKit_Libraries>
</ins><span class="cx"> <WebKit_OutputDir>$(OBJROOT)</WebKit_OutputDir>
</span><span class="cx"> <AppleInternal>$(DSTROOT)\AppleInternal</AppleInternal>
</span><span class="cx"> <AppleInternalLib32>$(AppleInternal)\lib32</AppleInternalLib32>
</span><span class="lines">@@ -21,8 +21,8 @@
</span><span class="cx"> <AppleInternalBin64>$(AppleInternal)\bin64</AppleInternalBin64>
</span><span class="cx"> <AppleInternal32Symbols>$(AppleInternal)\public32\sym</AppleInternal32Symbols>
</span><span class="cx"> <AppleInternal64Symbols>$(AppleInternal)\public64\sym</AppleInternal64Symbols>
</span><del>- <ProgramFilesAAS32>Program Files (x86)\Common Files\Apple\Apple Application Support\</ProgramFilesAAS32>
- <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support\</ProgramFilesAAS64>
</del><ins>+ <ProgramFilesAAS32>Program Files (x86)\Common Files\Apple\Apple Application Support</ProgramFilesAAS32>
+ <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
</ins><span class="cx"> <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>
</span><span class="cx"> <OutputDirectory>$(DSTROOT)</OutputDirectory>
</span><span class="cx"> </PropertyGroup>
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojbuildgeneratedfilessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/build-generated-files.sh (165392 => 165393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/build-generated-files.sh 2014-03-10 18:57:34 UTC (rev 165392)
+++ trunk/Source/WTF/WTF.vcxproj/build-generated-files.sh 2014-03-10 19:09:40 UTC (rev 165393)
</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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165392 => 165393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-10 18:57:34 UTC (rev 165392)
+++ trunk/Source/WebCore/ChangeLog 2014-03-10 19:09:40 UTC (rev 165393)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-03-10 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Pass environment to Pre-Build, Pre-Link, and Post-Build Stages.
+ https://bugs.webkit.org/show_bug.cgi?id=130023.
+
+ Reviewed by Dean Jackson.
+
+ * WebCore.vcxproj/WebCore.proj: Avoid trailing slashes in path values to
+ prevent escaping during later string substitution.
+
</ins><span class="cx"> 2014-03-10 Radu Stavila <stavila@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Regions] Hit-testing is not working properly inside scrollable regions
</span><span class="lines">@@ -13,6 +23,7 @@
</span><span class="cx"> * rendering/RenderLayer.cpp:
</span><span class="cx"> (WebCore::RenderLayer::calculateClipRects):
</span><span class="cx">
</span><ins>+>>>>>>> .r165392
</ins><span class="cx"> 2014-03-10 Hans Muller <hmuller@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Shapes] SVG Image valued shape fails if root element's size is relative
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCoreproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj (165392 => 165393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj 2014-03-10 18:57:34 UTC (rev 165392)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.proj 2014-03-10 19:09:40 UTC (rev 165393)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> <!-- Wrapper to build WebCore for both win32 and x64. -->
</span><span class="cx"> <PropertyGroup>
</span><span class="cx"> <OFFICIAL_BUILD>1</OFFICIAL_BUILD>
</span><del>- <WebKit_Libraries>$(SRCROOT)\AppleInternal\</WebKit_Libraries>
</del><ins>+ <WebKit_Libraries>$(SRCROOT)\AppleInternal</WebKit_Libraries>
</ins><span class="cx"> <WebKit_OutputDir>$(OBJROOT)</WebKit_OutputDir>
</span><span class="cx"> <AppleInternal>$(DSTROOT)\AppleInternal</AppleInternal>
</span><span class="cx"> <AppleInternalLib32>$(AppleInternal)\lib32</AppleInternalLib32>
</span><span class="lines">@@ -21,8 +21,8 @@
</span><span class="cx"> <AppleInternalBin64>$(AppleInternal)\bin64</AppleInternalBin64>
</span><span class="cx"> <AppleInternal32Symbols>$(AppleInternal)\public32\sym</AppleInternal32Symbols>
</span><span class="cx"> <AppleInternal64Symbols>$(AppleInternal)\public64\sym</AppleInternal64Symbols>
</span><del>- <ProgramFilesAAS32>Program Files (x86)\Common Files\Apple\Apple Application Support\</ProgramFilesAAS32>
- <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support\</ProgramFilesAAS64>
</del><ins>+ <ProgramFilesAAS32>Program Files (x86)\Common Files\Apple\Apple Application Support</ProgramFilesAAS32>
+ <ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
</ins><span class="cx"> <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>
</span><span class="cx"> <OutputDirectory>$(DSTROOT)</OutputDirectory>
</span><span class="cx"> </PropertyGroup>
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (165392 => 165393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-03-10 18:57:34 UTC (rev 165392)
+++ trunk/Source/WebKit/ChangeLog 2014-03-10 19:09:40 UTC (rev 165393)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-03-10 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Pass environment to Pre-Build, Pre-Link, and Post-Build Stages.
+ https://bugs.webkit.org/show_bug.cgi?id=130023
+
+ Reviewed by Dean Jackson.
+
+ * WebKit.vcxproj/WebKit.make: Removed.
+ * WebKit.vcxproj/WebKit/WebKitPostBuild.cmd: Use %PlatformArchitecture% rather than
+ hard-coded 32-bit path.
+
</ins><span class="cx"> 2014-03-10 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] [CMake] Clean up library linking
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitWebKitPostBuildcmd"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd (165392 => 165393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd 2014-03-10 18:57:34 UTC (rev 165392)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd 2014-03-10 19:09:40 UTC (rev 165393)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebKit"
</span><span class="cx">
</span><del>-set ResourcesDirectory=%CONFIGURATIONBUILDDIR%\bin32\WebKit.resources
</del><ins>+set ResourcesDirectory=%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources
</ins><span class="cx">
</span><span class="cx"> xcopy /y /d "%PROJECTDIR%\..\..\win\WebLocalizableStrings.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
</span><span class="cx"> xcopy /y /d "%PROJECTDIR%\..\..\win\WebKitGraphics.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitmake"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/WebKit.vcxproj/WebKit.make (165392 => 165393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKit.make 2014-03-10 18:57:34 UTC (rev 165392)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit.make 2014-03-10 19:09:40 UTC (rev 165393)
</span><span class="lines">@@ -1,19 +0,0 @@
</span><del>-!IF "$(BUILDSTYLE)"=="DEBUG"
-BUILDSTYLE=DebugSuffix
-!ELSE
-BUILDSTYLE=Production
-!ENDIF
-
-install:
- set OFFICIAL_BUILD=1
- set WebKit_Libraries=$(SRCROOT)\AppleInternal
- set WebKit_OutputDir=$(OBJROOT)
- set ProgramFilesAAS=Program Files (x86)\Common Files\Apple\Apple Application Support
- set Path=%PATH%;$(SRCROOT)\%ProgramFilesAAS%
- set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
- devenv "WebKit.submit.sln" /rebuild $(BUILDSTYLE)
- xcopy "%ConfigurationBuildDir%\bin32\*.pdb" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y
- -xcopy "%ConfigurationBuildDir%\bin32\*.dll" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y
- xcopy "%ConfigurationBuildDir%\bin32\WebKit.resources\*" "$(DSTROOT)\%ProgramFilesAAS%\WebKit.resources\" /e/v/i/h/y
- xcopy "%ConfigurationBuildDir%\include\*" "$(DSTROOT)\AppleInternal\include\" /e/v/i/h/y
- xcopy "%ConfigurationBuildDir%\lib32\*" "$(DSTROOT)\AppleInternal\lib32\" /e/v/i/h/y
</del></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (165392 => 165393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-03-10 18:57:34 UTC (rev 165392)
+++ trunk/Tools/ChangeLog 2014-03-10 19:09:40 UTC (rev 165393)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-03-10 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Pass environment to Pre-Build, Pre-Link, and Post-Build Stages.
+ https://bugs.webkit.org/show_bug.cgi?id=130023
+
+ Reviewed by Dean Jackson.
+
+ * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj: Add missing
+ /SAFESEH flag to DLL launcher process.
+
</ins><span class="cx"> 2014-03-09 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> RunGtkWebKitGObjectDOMBindingsAPIBreakTests should be added to the BuildAndTestFactory not the TestFactory
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeDumpRenderTreevcxprojDumpRenderTreeDumpRenderTreeLaunchervcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj (165392 => 165393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj 2014-03-10 18:57:34 UTC (rev 165392)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj 2014-03-10 19:09:40 UTC (rev 165393)
</span><span class="lines">@@ -178,28 +178,52 @@
</span><span class="cx"> <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</span><ins>+ <Link>
+ <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>
+ </Link>
</ins><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
</span><ins>+ <Link />
</ins><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
</span><ins>+ <Link>
+ <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>
+ </Link>
</ins><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
</span><ins>+ <Link />
</ins><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">
</span><ins>+ <Link>
+ <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>
+ </Link>
</ins><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">
</span><ins>+ <Link />
</ins><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</span><ins>+ <Link>
+ <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>
+ </Link>
</ins><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</span><ins>+ <Link />
</ins><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
</span><ins>+ <Link>
+ <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>
+ </Link>
</ins><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
</span><ins>+ <Link />
</ins><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
</span><ins>+ <Link>
+ <AdditionalOptions>/SAFESEH %(AdditionalOptions)</AdditionalOptions>
+ </Link>
</ins><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'">
</span><ins>+ <Link />
</ins><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClCompile Include="..\..\..\win\DLLLauncher\DLLLauncherMain.cpp" />
</span></span></pre></div>
<a id="trunkWebKitLibrariesChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/ChangeLog (165392 => 165393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/ChangeLog 2014-03-10 18:57:34 UTC (rev 165392)
+++ trunk/WebKitLibraries/ChangeLog 2014-03-10 19:09:40 UTC (rev 165393)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-03-10 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Pass environment to Pre-Build, Pre-Link, and Post-Build Stages.
+ https://bugs.webkit.org/show_bug.cgi?id=130023
+
+ Reviewed by Dean Jackson.
+
+ * win/tools/vsprops/common.props: Pass WEBKIT_LIBRARIES value to subprocesses.
+ * win/tools/vsprops/debugsuffix.props: Make sure OFFICIAL_BUILD is set.
+ * win/tools/vsprops/production.props: Ditto.
+
</ins><span class="cx"> 2014-03-06 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Update WebKitSystemInterface.
</span></span></pre></div>
<a id="trunkWebKitLibrarieswintoolsvspropscommonprops"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/win/tools/vsprops/common.props (165392 => 165393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/win/tools/vsprops/common.props 2014-03-10 18:57:34 UTC (rev 165392)
+++ trunk/WebKitLibraries/win/tools/vsprops/common.props 2014-03-10 19:09:40 UTC (rev 165393)
</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 class="lines">@@ -90,6 +95,7 @@
</span><span class="cx"> set TARGETFILENAME=$(TargetFileName)
</span><span class="cx"> set TARGETPATH=$(TargetPath)
</span><span class="cx"> set DEBUGSUFFIX=$(DebugSuffix)
</span><ins>+set WEBKIT_LIBRARIES=$(WEBKIT_LIBRARIES)
</ins><span class="cx">
</span><span class="cx"> REM If any of the above variables didn't exist previously and
</span><span class="cx"> REM were set to an empty string, set will set the errorlevel to 1,
</span><span class="lines">@@ -126,6 +132,7 @@
</span><span class="cx"> set TARGETFILENAME=$(TargetFileName)
</span><span class="cx"> set TARGETPATH=$(TargetPath)
</span><span class="cx"> set DEBUGSUFFIX=$(DebugSuffix)
</span><ins>+set WEBKIT_LIBRARIES=$(WEBKIT_LIBRARIES)
</ins><span class="cx">
</span><span class="cx"> REM If any of the above variables didn't exist previously and
</span><span class="cx"> REM were set to an empty string, set will set the errorlevel to 1,
</span><span class="lines">@@ -162,6 +169,7 @@
</span><span class="cx"> set TARGETFILENAME=$(TargetFileName)
</span><span class="cx"> set TARGETPATH=$(TargetPath)
</span><span class="cx"> set DEBUGSUFFIX=$(DebugSuffix)
</span><ins>+set WEBKIT_LIBRARIES=$(WEBKIT_LIBRARIES)
</ins><span class="cx">
</span><span class="cx"> REM If any of the above variables didn't exist previously and
</span><span class="cx"> REM were set to an empty string, set will set the errorlevel to 1,
</span></span></pre></div>
<a id="trunkWebKitLibrarieswintoolsvspropsdebugsuffixprops"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/win/tools/vsprops/debugsuffix.props (165392 => 165393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/win/tools/vsprops/debugsuffix.props 2014-03-10 18:57:34 UTC (rev 165392)
+++ trunk/WebKitLibraries/win/tools/vsprops/debugsuffix.props 2014-03-10 19:09:40 UTC (rev 165393)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> <ImportGroup Label="PropertySheets" />
</span><span class="cx"> <PropertyGroup Label="UserMacros">
</span><span class="cx"> <DebugSuffix>_debug</DebugSuffix>
</span><ins>+ <OFFICIAL_BUILD>1</OFFICIAL_BUILD>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup>
</span><span class="cx"> <TargetName>$(TargetName)$(DebugSuffix)</TargetName>
</span><span class="lines">@@ -20,5 +21,9 @@
</span><span class="cx"> <BuildMacro Include="DebugSuffix">
</span><span class="cx"> <Value>$(DebugSuffix)</Value>
</span><span class="cx"> </BuildMacro>
</span><ins>+ <BuildMacro Include="OFFICIAL_BUILD">
+ <Value>$(OFFICIAL_BUILD)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> </Project>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkWebKitLibrarieswintoolsvspropsproductionprops"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/win/tools/vsprops/production.props (165392 => 165393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/win/tools/vsprops/production.props 2014-03-10 18:57:34 UTC (rev 165392)
+++ trunk/WebKitLibraries/win/tools/vsprops/production.props 2014-03-10 19:09:40 UTC (rev 165393)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> <ImportGroup Label="PropertySheets" />
</span><span class="cx"> <PropertyGroup Label="UserMacros">
</span><span class="cx"> <PRODUCTION>1</PRODUCTION>
</span><ins>+ <OFFICIAL_BUILD>1</OFFICIAL_BUILD>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup />
</span><span class="cx"> <ItemDefinitionGroup>
</span><span class="lines">@@ -24,5 +25,9 @@
</span><span class="cx"> <Value>$(PRODUCTION)</Value>
</span><span class="cx"> <EnvironmentVariable>true</EnvironmentVariable>
</span><span class="cx"> </BuildMacro>
</span><ins>+ <BuildMacro Include="OFFICIAL_BUILD">
+ <Value>$(OFFICIAL_BUILD)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> </Project>
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>