<!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>[160531] 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/160531">160531</a></dd>
<dt>Author</dt> <dd>mrobinson@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-13 00:16:37 -0800 (Fri, 13 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adding a .ycm_extra_conf file for webkitGtk
https://bugs.webkit.org/show_bug.cgi?id=119618
Patch by Martin Robinson <mrobinson@igalia.com> and Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk> on 2013-12-11
Reviewed by Gustavo Noronha Silva.
Added a YouCompleteMe flag discovery script for Vim and the GTK+ port. The script
read the GTK+ build files to determine dynamically what flags to compile a source
file with. This allows Vim to provide auto-complete for C++/C language. See
https://github.com/Valloric/YouCompleteMe for how to use this file.
.:
* .gitignore: Ignore the YCM symlinks in the tree.
Tools:
* gtk/common.py:
(get_build_path): Added a fatal argument to build_path to avoid crashing YCM on failure.
* gtk/ycm_extra_conf.py: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgitignore">trunk/.gitignore</a></li>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsgtkcommonpy">trunk/Tools/gtk/common.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<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="trunkgitignore"></a>
<div class="modfile"><h4>Modified: trunk/.gitignore (160530 => 160531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/.gitignore 2013-12-13 07:22:52 UTC (rev 160530)
+++ trunk/.gitignore 2013-12-13 08:16:37 UTC (rev 160531)
</span><span class="lines">@@ -117,3 +117,6 @@
</span><span class="cx"> .project
</span><span class="cx"> .cproject
</span><span class="cx"> .settings
</span><ins>+
+# Ignore YouCompleteMe symlinks
+.ycm_extra_conf.py
</ins></span></pre></div>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (160530 => 160531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2013-12-13 07:22:52 UTC (rev 160530)
+++ trunk/ChangeLog 2013-12-13 08:16:37 UTC (rev 160531)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2013-12-11 Martin Robinson <mrobinson@igalia.com> and Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+
+ Adding a .ycm_extra_conf file for webkitGtk
+ https://bugs.webkit.org/show_bug.cgi?id=119618
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Added a YouCompleteMe flag discovery script for Vim and the GTK+ port. The script
+ read the GTK+ build files to determine dynamically what flags to compile a source
+ file with. This allows Vim to provide auto-complete for C++/C language. See
+ https://github.com/Valloric/YouCompleteMe for how to use this file.
+
+ * .gitignore: Ignore the YCM symlinks in the tree.
+
</ins><span class="cx"> 2013-12-12 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Use of ar T option not supported by older binutils
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (160530 => 160531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-13 07:22:52 UTC (rev 160530)
+++ trunk/Tools/ChangeLog 2013-12-13 08:16:37 UTC (rev 160531)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2013-12-11 Martin Robinson <mrobinson@igalia.com> and Danilo Cesar Lemes de Paula <danilo.cesar@collabora.co.uk>
+
+ Adding a .ycm_extra_conf file for webkitGtk
+ https://bugs.webkit.org/show_bug.cgi?id=119618
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Added a YouCompleteMe flag discovery script for Vim and the GTK+ port. The script
+ read the GTK+ build files to determine dynamically what flags to compile a source
+ file with. This allows Vim to provide auto-complete for C++/C language. See
+ https://github.com/Valloric/YouCompleteMe for how to use this file.
+
+ * gtk/common.py:
+ (get_build_path): Added a fatal argument to build_path to avoid crashing YCM on failure.
+ * gtk/ycm_extra_conf.py: Added.
+
</ins><span class="cx"> 2013-12-12 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> [wk2] Handle pinch-to-zoom gesture
</span></span></pre></div>
<a id="trunkToolsgtkcommonpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/common.py (160530 => 160531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/common.py 2013-12-13 07:22:52 UTC (rev 160530)
+++ trunk/Tools/gtk/common.py 2013-12-13 08:16:37 UTC (rev 160531)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> return os.path.join(*((os.path.join(os.path.dirname(__file__), '..', '..'),) + args))
</span><span class="cx">
</span><span class="cx">
</span><del>-def get_build_path(build_types=('Release', 'Debug')):
</del><ins>+def get_build_path(build_types=('Release', 'Debug'), fatal=True):
</ins><span class="cx"> global build_dir
</span><span class="cx"> if build_dir:
</span><span class="cx"> return build_dir
</span><span class="lines">@@ -76,7 +76,8 @@
</span><span class="cx"> return build_dir
</span><span class="cx">
</span><span class="cx"> print('Could not determine build directory.')
</span><del>- sys.exit(1)
</del><ins>+ if fatal:
+ sys.exit(1)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def build_path_for_build_types(build_types, *args):
</span></span></pre></div>
<a id="trunkToolsgtkycm_extra_confpy"></a>
<div class="addfile"><h4>Added: trunk/Tools/gtk/ycm_extra_conf.py (0 => 160531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/ycm_extra_conf.py (rev 0)
+++ trunk/Tools/gtk/ycm_extra_conf.py 2013-12-13 08:16:37 UTC (rev 160531)
</span><span class="lines">@@ -0,0 +1,151 @@
</span><ins>+#!/usr/bin/env python
+# Copyright (C) 2013 Danilo Cesar Lemes de Paula <danilo.eu@gmail.com>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import os
+import re
+import subprocess
+import sys
+
+# It's very likely that this script is a symlink somewhere in the WebKit directory,
+# so we try to find the actual script location so that we can locate the tools
+# directory.
+if os.path.islink(__file__):
+ __tools_directory = os.path.dirname(os.readlink(__file__))
+else:
+ __tools_directory = os.path.dirname(__file__)
+sys.path.insert(0, os.path.abspath(__tools_directory))
+import common
+
+MAKE_TRACE_FILE_NAME = "ycm-make-trace"
+FLAGS_PRECEDING_PATHS = ['-isystem', '-I', '-iquote', '--sysroot=']
+
+
+def transform_relative_paths_to_absolute_paths(arguments, build_path):
+ result = []
+
+ make_next_absolute = False
+ for argument in arguments:
+ if make_next_absolute:
+ make_next_absolute = False
+ if not argument.startswith('/'):
+ argument = os.path.join(build_path, argument)
+ elif flag in FLAGS_PRECEDING_PATHS:
+ # Some flags precede the path in the list. For those we make the
+ # next argument absolute.
+ if argument == flag:
+ make_next_absolute = True
+ else:
+ # Some argument contain the flag and the path together. For these
+ # we parse the argument out of the path.
+ for flag in FLAGS_PRECEDING_PATHS:
+ if argument.startswith(flag):
+ argument = flag + os.path.join(build_path, argument[len(flag):])
+ break
+
+ result.append(argument)
+ return result
+
+
+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 []
+
+
+def FlagsForFile(filename, **kwargs):
+ """This is the main entry point for YCM. Its interface is fixed.
+
+ Args:
+ filename: (String) Path to source file being edited.
+
+ Returns:
+ (Dictionary)
+ 'flags': (List of Strings) Command line flags.
+ 'do_cache': (Boolean) True if the result should be cached.
+ """
+
+ result = {'flags': ['-std=c++11', '-x', 'c++'], 'do_cache': True}
+
+ # Headers can't be built, so we get the source file flags instead.
+ if filename.endswith('.h'):
+ filename = filename[:-2] + ".cpp"
+ if not os.path.exists(filename):
+ return result
+
+ # Force config.h file inclusion, for GLib macros.
+ result['flags'].append("-includeconfig.h")
+
+ build_path = common.get_build_path(fatal=False)
+ if not build_path:
+ print "Could not find WebKit build path."
+ return result
+
+ if not ensure_make_trace_file(build_path):
+ print "Could not create make trace file"
+ return result
+
+ result['flags'].extend(get_compilation_flags_for_file(build_path, filename))
+ return result
+
+if __name__ == "__main__":
+ import sys
+ if len(sys.argv) >= 2:
+ print FlagsForFile(sys.argv[1])
</ins><span class="cx">Property changes on: trunk/Tools/gtk/ycm_extra_conf.py
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
</div>
</body>
</html>