diff options
| -rwxr-xr-x | bin/nim-gdb | 20 | ||||
| l--------- | bin/nim-gdb.bash | 1 | ||||
| -rw-r--r-- | bin/nim-gdb.bat | 6 |
3 files changed, 11 insertions, 16 deletions
diff --git a/bin/nim-gdb b/bin/nim-gdb index e6e3a1c49..b9956073b 100755 --- a/bin/nim-gdb +++ b/bin/nim-gdb @@ -5,25 +5,23 @@ set -e which nim > /dev/null || (echo "nim not in PATH"; exit 1) which gdb > /dev/null || (echo "gdb not in PATH"; exit 1) -which readlink > /dev/null || which greadlink > /dev/null || (echo "readlink not in PATH. Please install coreutils from brew if on Mac."; exit 1) -nreadlink () { - (which greadlink > /dev/null && greadlink "$@") || (which readlink > /dev/null && readlink "$@") || echo "Readlink could not be found" -} +if [[ "$(uname -s)" == "Darwin" ]]; then + which greadlink > /dev/null || (echo "readlink not in PATH. Please install coreutils from homebrew."; exit 1) + READLINK=greadlink +else + which readlink > /dev/null || (echo "readlink not in PATH."; exit 1) + READLINK=readlink +fi # Find out where the pretty printer Python module is -NIM_SYSROOT=$(dirname $(dirname $(nreadlink -e $(which nim)))) +NIM_SYSROOT=$(dirname $(dirname $($READLINK -e $(which nim)))) GDB_PYTHON_MODULE_PATH="$NIM_SYSROOT/tools/nim-gdb.py" # Run GDB with the additional arguments that load the pretty printers # Set the environment variable `NIM_GDB` to overwrite the call to a # different/specific command (defaults to `gdb`). NIM_GDB="${NIM_GDB:-gdb}" - -# This is needed for some reason. I can't get -eval-command to work ever -echo "source $GDB_PYTHON_MODULE_PATH" > gdbcommands.txt # exec replaces the new process of bash with gdb. It is always good to # have fewer processes. -exec ${NIM_GDB} --command="gdbcommands.txt" "$@" - -rm gdbcommands.txt +exec "${NIM_GDB}" -eval-command="source $GDB_PYTHON_MODULE_PATH" "$@" diff --git a/bin/nim-gdb.bash b/bin/nim-gdb.bash new file mode 120000 index 000000000..f6eba4b0c --- /dev/null +++ b/bin/nim-gdb.bash @@ -0,0 +1 @@ +nim-gdb \ No newline at end of file diff --git a/bin/nim-gdb.bat b/bin/nim-gdb.bat index 58b66b61f..453d700bd 100644 --- a/bin/nim-gdb.bat +++ b/bin/nim-gdb.bat @@ -6,11 +6,7 @@ for %%i in ("%NIM_BIN%\..\") do (set NIM_ROOT=%%~fi) set @GDB_PYTHON_MODULE_PATH=%NIM_ROOT%\tools\nim-gdb.py set @NIM_GDB=gdb.exe -@echo source %@GDB_PYTHON_MODULE_PATH%> wingdbcommand.txt - -%@NIM_GDB% --command="wingdbcommand.txt" %* - -del wingdbcommand.txt /f /q +%@NIM_GDB% -eval-command="source %@GDB_PYTHON_MODULE_PATH%" %* EXIT /B %ERRORLEVEL% @echo on |