configure.ac | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
New commits: commit 9f8e5bbbd11210f4958191af9b454d281c545566 Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> AuthorDate: Mon Jan 20 14:33:47 2025 +0100 Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> CommitDate: Wed Jan 22 18:59:44 2025 +0100 vscode-ide: use windows-style paths and Git Bash in wsl-as-helper case This way automatic creation of a terminal for the build-tasks uses git-bash and also the paths to the executable can be found. Change-Id: I4871dc13e467927be3d82f1129fb39aa8d6925d4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180512 Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Tested-by: Jenkins (cherry picked from commit 72beaf19974e71abb5f3e9ef99dc7455b6323899) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180558 diff --git a/configure.ac b/configure.ac index 2a2dc4e4899b..d3546944e40f 100644 --- a/configure.ac +++ b/configure.ac @@ -15875,13 +15875,20 @@ AC_CONFIG_FILES([ sysui/desktop/macosx/Info.plist hardened_runtime.xcent:sysui/desktop/macosx/hardened_runtime.xcent.in lo.xcent:sysui/desktop/macosx/lo.xcent.in - vs-code.code-workspace.template:.vscode/vs-code-template.code-workspace.in]) + ]) # map unix-style mount dirs to windows directories: /mnt/c/foobar -> C:/foobar # easier to do it in a postprocessing command than to modify every single variable AC_CONFIG_FILES([config_host.mk], [ if test -n "$WSL_ONLY_AS_HELPER"; then sed -i -e 's#/mnt/\([[:alpha:]]\)/#\u:/#g' config_host.mk fi], [WSL_ONLY_AS_HELPER=$WSL_ONLY_AS_HELPER]) +# also use windows paths in the vs-code workspace file (esp. for the launch configurations that use +# INSTROOT) and also change the default shell from Cygwin to Git Bash +AC_CONFIG_FILES([vs-code.code-workspace.template:.vscode/vs-code-template.code-workspace.in], [ + if test -n "$WSL_ONLY_AS_HELPER"; then + sed -i -e 's#/mnt/\([[:alpha:]]\)/#\u:/#g' \ + -e '/defaultProfile/s#Cygwin#Git Bash#' vs-code.code-workspace.template + fi], [WSL_ONLY_AS_HELPER=$WSL_ONLY_AS_HELPER]) AC_CONFIG_HEADERS([config_host/config_atspi.h]) AC_CONFIG_HEADERS([config_host/config_buildconfig.h])