<!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>[190440] 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/190440">190440</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-10-01 17:09:42 -0700 (Thu, 01 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>
.:
[Win] Unreviewed CMake build fix.
* Source/cmake/OptionsWin.cmake: Clean up options setttings,
and make sure exception handling is turned off.
Tools:
Another attempt to fix the Windows builders after <https://trac.webkit.org/changeset/190387>
(https://bugs.webkit.org/show_bug.cgi?id=149695)
Following <a href="http://trac.webkit.org/projects/webkit/changeset/190424">r190424</a> we can now rely on webkit-build-directory to return the path to
the correct configuration-specific build directory on Windows.
Patch by Daniel Bates <dabates@apple.com> on 2015-10-01
* BuildSlaveSupport/built-product-archive:
(archiveBuiltProduct):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourcecmakeOptionsWincmake">trunk/Source/cmake/OptionsWin.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitdirspm">trunk/Tools/Scripts/webkitdirs.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (190439 => 190440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-10-02 00:03:58 UTC (rev 190439)
+++ trunk/ChangeLog 2015-10-02 00:09:42 UTC (rev 190440)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2015-10-01 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Unreviewed CMake build fix.
+
+ * Source/cmake/OptionsWin.cmake: Clean up options setttings,
+ and make sure exception handling is turned off.
+
</ins><span class="cx"> 2015-09-30 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Unreviewed build fix after CMake conversion.
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsWin.cmake (190439 => 190440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsWin.cmake 2015-10-02 00:03:58 UTC (rev 190439)
+++ trunk/Source/cmake/OptionsWin.cmake 2015-10-02 00:09:42 UTC (rev 190440)
</span><span class="lines">@@ -1,5 +1,4 @@
</span><del>-add_definitions(-D_HAS_EXCEPTIONS=0 -DNOMINMAX -DUNICODE)
-add_definitions(-D_WINDOWS -DWINVER=0x601 -D_HAS_EXCEPTIONS=0)
</del><ins>+add_definitions(-DNOMINMAX -DUNICODE -D_UNICODE -D_WINDOWS -DWINVER=0x601)
</ins><span class="cx">
</span><span class="cx"> WEBKIT_OPTION_BEGIN()
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_TRANSFORMS PUBLIC ON)
</span><span class="lines">@@ -151,25 +150,24 @@
</span><span class="cx"> set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG")
</span><span class="cx">
</span><span class="cx"> # We do not use exceptions
</span><del>- add_compile_options(/EHa- /EHsc- /EHs- /fp:except-)
</del><ins>+ add_definitions(-D_HAS_EXCEPTIONS=0)
+ add_compile_options(/EHa- /EHc- /EHs- /fp:except-)
</ins><span class="cx">
</span><del>- # Warnings are important
- add_compile_options(/W4)
-
</del><span class="cx"> # We have some very large object files that have to be linked
</span><del>- add_compile_options(/analyze- /bigobj /Bv)
</del><ins>+ add_compile_options(/analyze- /bigobj)
</ins><span class="cx">
</span><span class="cx"> # Use CRT security features
</span><span class="cx"> add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1)
</span><span class="cx">
</span><span class="cx"> # Turn off certain link features
</span><del>- add_compile_options(/Gy- /GR- /openmp- /GF-)
</del><ins>+ add_compile_options(/Gy- /openmp- /GF-)
</ins><span class="cx">
</span><span class="cx"> if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
</span><span class="cx"> set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /OPT:NOREF /OPT:NOICF")
</span><span class="cx"> set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /OPT:NOREF /OPT:NOICF")
</span><span class="cx">
</span><del>- # To debug linking time issues, uncomment the following two lines:
</del><ins>+ # To debug linking time issues, uncomment the following three lines:
+ #add_compile_options(/Bv)
</ins><span class="cx"> #set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /VERBOSE /VERBOSE:INCR /TIME")
</span><span class="cx"> #set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /VERBOSE /VERBOSE:INCR /TIME")
</span><span class="cx"> elseif (${CMAKE_BUILD_TYPE} MATCHES "Release")
</span><span class="lines">@@ -181,8 +179,10 @@
</span><span class="cx"> add_definitions(/MP)
</span><span class="cx"> endif ()
</span><span class="cx"> if (NOT ${CMAKE_CXX_FLAGS} STREQUAL "")
</span><del>- string(REGEX REPLACE "/EH[a-z]+" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable C++ exceptions
- string(REGEX REPLACE "/GR[^-]" "/GR-" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable RTTI
</del><ins>+ string(REGEX REPLACE "(/EH[a-z]+) " "\\1- " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable C++ exceptions
+ string(REGEX REPLACE "/EHsc$" "/EHs- /EHc- " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable C++ exceptions
+ string(REGEX REPLACE "/GR " "/GR- " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Disable RTTI
+ string(REGEX REPLACE "/W3" "/W4" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) # Warnings are important
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> foreach (flag_var
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (190439 => 190440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-10-02 00:03:58 UTC (rev 190439)
+++ trunk/Tools/ChangeLog 2015-10-02 00:09:42 UTC (rev 190440)
</span><span class="lines">@@ -11,6 +11,13 @@
</span><span class="cx">
</span><span class="cx"> 2015-10-01 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><ins>+ [Win] Unreviewed build fix.
+
+ * Scripts/webkitdirs.pm:
+ (setupAppleWinEnv): Use 64-bit build tools if available
+
+2015-10-01 Brent Fulgham <bfulgham@apple.com>
+
</ins><span class="cx"> [Win] Fix TestWebKitAPI build under CMake.
</span><span class="cx">
</span><span class="cx"> Reviewed by Alex Christensen.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (190439 => 190440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2015-10-02 00:03:58 UTC (rev 190439)
+++ trunk/Tools/Scripts/webkitdirs.pm 2015-10-02 00:09:42 UTC (rev 190440)
</span><span class="lines">@@ -1525,6 +1525,8 @@
</span><span class="cx"> $variablesToSet{WEBKIT_LIBRARIES} = windowsLibrariesDir() unless $ENV{WEBKIT_LIBRARIES};
</span><span class="cx"> $variablesToSet{WEBKIT_OUTPUTDIR} = windowsOutputDir() unless $ENV{WEBKIT_OUTPUTDIR};
</span><span class="cx"> $variablesToSet{MSBUILDDISABLENODEREUSE} = "1" unless $ENV{MSBUILDDISABLENODEREUSE};
</span><ins>+ $variablesToSet{_IsNativeEnvironment} = "true" unless $ENV{_IsNativeEnvironment};
+ $variablesToSet{PreferredToolArchitecture} = "x64" unless $ENV{PreferredToolArchitecture};
</ins><span class="cx">
</span><span class="cx"> foreach my $variable (keys %variablesToSet) {
</span><span class="cx"> print "Setting the Environment Variable '" . $variable . "' to '" . $variablesToSet{$variable} . "'\n\n";
</span></span></pre>
</div>
</div>
</body>
</html>