Changeset 4919 for branches/r9/apps


Ignore:
Timestamp:
Jan 4, 2015 6:52:23 PM (7 years ago)
Author:
gah
Message:
 
Location:
branches/r9/apps
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/r9/apps/Makefile.in

    r4914 r4919  
    2626                $(srcdir)/execute.tcl \
    2727                $(srcdir)/launcher.tcl \
    28                 $(srcdir)/mapviewer-test \
    2928                $(srcdir)/grabdata \
    3029                $(srcdir)/nanovis-test \
  • branches/r9/apps/launcher.tcl

    r4127 r4919  
    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            }
  • branches/r9/apps/rappture.use.in

    r4118 r4919  
    3333prepend TK_LIBRARY ${libdir}/tk${tcl_version}
    3434
     35prepend CLASSPATH ${libdir}/java
     36
    3537prepend R_LIBS ${libdir}/R
    3638
  • branches/r9/apps/rpdiff

    r3177 r4919  
    490490            }
    491491        }
     492        loader {
     493        }
    492494        default {
    493             error "don't know how to compare type \"$type\""
     495            puts stderr "ignoring \"$type1\" for \"$path\""
    494496        }
    495497    }
     
    557559
    558560# ======================================================================
    559 if {$argc != 2} {
     561
     562if {$argc < 2} {
    560563    puts stderr "USAGE: rpdiff file1.xml file2.xml"
    561564    exit 9
     
    563566set lib1 [Rappture::library [lindex $argv 0]]
    564567set lib2 [Rappture::library [lindex $argv 1]]
     568set path "output"
     569if { $argc > 2 } {
     570   set arg [lindex $argv 2]
     571   if { $arg == "-path" && $argc == 4 } {
     572      set path [lindex $argv 3]
     573   }
     574}
    565575
    566576# compute the differences
    567 set diffs [diff output $lib1 $lib2]
     577set diffs [diff $path $lib1 $lib2]
    568578
    569579if {[llength $diffs] == 0} {
Note: See TracChangeset for help on using the changeset viewer.