<!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>[202989] branches/safari-602.1.40-branch/Source</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/202989">202989</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-07-08 10:45:51 -0700 (Fri, 08 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/202987">r202987</a>. rdar://problem/27244394</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602140branchSourceJavaScriptCoreCMakeListstxt">branches/safari-602.1.40-branch/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#branchessafari602140branchSourceJavaScriptCoreChangeLog">branches/safari-602.1.40-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari602140branchSourceWTFChangeLog">branches/safari-602.1.40-branch/Source/WTF/ChangeLog</a></li>
<li><a href="#branchessafari602140branchSourceWTFwtfCMakeListstxt">branches/safari-602.1.40-branch/Source/WTF/wtf/CMakeLists.txt</a></li>
<li><a href="#branchessafari602140branchSourceWebKitCMakeListstxt">branches/safari-602.1.40-branch/Source/WebKit/CMakeLists.txt</a></li>
<li><a href="#branchessafari602140branchSourceWebKitChangeLog">branches/safari-602.1.40-branch/Source/WebKit/ChangeLog</a></li>
<li><a href="#branchessafari602140branchSourceWebKitPlatformWincmake">branches/safari-602.1.40-branch/Source/WebKit/PlatformWin.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602140branchSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.40-branch/Source/JavaScriptCore/CMakeLists.txt (202988 => 202989)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.40-branch/Source/JavaScriptCore/CMakeLists.txt 2016-07-08 17:42:46 UTC (rev 202988)
+++ branches/safari-602.1.40-branch/Source/JavaScriptCore/CMakeLists.txt 2016-07-08 17:45:51 UTC (rev 202989)
</span><span class="lines">@@ -1350,12 +1350,3 @@
</span><span class="cx">
</span><span class="cx"> add_custom_target(stageSharedScripts DEPENDS ${JavaScriptCore_SCRIPTS})
</span><span class="cx"> add_dependencies(JavaScriptCore stageSharedScripts)
</span><del>-
-if (MSVC)
- add_custom_command(
- TARGET JavaScriptCore
- POST_BUILD
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/version-stamp.pl ${DERIVED_SOURCES_WEBKIT_DIR} $<TARGET_FILE:JavaScriptCore>
- VERBATIM)
-endif ()
-
</del></span></pre></div>
<a id="branchessafari602140branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.40-branch/Source/JavaScriptCore/ChangeLog (202988 => 202989)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.40-branch/Source/JavaScriptCore/ChangeLog 2016-07-08 17:42:46 UTC (rev 202988)
+++ branches/safari-602.1.40-branch/Source/JavaScriptCore/ChangeLog 2016-07-08 17:45:51 UTC (rev 202989)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-07-08 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r202987.
+
+ 2016-07-08 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r202799.
+ https://bugs.webkit.org/show_bug.cgi?id=159568
+
+ Caused build failure (Requested by perarne on #webkit).
+
+ Reverted changeset:
+
+ "[Win] DLLs are missing version information."
+ https://bugs.webkit.org/show_bug.cgi?id=159349
+ http://trac.webkit.org/changeset/202799
+
</ins><span class="cx"> 2016-07-07 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge patch for rdar://problem/27175583.
</span></span></pre></div>
<a id="branchessafari602140branchSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.40-branch/Source/WTF/ChangeLog (202988 => 202989)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.40-branch/Source/WTF/ChangeLog 2016-07-08 17:42:46 UTC (rev 202988)
+++ branches/safari-602.1.40-branch/Source/WTF/ChangeLog 2016-07-08 17:45:51 UTC (rev 202989)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-07-08 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r202987.
+
+ 2016-07-08 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r202799.
+ https://bugs.webkit.org/show_bug.cgi?id=159568
+
+ Caused build failure (Requested by perarne on #webkit).
+
+ Reverted changeset:
+
+ "[Win] DLLs are missing version information."
+ https://bugs.webkit.org/show_bug.cgi?id=159349
+ http://trac.webkit.org/changeset/202799
+
</ins><span class="cx"> 2016-07-07 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge patch for rdar://problem/27175583.
</span></span></pre></div>
<a id="branchessafari602140branchSourceWTFwtfCMakeListstxt"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.40-branch/Source/WTF/wtf/CMakeLists.txt (202988 => 202989)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.40-branch/Source/WTF/wtf/CMakeLists.txt 2016-07-08 17:42:46 UTC (rev 202988)
+++ branches/safari-602.1.40-branch/Source/WTF/wtf/CMakeLists.txt 2016-07-08 17:45:51 UTC (rev 202989)
</span><span class="lines">@@ -294,17 +294,4 @@
</span><span class="cx"> if (MSVC)
</span><span class="cx"> set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
</span><span class="cx"> set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
</span><del>-
- add_custom_command(
- TARGET WTF
- PRE_BUILD
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/auto-version.pl ${DERIVED_SOURCES_WEBKIT_DIR}
- VERBATIM)
-
- add_custom_command(
- TARGET WTF
- POST_BUILD
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/version-stamp.pl ${DERIVED_SOURCES_WEBKIT_DIR} $<TARGET_FILE:WTF>
- VERBATIM)
-
</del><span class="cx"> endif ()
</span></span></pre></div>
<a id="branchessafari602140branchSourceWebKitCMakeListstxt"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.40-branch/Source/WebKit/CMakeLists.txt (202988 => 202989)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.40-branch/Source/WebKit/CMakeLists.txt 2016-07-08 17:42:46 UTC (rev 202988)
+++ branches/safari-602.1.40-branch/Source/WebKit/CMakeLists.txt 2016-07-08 17:45:51 UTC (rev 202989)
</span><span class="lines">@@ -56,12 +56,3 @@
</span><span class="cx"> if (APPLE)
</span><span class="cx"> set_target_properties(WebKit PROPERTIES LINK_FLAGS "-umbrella WebKit")
</span><span class="cx"> endif ()
</span><del>-
-if (MSVC)
- add_custom_command(
- TARGET WebKit
- POST_BUILD
- COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/version-stamp.pl ${DERIVED_SOURCES_WEBKIT_DIR} $<TARGET_FILE:WebKit>
- VERBATIM)
-endif ()
-
</del></span></pre></div>
<a id="branchessafari602140branchSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.40-branch/Source/WebKit/ChangeLog (202988 => 202989)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.40-branch/Source/WebKit/ChangeLog 2016-07-08 17:42:46 UTC (rev 202988)
+++ branches/safari-602.1.40-branch/Source/WebKit/ChangeLog 2016-07-08 17:45:51 UTC (rev 202989)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-07-08 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r202987.
+
+ 2016-07-08 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r202799.
+ https://bugs.webkit.org/show_bug.cgi?id=159568
+
+ Caused build failure (Requested by perarne on #webkit).
+
+ Reverted changeset:
+
+ "[Win] DLLs are missing version information."
+ https://bugs.webkit.org/show_bug.cgi?id=159349
+ http://trac.webkit.org/changeset/202799
+
</ins><span class="cx"> 2016-07-03 Per Arne Vollan <pvollan@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] DLLs are missing version information.
</span></span></pre></div>
<a id="branchessafari602140branchSourceWebKitPlatformWincmake"></a>
<div class="modfile"><h4>Modified: branches/safari-602.1.40-branch/Source/WebKit/PlatformWin.cmake (202988 => 202989)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.1.40-branch/Source/WebKit/PlatformWin.cmake 2016-07-08 17:42:46 UTC (rev 202988)
+++ branches/safari-602.1.40-branch/Source/WebKit/PlatformWin.cmake 2016-07-08 17:45:51 UTC (rev 202989)
</span><span class="lines">@@ -371,8 +371,15 @@
</span><span class="cx"> win/Interfaces/Accessible2/AccessibleText.idl
</span><span class="cx"> win/Interfaces/Accessible2/AccessibleText2.idl
</span><span class="cx"> win/Interfaces/Accessible2/IA2CommonTypes.idl
</span><ins>+ "${DERIVED_SOURCES_WEBKIT_DIR}/include/autoversion.h"
</ins><span class="cx"> )
</span><span class="cx">
</span><ins>+add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_WEBKIT_DIR}/include/autoversion.h
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+ COMMAND ${PERL_EXECUTABLE} ${WEBKIT_LIBRARIES_DIR}/tools/scripts/auto-version.pl ${DERIVED_SOURCES_WEBKIT_DIR}
+ VERBATIM)
+
</ins><span class="cx"> GENERATE_INTERFACE(win/Interfaces/WebKit.idl ${MIDL_DEFINES} "${WEBKIT_IDL_DEPENDENCIES}")
</span><span class="cx"> GENERATE_INTERFACE(win/Interfaces/Accessible2/AccessibleApplication.idl ${MIDL_DEFINES} "${WEBKIT_IDL_DEPENDENCIES}")
</span><span class="cx"> GENERATE_INTERFACE(win/Interfaces/Accessible2/Accessible2.idl ${MIDL_DEFINES} "${WEBKIT_IDL_DEPENDENCIES}")
</span></span></pre>
</div>
</div>
</body>
</html>