On Fri, Jul 29, 2011 at 11:24 AM, Jie Zhang <[email protected]> wrote: > On Fri, Jul 29, 2011 at 8:16 AM, Steve Bennett <[email protected]> wrote: >> Makes sense to me to change it to: >> proc script {filename} { >> uplevel #0 source [find $filename] >> } >> > The attached patch removes "script" command completely. > This is a newer version.
Jie
From cdf843cd871cbd42d54fe548d5c5cb146b5b4c12 Mon Sep 17 00:00:00 2001 From: Jie Zhang <[email protected]> Date: Fri, 29 Jul 2011 11:17:54 -0400 Subject: [PATCH] remove "script" command --- src/ecosboard.c | 2 +- src/helper/configuration.c | 2 +- src/helper/options.c | 2 +- src/helper/startup.tcl | 7 ------- tcl/interface/calao-usb-a9260-c01.cfg | 4 ++-- tcl/interface/calao-usb-a9260-c02.cfg | 4 ++-- 6 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/ecosboard.c b/src/ecosboard.c index 0805e6f..a522160 100644 --- a/src/ecosboard.c +++ b/src/ecosboard.c @@ -1123,7 +1123,7 @@ int main(int argc, char *argv[]) command_run_line(cmd_ctx, "debug_level 3"); } - command_run_linef(cmd_ctx, "script /rom/openocd.cfg"); + command_run_linef(cmd_ctx, "source [find /rom/openocd.cfg]"); int ret; ret = server_init(cmd_ctx); diff --git a/src/helper/configuration.c b/src/helper/configuration.c index eedd8a1..752b338 100644 --- a/src/helper/configuration.c +++ b/src/helper/configuration.c @@ -116,7 +116,7 @@ int parse_config_file(struct command_context *cmd_ctx) char **cfg; if (!config_file_names) { - command_run_line(cmd_ctx, "script openocd.cfg"); + command_run_line(cmd_ctx, "source [find openocd.cfg]"); return ERROR_OK; } diff --git a/src/helper/options.c b/src/helper/options.c index f8db2cd..0d77fde 100644 --- a/src/helper/options.c +++ b/src/helper/options.c @@ -150,7 +150,7 @@ int parse_cmdline_args(struct command_context *cmd_ctx, int argc, char *argv[]) break; case 'f': /* --file | -f */ { - snprintf(command_buffer, 128, "script {%s}", optarg); + snprintf(command_buffer, 128, "source [find %s]", optarg); add_config_command(command_buffer); break; } diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl index 2e2982c..dc43801 100644 --- a/src/helper/startup.tcl +++ b/src/helper/startup.tcl @@ -53,12 +53,5 @@ proc find {filename} { add_usage_text find "<file>" add_help_text find "print full path to file according to OpenOCD search rules" -# Run script -proc script {filename} { - source [find $filename] -} -add_help_text script "filename of OpenOCD script (tcl) to run" -add_usage_text script "<file>" - ######### diff --git a/tcl/interface/calao-usb-a9260-c01.cfg b/tcl/interface/calao-usb-a9260-c01.cfg index c660671..a7ae26a 100644 --- a/tcl/interface/calao-usb-a9260-c01.cfg +++ b/tcl/interface/calao-usb-a9260-c01.cfg @@ -8,6 +8,6 @@ interface ft2232 ft2232_layout jtagkey ft2232_device_desc "USB-A9260" ft2232_vid_pid 0x0403 0x6010 -script interface/calao-usb-a9260.cfg -script target/at91sam9260minimal.cfg +source [find interface/calao-usb-a9260.cfg] +source [find target/at91sam9260minimal.cfg] diff --git a/tcl/interface/calao-usb-a9260-c02.cfg b/tcl/interface/calao-usb-a9260-c02.cfg index 2461b70..073c9a3 100644 --- a/tcl/interface/calao-usb-a9260-c02.cfg +++ b/tcl/interface/calao-usb-a9260-c02.cfg @@ -8,6 +8,6 @@ interface ft2232 ft2232_layout jtagkey ft2232_device_desc "USB-A9260" ft2232_vid_pid 0x0403 0x6001 -script interface/calao-usb-a9260.cfg -script target/at91sam9260minimal.cfg +source [find interface/calao-usb-a9260.cfg] +source [find target/at91sam9260minimal.cfg] -- 1.7.5.4
_______________________________________________ Openocd-development mailing list [email protected] https://lists.berlios.de/mailman/listinfo/openocd-development
