.vscode/vs-code-template.code-workspace.in | 6 +++---
Makefile.in | 12 +++++++++++-
configure.ac | 2 +-
3 files changed, 15 insertions(+), 5 deletions(-)
New commits:
commit 8d7e266943447a97ad09caebc263f3b2d6abdbde
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Wed Dec 15 14:21:36 2021 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Tue Dec 21 13:25:34 2021 +0100
provide a "make vscode-ide-integration" target
to be consistent with the other ide integrations and to take care of the
extra step of running "make vim-ide-integration" to create the
compile_commands.json file required by the vscode integration.
Not using the autogenerated file created by configure directly might
also spare some users from having their own additions overridden
Change-Id: Ibb269197dc84f607b28ddad03adc919864e0c040
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126860
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 fe20726afaeb..61df6099bce7 100644
--- a/.vscode/vs-code-template.code-workspace.in
+++ b/.vscode/vs-code-template.code-workspace.in
@@ -1,6 +1,6 @@
-// *** Autogenerated file - created by configure.ac ***
-// you should save the auto-generated vs-code-templates.code-workspace to a
separate file
-// to prevent your changes from being overwritten
+// *** vs-code.code-workspace.template is an autogenerated file created by
configure.ac ***
+// any changes to the vs-code.code-workspace.template file WILL BE OVERRIDDEN
+// use the vs-code.code-worskpace file (make vscode-ide-integration) for your
own edits
{
"extensions": {
"recommendations": [
diff --git a/Makefile.in b/Makefile.in
index f089fa9a0d48..bf756f205915 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -228,7 +228,7 @@ distclean : clean compilerplugins-clean
$(BUILDDIR)/instsetoo_native/util/openoffice.lst \
$(BUILDDIR)/solenv/lockfile/autoconf.h \
$(BUILDDIR)/sysui/desktop/macosx/Info.plist \
- $(BUILDDIR)/vs-code-template.code-workspace
+ $(BUILDDIR)/vs-code*.code-workspace*
$(if $(filter WNT,$(OS)),env -i PATH="$$PATH") $(FIND)
$(SRCDIR)/solenv/gdb -name \*.pyc -exec rm {} \;
#
@@ -493,6 +493,16 @@ $(foreach ide,\
eclipsecdt,\
$(eval $(call gb_Top_GbuildToIdeIntegration,$(ide))))
+# vscode integration is based on compile_commands.json, which is generated by
vim-ide-integration
+# the workspace template created by configure doesn't provide advanced/fine
grained targets but
+# rather supplies some useful settings and basic examples for run/debug
configurations
+# this target is provided primarily for consistency with the other
ide-integrations
+vscode-ide-integration: $(BUILDDIR)/vs-code.code-workspace vim-ide-integration
+
+$(BUILDDIR)/vs-code.code-workspace: $(BUILDDIR)/vs-code.code-workspace.template
+ @test -e $@ || cp $< $@ && \
+ cmp -s $@ $< || echo "ATTN: $(@F) differs from $(<F), please check
yourself for changes"
+
fuzzers: StaticLibrary_dtoa StaticLibrary_zlib StaticLibrary_libjpeg-turbo
Library_sal Library_salhelper Library_reg Library_store Library_unoidl
codemaker Library_cppu Library_i18nlangtag Library_cppuhelper
Library_comphelper StaticLibrary_ulingu StaticLibrary_findsofficepath
Library_tl Library_basegfx Library_canvastools Library_cppcanvas
Library_dbtools Library_deploymentmisc Library_editeng Library_i18nutil
Library_localebe1 Library_sax Library_sofficeapp Library_ucbhelper Rdb_services
udkapi offapi Library_icg Library_reflection Library_invocadapt
Library_bootstrap Library_introspection Library_stocservices Library_xmlreader
Library_gcc3_uno instsetoo_native StaticLibrary_boost_locale
StaticLibrary_fuzzerstubs StaticLibrary_fuzzer_core StaticLibrary_fuzzer_calc
StaticLibrary_fuzzer_draw StaticLibrary_fuzzer_writer StaticLibrary_fuzzer_math
Library_forui Library_binaryurp Library_io Library_invocation
Library_namingservice Library_proxyfac Library_uuresolver Module_ure Library_w
pftwriter Library_sb Library_file Library_avmedia Executable_pptfuzzer
Executable_cgmfuzzer Executable_ww2fuzzer Executable_ww6fuzzer
Executable_ww8fuzzer Executable_qpwfuzzer Executable_slkfuzzer
Executable_fodtfuzzer Executable_fodsfuzzer Executable_fodpfuzzer
Executable_xlsfuzzer Executable_scrtffuzzer Executable_wksfuzzer
Executable_diffuzzer Executable_docxfuzzer Executable_xlsxfuzzer
Executable_pptxfuzzer Executable_htmlfuzzer Executable_rtffuzzer
Executable_mmlfuzzer Executable_mtpfuzzer Executable_olefuzzer
Executable_lwpfuzzer Executable_hwpfuzzer Executable_wmffuzzer
Executable_dxffuzzer Executable_sftfuzzer Executable_svmfuzzer
Executable_tiffuzzer Executable_epsfuzzer Executable_jpgfuzzer
Executable_metfuzzer Executable_bmpfuzzer Executable_giffuzzer
Executable_pngfuzzer Executable_602fuzzer Executable_tgafuzzer
Executable_pcxfuzzer Executable_psdfuzzer Executable_ppmfuzzer
Executable_pcdfuzzer Executable_rasfuzzer Executable_pctfuzzer
Executable_xpmfuzzer Executable_xbm
fuzzer Executable_dbffuzzer
endif # MAKE_RESTARTS
diff --git a/configure.ac b/configure.ac
index 22f53a7c2b2c..57c3cc5ad5f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14537,7 +14537,7 @@ AC_CONFIG_FILES([config_host.mk
hardened_runtime.xcent
instsetoo_native/util/openoffice.lst
sysui/desktop/macosx/Info.plist
-
vs-code-template.code-workspace:.vscode/vs-code-template.code-workspace.in])
+
vs-code.code-workspace.template:.vscode/vs-code-template.code-workspace.in])
AC_CONFIG_HEADERS([config_host/config_buildid.h])
AC_CONFIG_HEADERS([config_host/config_box2d.h])
AC_CONFIG_HEADERS([config_host/config_clang.h])
