Changeset 2658 for trunk

Timestamp:

Nov 4, 2011, 11:57:32 AM (13 years ago)

Author:

dkearney

Message:

adding --tooldir flag to specify the location of where the tool.xml should have been found, this value is substituted into @tool by Rappture::Tool

File:

• trunk/gui/apps/simsim.in (modified) (3 diffs)

trunk/gui/apps/simsim.in

@@ -620 +620 @@
     for {set i 0} {$i < $argc} {incr i} {
         set opt [lindex $argv $i]
-        if {("-t" == $opt) || ("-tool" == $opt) || ("--tool" == $opt)} {
+        if { ("-t" == $opt)    ||
+             ("-tool" == $opt) ||
+             ("--tool" == $opt)   } {
             if {[expr {$i + 1}] < $argc} {
                 incr i
                 set params(--tool) [lindex $argv $i]
                 # need to check to see if file exists, if not raise error
+            } else {
+                printHelp
+            }
+        } elseif {  ("-tooldir" == $opt) ||
+                    ("--tooldir" == $opt)    } {
+            if {[expr {$i + 1}] < $argc} {
+                incr i
+                set params(--tooldir) [lindex $argv $i]
+                # need to check to see if directory exists, if not raise error
             } else {
                 printHelp
@@ -705 +716 @@
         --runfile ""
         --tool "./tool.xml"
+        --tooldir ""
         oParams {}
     }
@@ -728 +740 @@
 
     set xmlobj [Rappture::library $params(--tool)]
-    set installdir [file dirname $params(--tool)]
+    if {$params(--tooldir) == ""} {
+        set installdir [file dirname $params(--tool)]
+    } else {
+        set installdir $params(--tooldir)
+    }
 
     # need a better way to do this,