.vscode/vs-code-template.code-workspace.in | 3 +--
bin/gbuild-to-ide | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit df092b591a7d107263f3fad817404f92b3cd7c03
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Wed Nov 30 11:30:23 2022 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Mon Dec 5 13:54:00 2022 +0000
create compile_commands.json in builddir
assuming that nothing breaks for existing users of the
compile_commands.json file, since they assume BUILDDIR=SRCDIR, so
nothing will change in those cases.
For building in a different directory than the source, the
compile_commands.json file is the only thing that regularly clobbers my
otherwise pristine SRCROOT
Change-Id: I344afa0bc7bb3eaa1eb888cd3558d3602090af5f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143571
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/.vscode/vs-code-template.code-workspace.in
b/.vscode/vs-code-template.code-workspace.in
index f6078155e8dc..87a6a27ac865 100644
--- a/.vscode/vs-code-template.code-workspace.in
+++ b/.vscode/vs-code-template.code-workspace.in
@@ -35,8 +35,7 @@
"files.associations": {
"*.patch.[0-9]": "diff"
},
- // FIXME: arguably the generator should place it in the
builddir, not srcdir
- "C_Cpp.default.compileCommands":
"${workspaceFolder:srcdir}/compile_commands.json",
+ "C_Cpp.default.compileCommands":
"@BUILDDIR@/compile_commands.json",
// only used if the file doesn't match anything in the
compile_commands.json - aka externals
// libxml includes just added as example/for reference
"C_Cpp.default.includePath": [
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 26f0c87f6855..b56cff8585ea 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -549,7 +549,7 @@ class VimIntegrationGenerator(IdeIntegrationGenerator):
entry = {'directory': lib.location, 'file': filePath,
'command': self.generateCommand(lib, filePath)}
entries.append(entry)
global_list.extend(entries)
- with open('compile_commands.json', 'w') as export_file:
+ with open(os.path.join(self.gbuildparser.builddir,
'compile_commands.json'), 'w') as export_file:
json.dump(global_list, export_file)
def generateCommand(self, lib, file):
