You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by we...@apache.org on 2017/03/24 23:15:27 UTC
[05/50] [abbrv] incubator-mynewt-core git commit: Re-add double
cmd.exe invocation.
Re-add double cmd.exe invocation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/f6951e68
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/f6951e68
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/f6951e68
Branch: refs/heads/nrf_cputime
Commit: f6951e6889d631e112d18514b891d98e42fca8ff
Parents: 9cd69a3
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Sat Mar 4 20:44:03 2017 -0800
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Fri Mar 10 13:10:54 2017 -0800
----------------------------------------------------------------------
hw/scripts/jlink.sh | 13 ++++++++++---
hw/scripts/openocd.sh | 12 ++++++++----
2 files changed, 18 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f6951e68/hw/scripts/jlink.sh
----------------------------------------------------------------------
diff --git a/hw/scripts/jlink.sh b/hw/scripts/jlink.sh
index 7b35017..5087ceb 100644
--- a/hw/scripts/jlink.sh
+++ b/hw/scripts/jlink.sh
@@ -17,6 +17,8 @@
. $CORE_PATH/hw/scripts/common.sh
+JLINK_GDB_SERVER=JLinkGDBServer
+
#
# FILE_NAME is the file to load
# FLASH_OFFSET is location in the flash
@@ -123,7 +125,7 @@ jlink_debug() {
# Launch jlink server in a separate command interpreter, to make
# sure it doesn't get killed by Ctrl-C signal from bash.
#
- $COMSPEC "/C start $JLINK_GDB_SERVER -device $JLINK_DEV -speed 4000 -if SWD -port 3333 -singlerun"
+ $COMSPEC "/C start $COMSPEC /C $JLINK_GDB_SERVER -device $JLINK_DEV -speed 4000 -if SWD -port 3333 -singlerun"
else
#
# Block Ctrl-C from getting passed to jlink server.
@@ -141,8 +143,13 @@ jlink_debug() {
fi
echo "$EXTRA_GDB_CMDS" >> $GDB_CMD_FILE
- arm-none-eabi-gdb -x $GDB_CMD_FILE $FILE_NAME
- rm $GDB_CMD_FILE
+ if [ $WINDOWS -eq 1 ]; then
+ FILE_NAME=`echo $FILE_NAME | sed 's/\//\\\\/g'`
+ $COMSPEC "/C start $COMSPEC /C arm-none-eabi-gdb -x $GDB_CMD_FILE $FILE_NAME"
+ else
+ arm-none-eabi-gdb -x $GDB_CMD_FILE $FILE_NAME
+ rm $GDB_CMD_FILE
+ fi
else
$JLINK_GDB_SERVER -device $JLINK_DEV -speed 4000 -if SWD -port 3333 -singlerun
fi
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f6951e68/hw/scripts/openocd.sh
----------------------------------------------------------------------
diff --git a/hw/scripts/openocd.sh b/hw/scripts/openocd.sh
index a20e451..12e5e32 100644
--- a/hw/scripts/openocd.sh
+++ b/hw/scripts/openocd.sh
@@ -84,8 +84,7 @@ openocd_debug () {
# it doesn't get killed by Ctrl-C signal from bash.
#
CFG=`echo $CFG | sed 's/\//\\\\/g'`
- echo $CFG
- $COMSPEC "/C start openocd openocd $CFG -f $OCD_CMD_FILE -c init -c halt"
+ $COMSPEC "/C start $COMSPEC /C openocd -l openocd.log $CFG -f $OCD_CMD_FILE -c init -c halt"
else
#
# Block Ctrl-C from getting passed to openocd.
@@ -101,8 +100,13 @@ openocd_debug () {
if [ ! -z "$RESET" ]; then
echo "mon reset halt" >> $GDB_CMD_FILE
fi
- arm-none-eabi-gdb -x $GDB_CMD_FILE $FILE_NAME
- rm $GDB_CMD_FILE
+ if [ $WINDOWS -eq 1 ]; then
+ FILE_NAME=`echo $FILE_NAME | sed 's/\//\\\\/g'`
+ $COMSPEC "/C start $COMSPEC /C arm-none-eabi-gdb -x $GDB_CMD_FILE $FILE_NAME"
+ else
+ arm-none-eabi-gdb -x $GDB_CMD_FILE $FILE_NAME
+ rm $GDB_CMD_FILE
+ fi
else
# No GDB, wait for openocd to exit
openocd $CFG -f $OCD_CMD_FILE -c init -c halt