[Libreoffice-commits] core.git: bin/gbuild-to-ide

[Miklos Vajna]

 bin/gbuild-to-ide |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bf7168bd09a8ae4e0f39f28d74a1d0eaf1411a9d
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Jan 30 12:34:39 2017 +0100

    gbuild-to-ide: fix VimIntegrationGenerator
    
    Regression from commit 92c2c5f62d6e8962259e03424a40b6ac7ef32e7d
    (gbuild-to-ide: moduleDict targets -> all paths replaced with relative,
    2017-01-24), <https://clang.llvm.org/docs/JSONCompilationDatabase.html>
    says about the "directory" key of one entry:
    
    "All paths specified in the command or file fields must be either
    absolute or relative to this directory."
    
    So making the includes relative to the toplevel directory won't fly,
    make them absolute.
    
    Change-Id: I3f33c7a21880c1b245580b22996079ba08e3d806
    Reviewed-on: https://gerrit.libreoffice.org/33694
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index e19005a..9a8ce8a 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -1118,7 +1118,7 @@ class VimIntegrationGenerator(IdeIntegrationGenerator):
 
         for include in lib['include']:
             command += ' -I'
-            command += include
+            command += os.path.abspath(include)
         for isystem in lib['include_sys']:
             command += ' -isystem '
             command += isystem