<!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>[167482] trunk/Tools</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/167482">167482</a></dd>
<dt>Author</dt> <dd>changseok.oh@collabora.com</dd>
<dt>Date</dt> <dd>2014-04-17 22:05:41 -0700 (Thu, 17 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] YouCompleteMe doesn't work for cmake build system.
https://bugs.webkit.org/show_bug.cgi?id=131591
Reviewed by Martin Robinson.
Add cmake build system support for YouCompleteMe. It should work regardless of
using make or ninja. In addition, autotools related code is removed since it's
not used anymore in WebKit.
* Scripts/webkitdirs.pm:
(generateBuildSystemFromCMakeProject):
* gtk/ycm_extra_conf.py:
(transform_relative_paths_to_absolute_paths):
(FlagsForFile):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitdirspm">trunk/Tools/Scripts/webkitdirs.pm</a></li>
<li><a href="#trunkToolsgtkycm_extra_confpy">trunk/Tools/gtk/ycm_extra_conf.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (167481 => 167482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-04-18 03:51:14 UTC (rev 167481)
+++ trunk/Tools/ChangeLog 2014-04-18 05:05:41 UTC (rev 167482)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-04-17 ChangSeok Oh <changseok.oh@collabora.com>
+
+ [GTK] YouCompleteMe doesn't work for cmake build system.
+ https://bugs.webkit.org/show_bug.cgi?id=131591
+
+ Reviewed by Martin Robinson.
+
+ Add cmake build system support for YouCompleteMe. It should work regardless of
+ using make or ninja. In addition, autotools related code is removed since it's
+ not used anymore in WebKit.
+
+ * Scripts/webkitdirs.pm:
+ (generateBuildSystemFromCMakeProject):
+ * gtk/ycm_extra_conf.py:
+ (transform_relative_paths_to_absolute_paths):
+ (FlagsForFile):
+
</ins><span class="cx"> 2014-04-17 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix build.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (167481 => 167482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2014-04-18 03:51:14 UTC (rev 167481)
+++ trunk/Tools/Scripts/webkitdirs.pm 2014-04-18 05:05:41 UTC (rev 167482)
</span><span class="lines">@@ -1811,6 +1811,7 @@
</span><span class="cx"> my @args;
</span><span class="cx"> push @args, "-DPORT=\"$port\"";
</span><span class="cx"> push @args, "-DCMAKE_INSTALL_PREFIX=\"$prefixPath\"" if $prefixPath;
</span><ins>+ push @args, "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON" if isGtk();
</ins><span class="cx"> push @args, "-DSHARED_CORE=ON" if isEfl() && $ENV{"ENABLE_DRT"};
</span><span class="cx"> if ($config =~ /release/i) {
</span><span class="cx"> push @args, "-DCMAKE_BUILD_TYPE=Release";
</span></span></pre></div>
<a id="trunkToolsgtkycm_extra_confpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/ycm_extra_conf.py (167481 => 167482)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/ycm_extra_conf.py 2014-04-18 03:51:14 UTC (rev 167481)
+++ trunk/Tools/gtk/ycm_extra_conf.py 2014-04-18 05:05:41 UTC (rev 167482)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> #!/usr/bin/env python
</span><span class="cx"> # Copyright (C) 2013 Danilo Cesar Lemes de Paula <danilo.eu@gmail.com>
</span><ins>+# Copyright (C) 2014 ChangSeok Oh <shivamidow@gmail.com>
</ins><span class="cx"> #
</span><span class="cx"> # This library is free software; you can redistribute it and/or
</span><span class="cx"> # modify it under the terms of the GNU Lesser General Public
</span><span class="lines">@@ -16,9 +17,8 @@
</span><span class="cx"> # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
</span><span class="cx">
</span><span class="cx"> import os
</span><del>-import re
-import subprocess
</del><span class="cx"> import sys
</span><ins>+import ycm_core
</ins><span class="cx">
</span><span class="cx"> # It's very likely that this script is a symlink somewhere in the WebKit directory,
</span><span class="cx"> # so we try to find the actual script location so that we can locate the tools
</span><span class="lines">@@ -34,13 +34,10 @@
</span><span class="cx"> sys.path.insert(0, os.path.abspath(__tools_directory))
</span><span class="cx"> import common
</span><span class="cx">
</span><del>-MAKE_TRACE_FILE_NAME = "ycm-make-trace"
-FLAGS_PRECEDING_PATHS = ['-isystem', '-I', '-iquote', '--sysroot=']
</del><span class="cx">
</span><del>-
</del><ins>+FLAGS_PRECEDING_PATHS = ['-isystem', '-I', '-iquote', '--sysroot=']
</ins><span class="cx"> def transform_relative_paths_to_absolute_paths(arguments, build_path):
</span><span class="cx"> result = []
</span><del>-
</del><span class="cx"> make_next_absolute = False
</span><span class="cx"> for argument in arguments:
</span><span class="cx"> if make_next_absolute:
</span><span class="lines">@@ -64,56 +61,6 @@
</span><span class="cx"> return result
</span><span class="cx">
</span><span class="cx">
</span><del>-def create_make_trace_file(build_path):
- print "Creating make trace file for YouCompleteMe, might take a few seconds"
- os.chdir(build_path)
- subprocess.call("make -n -s > %s" % MAKE_TRACE_FILE_NAME, shell=True)
-
-
-def make_trace_file_up_to_date(build_path):
- trace_file = os.path.join(build_path, MAKE_TRACE_FILE_NAME)
- if not os.path.isfile(trace_file):
- return False
-
- makefile = os.path.join(build_path, 'GNUmakefile')
- if os.path.getmtime(trace_file) < os.path.getctime(makefile):
- return False
-
- return True
-
-
-def ensure_make_trace_file(build_path):
- if make_trace_file_up_to_date(build_path):
- return True
- create_make_trace_file(build_path)
- return make_trace_file_up_to_date(build_path)
-
-
-def get_compilation_flags_from_build_commandline(command_line, build_path):
- flags = re.findall("-[I,D,p,O][\w,\.,/,-]*(?:=\"?\w*\"?)?", command_line)
- return transform_relative_paths_to_absolute_paths(flags, build_path)
-
-
-def get_compilation_flags_for_file(build_path, filename):
- trace_file_path = os.path.join(build_path, MAKE_TRACE_FILE_NAME)
-
- try:
- trace_file = open(trace_file_path)
- lines = trace_file.readlines()
- trace_file.close()
- except:
- print "==== Error reading %s file", trace_file_path
- return []
-
- basename = os.path.basename(filename)
- for line in lines:
- if line.find(basename) != -1 and (line.find("CC") != -1 or line.find("CXX") != -1):
- return get_compilation_flags_from_build_commandline(line, build_path)
-
- print "Could not find flags for %s" % filename
- return []
-
-
</del><span class="cx"> def FlagsForFile(filename, **kwargs):
</span><span class="cx"> """This is the main entry point for YCM. Its interface is fixed.
</span><span class="cx">
</span><span class="lines">@@ -130,25 +77,36 @@
</span><span class="cx">
</span><span class="cx"> # Headers can't be built, so we get the source file flags instead.
</span><span class="cx"> if filename.endswith('.h'):
</span><del>- filename = filename[:-2] + ".cpp"
- if not os.path.exists(filename):
</del><ins>+ alternative_extensions = ['.cpp', '.c']
+ for alternative_extension in alternative_extensions:
+ alternative_filename = filename[:-2] + alternative_extension
+ if os.path.exists(alternative_filename):
+ filename = alternative_filename
+ break
+ else:
</ins><span class="cx"> return result
</span><del>-
</del><span class="cx"> # Force config.h file inclusion, for GLib macros.
</span><span class="cx"> result['flags'].append("-includeconfig.h")
</span><span class="cx">
</span><del>- build_path = common.get_build_path(fatal=False)
</del><ins>+ build_path = os.path.normpath(common.get_build_path(fatal=False))
</ins><span class="cx"> if not build_path:
</span><span class="cx"> print "Could not find WebKit build path."
</span><span class="cx"> return result
</span><span class="cx">
</span><del>- if not ensure_make_trace_file(build_path):
- print "Could not create make trace file"
</del><ins>+ database = ycm_core.CompilationDatabase(build_path)
+ if not database:
+ print "Could not find compile_commands.json in %s, You might forget to add CMAKE_EXPORT_COMPILE_COMMANDS=ON to cmakeargs" % build_path
</ins><span class="cx"> return result
</span><span class="cx">
</span><del>- result['flags'].extend(get_compilation_flags_for_file(build_path, filename))
</del><ins>+ compilation_info = database.GetCompilationInfoForFile(filename)
+ if not compilation_info:
+ print "No compilation info."
+ return result
+
+ result['flags'] = transform_relative_paths_to_absolute_paths(list(compilation_info.compiler_flags_), compilation_info.compiler_working_dir_)
</ins><span class="cx"> return result
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> if __name__ == "__main__":
</span><span class="cx"> import sys
</span><span class="cx"> if len(sys.argv) >= 2:
</span></span></pre>
</div>
</div>
</body>
</html>