diff options
author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2023-04-05 12:32:58 +0200 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2023-04-18 14:30:11 +0200 |
commit | e39d4921bcd06836d5b28dc23628da41bcf463f7 (patch) | |
tree | e5607afa7b3813d59d3b78aeb28c83c70d4c1acb | |
parent | 11a25339abfb957ea51614b67bbff26cb606f3a2 (diff) |
vscode: add Cygwin terminal profile and config for VS debugger for Windows
and also fix the gdb helper path for linux in one of the launch
configurations, it used instdir for both the solenv as well as instdir
paths.
Change-Id: I2d2ad955e4c1d386071edc50af8fd0bdcffc66e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150051
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-rw-r--r-- | .vscode/vs-code-template.code-workspace.in | 93 | ||||
-rw-r--r-- | configure.ac | 3 |
2 files changed, 59 insertions, 37 deletions
diff --git a/.vscode/vs-code-template.code-workspace.in b/.vscode/vs-code-template.code-workspace.in index 87a6a27ac865..52f83afc15cc 100644 --- a/.vscode/vs-code-template.code-workspace.in +++ b/.vscode/vs-code-template.code-workspace.in @@ -59,7 +59,20 @@ "prefix": "tdf#", "url": "https://bugs.documentfoundation.org/show_bug.cgi?id=<num>" } - ] + ], + "terminal.integrated.profiles.windows": { + "Cygwin": { + "path": "@CYGWIN_BASH@", + "args": [ + "--login" + ], + // prevent changing to $(HOME) + "env": { + "CHERE_INVOKING": "1" + } + } + }, + "terminal.integrated.defaultProfile.windows": "Cygwin" }, "tasks": { "version": "2.0.0", @@ -137,26 +150,26 @@ } ], "externalConsole": false, - "MIMode": "gdb", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "-enable-pretty-printing", - "ignoreFailures": true - }, - { - "description": "Mark pretty-printers (in solenv/gdb) safe", - "text": "add-auto-load-safe-path @INSTROOT@", - "ignoreFailures": true - }, - { - "description": "Mark pretty-printers bootstrap (in instdir/program) safe", - "text": "add-auto-load-safe-path @INSTROOT@", - "ignoreFailures": true - }, - ], "linux": { + "MIMode": "gdb", "miDebuggerPath": "gdb" + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": true + }, + { + "description": "Mark pretty-printers (in solenv/gdb) safe", + "text": "add-auto-load-safe-path @SRC_ROOT@/solenv/gdb", + "ignoreFailures": true + }, + { + "description": "Mark pretty-printers bootstrap (in instdir/program) safe", + "text": "add-auto-load-safe-path @INSTROOT@", + "ignoreFailures": true + }, + ] }, "osx": { "program": "@INSTROOT@/MacOS/soffice", @@ -169,6 +182,9 @@ } ] }, + "windows": { + "type": "cppvsdbg" + }, "preLaunchTask": "full make" }, { @@ -192,26 +208,26 @@ } ], "externalConsole": false, - "MIMode": "gdb", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "-enable-pretty-printing", - "ignoreFailures": true - }, - { - "description": "Mark pretty-printers (in solenv/gdb) safe", - "text": "add-auto-load-safe-path ${workspaceFolder:srcdir}", - "ignoreFailures": true - }, - { - "description": "Mark pretty-printers bootstrap (in instdir/program) safe", - "text": "add-auto-load-safe-path @INSTROOT@", - "ignoreFailures": true - }, - ], "linux": { + "MIMode": "gdb", "miDebuggerPath": "gdb" + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": true + }, + { + "description": "Mark pretty-printers (in solenv/gdb) safe", + "text": "add-auto-load-safe-path @SRC_ROOT@/solenv/gdb", + "ignoreFailures": true + }, + { + "description": "Mark pretty-printers bootstrap (in instdir/program) safe", + "text": "add-auto-load-safe-path @INSTROOT@", + "ignoreFailures": true + }, + ] }, "osx": { "program": "@INSTROOT@/MacOS/soffice", @@ -223,6 +239,9 @@ "ignoreFailures": false } ] + }, + "windows": { + "type": "cppvsdbg" } } ], diff --git a/configure.ac b/configure.ac index 87c42a10f5cb..1958191469a6 100644 --- a/configure.ac +++ b/configure.ac @@ -14676,10 +14676,13 @@ if test -n "$TMPDIR"; then else TEMP_DIRECTORY="/tmp" fi +CYGWIN_BASH="C:/cygwin64/bin/bash.exe" if test "$build_os" = "cygwin"; then TEMP_DIRECTORY=`cygpath -m "$TEMP_DIRECTORY"` + CYGWIN_BASH=`cygpath -m /usr/bin/bash` fi AC_SUBST(TEMP_DIRECTORY) +AC_SUBST(CYGWIN_BASH) # setup the PATH for the environment if test -n "$LO_PATH_FOR_BUILD"; then |