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>
This commit is contained in:
Christian Lohmaier 2023-04-05 12:32:58 +02:00
parent 11a25339ab
commit e39d4921bc
2 changed files with 59 additions and 37 deletions

View File

@ -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"
}
}
],

View File

@ -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