[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [239561] trunk
From: yusukesuzuki () slowstart ! org
Date: 2018-12-30 21:19:09
Message-ID: 20181230211909.2868010051CC () svn ! webkit ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!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>[239561] 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/239561">239561</a></dd> \
<dt>Author</dt> <dd>yusukesuzuki@slowstart.org</dd> <dt>Date</dt> <dd>2018-12-30 \
13:19:09 -0800 (Sun, 30 Dec 2018)</dd> </dl>
<h3>Log Message</h3>
<pre>Add ENABLE_UNIFIED_BUILDS option to cmake ports
https://bugs.webkit.org/show_bug.cgi?id=193045
Reviewed by Don Olmstead.
.:
This patch adds ENABLE_UNIFIED_BUILDS option to cmake ports, which allows us to \
disable Unified Builds in WebKit. This makes `compile_commands.json` sane when the \
unified builds is disabled, and various tools can use this compilation database. For \
example, YouCompleteMe completion server can use it.
* Source/cmake/WebKitFeatures.cmake:
* Source/cmake/WebKitMacros.cmake:
Source/WTF:
* Scripts/generate-unified-source-bundles.rb:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFScriptsgenerateunifiedsourcebundlesrb">trunk/Source/WTF/Scripts/generate-unified-source-bundles.rb</a></li>
<li><a href="#trunkSourcecmakeWebKitFeaturescmake">trunk/Source/cmake/WebKitFeatures.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitMacroscmake">trunk/Source/cmake/WebKitMacros.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (239560 => 239561)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2018-12-30 20:53:48 UTC (rev 239560)
+++ trunk/ChangeLog 2018-12-30 21:19:09 UTC (rev 239561)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2018-12-28 Yusuke Suzuki <yusukesuzuki@slowstart.org>
+
+ Add ENABLE_UNIFIED_BUILDS option to cmake ports
+ https://bugs.webkit.org/show_bug.cgi?id=193045
+
+ Reviewed by Don Olmstead.
+
+ This patch adds ENABLE_UNIFIED_BUILDS option to cmake ports, which allows us \
to disable Unified Builds in WebKit. + This makes `compile_commands.json` sane \
when the unified builds is disabled, and various tools can use this + \
compilation database. For example, YouCompleteMe completion server can use it. +
+ * Source/cmake/WebKitFeatures.cmake:
+ * Source/cmake/WebKitMacros.cmake:
+
</ins><span class="cx"> 2018-12-27 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Resurrect Mac CMake build
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (239560 => 239561)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2018-12-30 20:53:48 UTC (rev \
239560)
+++ trunk/Source/WTF/ChangeLog 2018-12-30 21:19:09 UTC (rev 239561)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2018-12-28 Yusuke Suzuki <yusukesuzuki@slowstart.org>
+
+ Add ENABLE_UNIFIED_BUILDS option to cmake ports
+ https://bugs.webkit.org/show_bug.cgi?id=193045
+
+ Reviewed by Don Olmstead.
+
+ * Scripts/generate-unified-source-bundles.rb:
+
</ins><span class="cx"> 2018-12-27 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Resurrect Mac CMake build
</span></span></pre></div>
<a id="trunkSourceWTFScriptsgenerateunifiedsourcebundlesrb"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WTF/Scripts/generate-unified-source-bundles.rb (239560 => 239561)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WTF/Scripts/generate-unified-source-bundles.rb 2018-12-30 20:53:48 UTC \
(rev 239560)
+++ trunk/Source/WTF/Scripts/generate-unified-source-bundles.rb 2018-12-30 21:19:09 \
UTC (rev 239561) </span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> puts
</span><span class="cx"> puts "Optional arguments:"
</span><span class="cx"> puts "--print-bundled-sources Print \
bundled sources rather than generating sources" </span><ins>+ puts \
"--print-all-sources Print all sources rather than generating \
sources" </ins><span class="cx"> puts "--generate-xcfilelists \
Generate .xcfilelist files" </span><span class="cx"> puts \
"--input-xcfilelist-path Path of the generated input .xcfilelist \
file" </span><span class="cx"> puts "--output-xcfilelist-path \
Path of the generated output .xcfilelist file" </span><span class="lines">@@ \
-78,6 +79,7 @@ </span><span class="cx"> ['--source-tree-path', '-s', \
GetoptLong::REQUIRED_ARGUMENT], </span><span class="cx"> \
['--feature-flags', '-f', GetoptLong::REQUIRED_ARGUMENT], </span><span class="cx"> \
['--print-bundled-sources', GetoptLong::NO_ARGUMENT], </span><ins>+ \
['--print-all-sources', GetoptLong::NO_ARGUMENT], </ins><span class="cx"> \
['--generate-xcfilelists', GetoptLong::NO_ARGUMENT], </span><span class="cx"> \
['--input-xcfilelist-path', GetoptLong::REQUIRED_ARGUMENT], </span><span class="cx"> \
['--output-xcfilelist-path', GetoptLong::REQUIRED_ARGUMENT], </span><span \
class="lines">@@ -98,6 +100,8 @@ </span><span class="cx"> arg.gsub(/\s+/, \
";").split(";").map { |x| $featureFlags[x] = true } </span><span \
class="cx"> when '--print-bundled-sources' </span><span class="cx"> $mode \
= :PrintBundledSources </span><ins>+ when '--print-all-sources'
+ $mode = :PrintAllSources
</ins><span class="cx"> when '--generate-xcfilelists'
</span><span class="cx"> $mode = :GenerateXCFilelists
</span><span class="cx"> when '--input-xcfilelist-path'
</span><span class="lines">@@ -323,6 +327,8 @@
</span><span class="cx"> case $mode
</span><span class="cx"> when :GenerateBundles, :GenerateXCFilelists
</span><span class="cx"> ProcessFileForUnifiedSourceGeneration(sourceFile)
</span><ins>+ when :PrintAllSources
+ $generatedSources << sourceFile
</ins><span class="cx"> when :PrintBundledSources
</span><span class="cx"> $generatedSources << sourceFile if \
$bundleManagers[sourceFile.path.extname] && sourceFile.unifiable </span><span \
class="cx"> end </span></span></pre></div>
<a id="trunkSourcecmakeWebKitFeaturescmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFeatures.cmake (239560 => \
239561)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitFeatures.cmake 2018-12-30 20:53:48 \
UTC (rev 239560)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2018-12-30 21:19:09 UTC (rev 239561)
</span><span class="lines">@@ -192,6 +192,7 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_TEXT_AUTOSIZING "Toggle \
automatic text size adjustment support" PRIVATE OFF) </span><span class="cx"> \
WEBKIT_OPTION_DEFINE(ENABLE_TOUCH_EVENTS "Toggle Touch Events support" \
PRIVATE OFF) </span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_TOUCH_SLIDER \
"Toggle Touch Slider support" PRIVATE OFF) </span><ins>+ \
WEBKIT_OPTION_DEFINE(ENABLE_UNIFIED_BUILDS "Toggle unified builds" PRIVATE \
ON) </ins><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_USERSELECT_ALL \
"Toggle user-select:all support" PRIVATE ON) </span><span class="cx"> \
WEBKIT_OPTION_DEFINE(ENABLE_USER_MESSAGE_HANDLERS "Toggle user script message \
handler support" PRIVATE ON) </span><span class="cx"> \
WEBKIT_OPTION_DEFINE(ENABLE_VARIATION_FONTS "Toggle variation fonts \
support" PRIVATE OFF) </span></span></pre></div>
<a id="trunkSourcecmakeWebKitMacroscmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitMacros.cmake (239560 => \
239561)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitMacros.cmake 2018-12-30 20:53:48 UTC \
(rev 239560)
+++ trunk/Source/cmake/WebKitMacros.cmake 2018-12-30 21:19:09 UTC (rev 239561)
</span><span class="lines">@@ -16,41 +16,59 @@
</span><span class="cx"> set(WTF_SCRIPTS_DIR \
"${FORWARDING_HEADERS_DIR}/wtf/Scripts") </span><span class="cx"> endif \
() </span><span class="cx">
</span><del>- execute_process(COMMAND ${RUBY_EXECUTABLE} \
${WTF_SCRIPTS_DIR}/generate-unified-source-bundles.rb
- "--derived-sources-path" \
"${DERIVED_SOURCES_DIR}/${_framework}"
- "--source-tree-path" ${CMAKE_CURRENT_SOURCE_DIR}
- "--print-bundled-sources"
- "--feature-flags" \
"${UNIFIED_SOURCE_LIST_ENABLED_FEATURES}"
- ${_sourceListFileTruePaths}
- RESULT_VARIABLE _resultTmp
- OUTPUT_VARIABLE _outputTmp)
</del><ins>+ if (ENABLE_UNIFIED_BUILDS)
+ execute_process(COMMAND ${RUBY_EXECUTABLE} \
${WTF_SCRIPTS_DIR}/generate-unified-source-bundles.rb + \
"--derived-sources-path" "${DERIVED_SOURCES_DIR}/${_framework}" + \
"--source-tree-path" ${CMAKE_CURRENT_SOURCE_DIR} + \
"--print-bundled-sources" + "--feature-flags" \
"${UNIFIED_SOURCE_LIST_ENABLED_FEATURES}" + \
${_sourceListFileTruePaths} + RESULT_VARIABLE _resultTmp
+ OUTPUT_VARIABLE _outputTmp)
</ins><span class="cx">
</span><del>- if (${_resultTmp})
- message(FATAL_ERROR "generate-unified-source-bundles.rb exited with \
non-zero status, exiting")
- endif ()
</del><ins>+ if (${_resultTmp})
+ message(FATAL_ERROR "generate-unified-source-bundles.rb exited \
with non-zero status, exiting") + endif ()
</ins><span class="cx">
</span><del>- foreach (_sourceFileTmp IN LISTS _outputTmp)
- set_source_files_properties(${_sourceFileTmp} PROPERTIES HEADER_FILE_ONLY \
ON)
- list(APPEND ${_framework}_HEADERS ${_sourceFileTmp})
- endforeach ()
- unset(_sourceFileTmp)
</del><ins>+ foreach (_sourceFileTmp IN LISTS _outputTmp)
+ set_source_files_properties(${_sourceFileTmp} PROPERTIES \
HEADER_FILE_ONLY ON) + list(APPEND ${_framework}_HEADERS \
${_sourceFileTmp}) + endforeach ()
+ unset(_sourceFileTmp)
</ins><span class="cx">
</span><del>- execute_process(COMMAND ${RUBY_EXECUTABLE} \
${WTF_SCRIPTS_DIR}/generate-unified-source-bundles.rb
- "--derived-sources-path" \
"${DERIVED_SOURCES_DIR}/${_framework}"
- "--source-tree-path" ${CMAKE_CURRENT_SOURCE_DIR}
- "--feature-flags" \
"${UNIFIED_SOURCE_LIST_ENABLED_FEATURES}"
- ${_sourceListFileTruePaths}
- RESULT_VARIABLE _resultTmp
- OUTPUT_VARIABLE _outputTmp)
</del><ins>+ execute_process(COMMAND ${RUBY_EXECUTABLE} \
${WTF_SCRIPTS_DIR}/generate-unified-source-bundles.rb + \
"--derived-sources-path" "${DERIVED_SOURCES_DIR}/${_framework}" + \
"--source-tree-path" ${CMAKE_CURRENT_SOURCE_DIR} + \
"--feature-flags" "${UNIFIED_SOURCE_LIST_ENABLED_FEATURES}" + \
${_sourceListFileTruePaths} + RESULT_VARIABLE _resultTmp
+ OUTPUT_VARIABLE _outputTmp)
</ins><span class="cx">
</span><del>- if (${_resultTmp})
- message(FATAL_ERROR "generate-unified-source-bundles.rb exited with \
non-zero status, exiting") </del><ins>+ if (${_resultTmp})
+ message(FATAL_ERROR "generate-unified-source-bundles.rb exited with \
non-zero status, exiting") + endif ()
+
+ list(APPEND ${_framework}_SOURCES ${_outputTmp})
+ unset(_resultTmp)
+ unset(_outputTmp)
+ else ()
+ execute_process(COMMAND ${RUBY_EXECUTABLE} \
${WTF_SCRIPTS_DIR}/generate-unified-source-bundles.rb + \
"--derived-sources-path" "${DERIVED_SOURCES_DIR}/${_framework}" + \
"--source-tree-path" ${CMAKE_CURRENT_SOURCE_DIR} + \
"--print-all-sources" + "--feature-flags" \
"${UNIFIED_SOURCE_LIST_ENABLED_FEATURES}" + \
${_sourceListFileTruePaths} + RESULT_VARIABLE _resultTmp
+ OUTPUT_VARIABLE _outputTmp)
+
+ if (${_resultTmp})
+ message(FATAL_ERROR "generate-unified-source-bundles.rb exited \
with non-zero status, exiting") + endif ()
+
+ list(APPEND ${_framework}_SOURCES ${_outputTmp})
+ unset(_resultTmp)
+ unset(_outputTmp)
</ins><span class="cx"> endif ()
</span><del>-
- list(APPEND ${_framework}_SOURCES ${_outputTmp})
- unset(_platformSourcesFile)
- unset(_resultTmp)
- unset(_outputTmp)
</del><span class="cx"> endmacro()
</span><span class="cx">
</span><span class="cx"> macro(WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS)
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic