Changeset 1986 for trunk/gui/apps/simsim.in

Timestamp:

Dec 8, 2010, 3:47:59 PM (14 years ago)

Author:

dkearney

Message:

adding -runfile flag to simsim
updating tool.tcl to cover the condition where resource file has results_dir directive

File:

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

trunk/gui/apps/simsim.in

@@ -8 +8 @@
 # ======================================================================
 #\
-. rappture.env \
-exec wish "$0" $*
+dir=`dirname $0` ; \
+. $dir/rappture.env ; \
+exec $dir/wish "$0" $*
 
 package require Rappture
@@ -414 +415 @@
  -compare <path>     - compare the results with the run.xml
                        file at <path>.
+ -runfile <path>     - move the run file to <path>
  -nosim              - no simulation.
  -help               - print this help menu.
@@ -632 +634 @@
                 set params(--driver) [lindex $argv $i]
                 # need to check to see if file exists, if not raise error
+            } else {
+                printHelp
+            }
+        } elseif {  ("-r" == $opt)      ||
+                    ("-runfile" == $opt) ||
+                    ("--runfile" == $opt)    } {
+            if {[expr {$i + 1}] < $argc} {
+                incr i
+                set params(--runfile) [lindex $argv $i]
             } else {
                 printHelp
@@ -686 +697 @@
         --nosim false
         --driver ""
+        --runfile ""
         --tool "./tool.xml"
         oParams {}
@@ -691 +703 @@
 
     parseOptions argv params
+
+    # ----------------------------------------------------------------------
+    # LOAD RESOURCE SETTINGS
+    #
+    # Try to load the $SESSIONDIR/resources file, which contains
+    # middleware settings, such as the application name and the
+    # filexfer settings.
+    # ----------------------------------------------------------------------
+    Rappture::resources::load
+
 
     # keep the wish window from popping up
@@ -739 +761 @@
     }
 
+
+
+
     set tool [Rappture::Tool ::#auto $xmlobj $installdir]
 
@@ -748 +773 @@
     foreach {status result} [eval $tool run] break
 
-    # read back the result from run.xml
+    if {[string compare "" $params(--runfile)] != 0} {
+        set runfilename [$tool getRunFile]
+        set err [catch {file rename $runfilename $params(--runfile)} out]
+        if {$err} {
+            puts stderr $out
+        }
+    }
+
+    # if run was successful, check to see if we should compare
     if {$status == 0 && $result != "ABORT"} {
         if {[Rappture::library isvalid $result]} {