Changeset 4850 for branches/1.3


Ignore:
Timestamp:
Dec 11, 2014, 11:08:34 PM (5 years ago)
Author:
dkearney
Message:

merging in -execute flag from trunk (r4834)

Location:
branches/1.3
Files:
3 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 4834
  • branches/1.3/gui/apps/Makefile.in

    r4760 r4850  
    2424                copy_rappture_examples \
    2525                encodedata \
     26                $(srcdir)/execute.tcl \
    2627                $(srcdir)/launcher.tcl \
    2728                $(srcdir)/grabdata \
  • branches/1.3/gui/apps/launcher.tcl

    r4849 r4850  
    1212#    rappture -builder ?-tool <toolfile>?
    1313#    rappture -tester ?-tool <toolfile>? ?-testdir <directory>?
     14#    rappture -execute driver.xml ?-tool <toolfile>?
    1415#
    1516#  The default option is "-run", which brings up the GUI used to
     
    5354                set reqpkgs Tk
    5455            }
     56            -execute {
     57                # for web services and simulation cache -- don't load Tk
     58                set reqpkgs ""
     59                if {[llength $argv] < 1} {
     60                    puts stderr "error: missing driver.xml file for -execute option"
     61                    exit 1
     62                }
     63                set driverxml [lindex $argv 0]
     64                set argv [lrange $argv 1 end]
     65
     66                if {![file readable $driverxml]} {
     67                    puts stderr "error: driver file \"$driverxml\" not found"
     68                    exit 1
     69                }
     70
     71                set dir [file dirname [info script]]
     72                set mainscript [file join $dir execute.tcl]
     73            }
    5574            -tool {
    5675                set toolxml [lindex $argv 0]
     
    89108                puts stderr "  rappture -builder ?-tool toolFile?"
    90109                puts stderr "  rappture -tester ?-auto? ?-tool toolFile? ?-testdir directory?"
     110                puts stderr "  rappture -execute driver.xml ?-tool toolFile?"
    91111                exit 1
    92112            }
Note: See TracChangeset for help on using the changeset viewer.