Changeset 4863

Timestamp:

Dec 12, 2014 12:41:42 PM (9 years ago)

Author:

ldelgass

Message:

merge r4834 from trunk

Location:

branches/1.4

Files:

• . (modified) (1 prop)
• gui/apps/Makefile.in (modified) (1 diff)
• gui/apps/execute.tcl (copied) (copied from trunk/gui/apps/execute.tcl)
• gui/apps/launcher.tcl (modified) (3 diffs)

branches/1.4/gui/apps/Makefile.in

@@ -24 +24 @@
                 copy_rappture_examples \
                 encodedata \
+                $(srcdir)/execute.tcl \
                 $(srcdir)/launcher.tcl \
                 $(srcdir)/grabdata \

branches/1.4/gui/apps/launcher.tcl

@@ -12 +12 @@
 #    rappture -builder ?-tool <toolfile>?
 #    rappture -tester ?-tool <toolfile>? ?-testdir <directory>?
+#    rappture -execute driver.xml ?-tool <toolfile>?
 #
 #  The default option is "-run", which brings up the GUI used to
@@ -53 +54 @@
                 set reqpkgs Tk
             }
+            -execute {
+                # for web services and simulation cache -- don't load Tk
+                set reqpkgs ""
+                if {[llength $argv] < 1} {
+                    puts stderr "error: missing driver.xml file for -execute option"
+                    exit 1
+                }
+                set driverxml [lindex $argv 0]
+                set argv [lrange $argv 1 end]
+
+                if {![file readable $driverxml]} {
+                    puts stderr "error: driver file \"$driverxml\" not found"
+                    exit 1
+                }
+
+                set dir [file dirname [info script]]
+                set mainscript [file join $dir execute.tcl]
+            }
             -tool {
                 set toolxml [lindex $argv 0]
@@ -89 +108 @@
                 puts stderr "  rappture -builder ?-tool toolFile?"
                 puts stderr "  rappture -tester ?-auto? ?-tool toolFile? ?-testdir directory?"
+                puts stderr "  rappture -execute driver.xml ?-tool toolFile?"
                 exit 1
             }