Changeset 167667 in webkit

Timestamp:

Apr 22, 2014 10:38:15 AM (10 years ago)

Author:

ChangSeok Oh

Message:

[GTK] YCM choose a newer compile_commands.json in between Release or Debug
​https://bugs.webkit.org/show_bug.cgi?id=131911

Reviewed by Martin Robinson.

common.get_build_path returns release path even though Debug configuration
is newer than Release. So YouCompleteMe is used to refer old build setup inadvertently.

• gtk/ycm_extra_conf.py:

(get_build_path): Compare modified time of Release and Debug. And return a recent modified path.
(FlagsForFile):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• gtk/ycm_extra_conf.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-04-22  ChangSeok Oh  <changseok.oh@collabora.com>
+
+        [GTK] YCM choose a newer compile_commands.json in between Release or Debug
+        https://bugs.webkit.org/show_bug.cgi?id=131911
+
+        Reviewed by Martin Robinson.
+
+        common.get_build_path returns release path even though Debug configuration
+        is newer than Release. So YouCompleteMe is used to refer old build setup inadvertently.
+
+        * gtk/ycm_extra_conf.py:
+        (get_build_path): Compare modified time of Release and Debug. And return a recent modified path.
+        (FlagsForFile):
+
 2014-04-21  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Tools/gtk/ycm_extra_conf.py

@@ -62 +62 @@
 
 
+def get_build_path():
+    webkitbuild_path = os.path.join(common.get_build_path(fatal=False), '..')
+    if not os.path.exists(webkitbuild_path):
+        return None
+
+    release_build_path = os.path.join(webkitbuild_path, 'Release')
+    debug_build_path = os.path.join(webkitbuild_path, 'Debug')
+
+    try:
+        release_mtime = os.path.getmtime(os.path.join(release_build_path, 'compile_commands.json'))
+    except os.error:
+        release_mtime = 0
+    try:
+        debug_mtime = os.path.getmtime(os.path.join(debug_build_path, 'compile_commands.json'))
+    except os.error:
+        debug_mtime = 0
+
+    return release_build_path if release_mtime >= debug_mtime else debug_build_path
+
+
 def FlagsForFile(filename, **kwargs):
     """This is the main entry point for YCM. Its interface is fixed.
@@ -89 +109 @@
         result['flags'].append("-includeconfig.h")
 
-    build_path = os.path.normpath(common.get_build_path(fatal=False))
+    build_path = os.path.normpath(get_build_path())
     if not build_path:
         print "Could not find WebKit build path."