Changeset 5736 for trunk/gui

Timestamp:

Jun 25, 2015 12:30:17 PM (9 years ago)

Author:

mmc

Message:

Fixed the -execute option so that if a -tool option happens to be specified,
it overrides anything that gets passed in via the toolxml variable. Usually,
these are the same, but the script was throwing an error when you pass a
-tool option, and it shouldn't do that. It should just use it or ignore it
(because it's the same as the toolxml variable).

File:

• trunk/gui/apps/execute.tcl (modified) (3 diffs)

trunk/gui/apps/execute.tcl

@@ -32 +32 @@
 Rappture::resources::load
 
+# Parse command line options
+# ----------------------------------------------------------------------
+Rappture::getopts argv params {
+    value -tool ""
+    value -status ""
+    value -output ""
+    value -cleanup no
+}
+
 # load the XML info in the driver file
 if {[catch {Rappture::library $driverxml} result]} {
@@ -41 +50 @@
 
 # If tool.xml is not specified, try to find it the way Rappture would.
+if {$params(-tool) ne ""} {
+    set toolxml $params(-tool)
+}
 if {$toolxml eq ""} {
     if {[file isfile tool.xml]} {
@@ -120 +132 @@
 }
 
-# Parse command line options to see
+# Apply effects of all other command line options
 # ----------------------------------------------------------------------
-Rappture::getopts argv params {
-    value -status ""
-    value -output ""
-    value -cleanup no
-}
-
 if {$params(-status) ne ""} {
     set LogFid [open $params(-status) w]