.vscode/vs-code-template.code-workspace.in | 29 +++++++++++++++++------------ configure.ac | 1 + 2 files changed, 18 insertions(+), 12 deletions(-)
New commits: commit 17e8dbead42e2d4b55815b1b7b2846b03d62a15d Author: Christian Lohmaier <[email protected]> AuthorDate: Wed May 28 13:15:45 2025 +0200 Commit: Christian Lohmaier <[email protected]> CommitDate: Wed May 28 19:59:34 2025 +0200 vscode: make the build target prompt for a target it remembers the previous target, so should be more helpful than having to e.g. type "make module" repeatedly Change-Id: I9b2ed398a6b4efd73007dae2304790fa63760b1d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185961 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <[email protected]> diff --git a/.vscode/vs-code-template.code-workspace.in b/.vscode/vs-code-template.code-workspace.in index e7efdb0ba57a..b485daf31a6d 100644 --- a/.vscode/vs-code-template.code-workspace.in +++ b/.vscode/vs-code-template.code-workspace.in @@ -16,7 +16,7 @@ // BUILDDIR may be configured separate from SRCDIR "name": "builddir", "path": "@BUILDDIR@" - }, + } ], "settings": { "search.exclude": { @@ -123,6 +123,17 @@ }, "tasks": { "version": "2.0.0", + "inputs": [ + { + "type": "promptString", + "id": "makeTarget", + "description": "target to pass to the make command", + "default": "build" + } + ], + "options": { + "cwd": "@BUILDDIR@" + }, "tasks": [ { "label": "full make", @@ -133,9 +144,9 @@ "kind": "build", "isDefault": true }, - "options": { - "cwd": "@BUILDDIR@" - } + "args": [ + "${input:makeTarget}" + ] }, { "label": "create compile-commands.json", @@ -152,9 +163,6 @@ "dependsOn": [ "full make" ], - "options": { - "cwd": "@BUILDDIR@" - }, "problemMatcher": [] // don't ask when manually running the task }, { @@ -170,9 +178,6 @@ "dependsOn": [ "full make" ], - "options": { - "cwd": "@BUILDDIR@" - }, "problemMatcher": [] } ] @@ -215,7 +220,7 @@ "description": "Mark pretty-printers bootstrap (in instdir/program) safe", "text": "add-auto-load-safe-path @INSTROOT@", "ignoreFailures": true - }, + } ] }, "osx": { @@ -273,7 +278,7 @@ "description": "Mark pretty-printers bootstrap (in instdir/program) safe", "text": "add-auto-load-safe-path @INSTROOT@", "ignoreFailures": true - }, + } ] }, "osx": { commit a3b9820e5baeaa32aa06fd55f85f7165061bdd5b Author: Christian Lohmaier <[email protected]> AuthorDate: Wed May 28 12:14:52 2025 +0200 Commit: Christian Lohmaier <[email protected]> CommitDate: Wed May 28 19:59:20 2025 +0200 add meson to PERMITTED_BUILD_TARGETS Change-Id: Id51802295d875529176e7006026ef4c1d0a696db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185959 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <[email protected]> diff --git a/configure.ac b/configure.ac index 141dc3a3be34..43afec2746c0 100644 --- a/configure.ac +++ b/configure.ac @@ -6250,6 +6250,7 @@ if test "$cross_compiling" = "yes"; then LIBXML2 LIBXSLT MDDS + MESON NATIVE OPENSSL ORCUS
