From 8e453d028a760042e4a3093c0c43c7a054c5dcaf Mon Sep 17 00:00:00 2001 From: Jamie Smith Date: Sun, 31 Oct 2021 18:39:35 -0700 Subject: [PATCH] Response to comments --- tools/cmake/app.cmake | 2 +- tools/cmake/upload_methods/FindOpenOCD.cmake | 2 +- tools/cmake/upload_methods/UploadMethodJLINK.cmake | 2 +- tools/cmake/upload_methods/UploadMethodMBED.cmake | 2 +- tools/cmake/upload_methods/UploadMethodNONE.cmake | 2 +- tools/cmake/upload_methods/UploadMethodOPENOCD.cmake | 2 +- tools/cmake/upload_methods/UploadMethodPYOCD.cmake | 2 +- tools/cmake/upload_methods/UploadMethodSTM32CUBE.cmake | 2 +- tools/cmake/upload_methods/install_bin_file.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/cmake/app.cmake b/tools/cmake/app.cmake index 673c87ab58..f6130c7434 100644 --- a/tools/cmake/app.cmake +++ b/tools/cmake/app.cmake @@ -68,4 +68,4 @@ include(${CMAKE_CURRENT_LIST_DIR}/create_distro.cmake) # load upload method list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/upload_methods) -include(${CMAKE_CURRENT_LIST_DIR}/UploadMethodManager.cmake) \ No newline at end of file +include(${CMAKE_CURRENT_LIST_DIR}/UploadMethodManager.cmake) diff --git a/tools/cmake/upload_methods/FindOpenOCD.cmake b/tools/cmake/upload_methods/FindOpenOCD.cmake index 9484e39b0c..4eb48f9132 100644 --- a/tools/cmake/upload_methods/FindOpenOCD.cmake +++ b/tools/cmake/upload_methods/FindOpenOCD.cmake @@ -12,7 +12,7 @@ set(OpenOCD_PATHS "") -# try to figure out where JLink may be installed. +# try to figure out where OpenOCD may be installed. if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows") # on Windows, assume that the user extracted the binaries to Program Files diff --git a/tools/cmake/upload_methods/UploadMethodJLINK.cmake b/tools/cmake/upload_methods/UploadMethodJLINK.cmake index 0ea971df99..9b70d966ed 100644 --- a/tools/cmake/upload_methods/UploadMethodJLINK.cmake +++ b/tools/cmake/upload_methods/UploadMethodJLINK.cmake @@ -58,4 +58,4 @@ add_custom_target(gdbserver -LocalhostOnly -noIR -port ${GDB_PORT} - USES_TERMINAL) \ No newline at end of file + USES_TERMINAL) diff --git a/tools/cmake/upload_methods/UploadMethodMBED.cmake b/tools/cmake/upload_methods/UploadMethodMBED.cmake index 6bdd2cc109..6851f595f5 100644 --- a/tools/cmake/upload_methods/UploadMethodMBED.cmake +++ b/tools/cmake/upload_methods/UploadMethodMBED.cmake @@ -32,4 +32,4 @@ function(gen_upload_target TARGET_NAME BIN_FILE) add_dependencies(flash-${TARGET_NAME} ${TARGET_NAME}) -endfunction(gen_upload_target) \ No newline at end of file +endfunction(gen_upload_target) diff --git a/tools/cmake/upload_methods/UploadMethodNONE.cmake b/tools/cmake/upload_methods/UploadMethodNONE.cmake index 24b570132f..11fa02c67c 100644 --- a/tools/cmake/upload_methods/UploadMethodNONE.cmake +++ b/tools/cmake/upload_methods/UploadMethodNONE.cmake @@ -13,4 +13,4 @@ function(gen_upload_target TARGET_NAME BIN_FILE) # do nothing -endfunction(gen_upload_target) \ No newline at end of file +endfunction(gen_upload_target) diff --git a/tools/cmake/upload_methods/UploadMethodOPENOCD.cmake b/tools/cmake/upload_methods/UploadMethodOPENOCD.cmake index 81b24d48f7..8130885b71 100644 --- a/tools/cmake/upload_methods/UploadMethodOPENOCD.cmake +++ b/tools/cmake/upload_methods/UploadMethodOPENOCD.cmake @@ -31,4 +31,4 @@ add_custom_target(gdbserver ${OpenOCD} ${OPENOCD_CHIP_CONFIG_COMMANDS} -c "gdb_port ${GDB_PORT}" - USES_TERMINAL) \ No newline at end of file + USES_TERMINAL) diff --git a/tools/cmake/upload_methods/UploadMethodPYOCD.cmake b/tools/cmake/upload_methods/UploadMethodPYOCD.cmake index c685e9d454..f7126fdb1f 100644 --- a/tools/cmake/upload_methods/UploadMethodPYOCD.cmake +++ b/tools/cmake/upload_methods/UploadMethodPYOCD.cmake @@ -55,4 +55,4 @@ add_custom_target(gdbserver -p ${GDB_PORT} --persist --semihosting - USES_TERMINAL) \ No newline at end of file + USES_TERMINAL) diff --git a/tools/cmake/upload_methods/UploadMethodSTM32CUBE.cmake b/tools/cmake/upload_methods/UploadMethodSTM32CUBE.cmake index 57663d49ad..f3b7cac283 100644 --- a/tools/cmake/upload_methods/UploadMethodSTM32CUBE.cmake +++ b/tools/cmake/upload_methods/UploadMethodSTM32CUBE.cmake @@ -58,4 +58,4 @@ add_custom_target(gdbserver --persistent # don't close debugger after GDB disconnects, matches behavior of other tools like J-Link -p ${GDB_PORT} ${STM32CUBE_GDB_PROBE_ARGS} - USES_TERMINAL) \ No newline at end of file + USES_TERMINAL) diff --git a/tools/cmake/upload_methods/install_bin_file.py b/tools/cmake/upload_methods/install_bin_file.py index 9c7ee5cc4c..626e79fb81 100644 --- a/tools/cmake/upload_methods/install_bin_file.py +++ b/tools/cmake/upload_methods/install_bin_file.py @@ -41,7 +41,7 @@ def error(lines, code=-1): if len(sys.argv) < 3: print("Error: Usage: python " + sys.argv[0] + " [Target UID for distinguishing multiple targets]") - exit(1) + sys.exit(1) bin_file = sys.argv[1] target_name = sys.argv[2]