Changeset 4513 for branches/1.3


Ignore:
Timestamp:
Jul 16, 2014 4:30:06 PM (6 years ago)
Author:
gah
Message:

remove vtkdir path (not needed for VTK 6+)

Location:
branches/1.3/gui/apps
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3/gui/apps/Makefile.in

    r3806 r4513  
    2525                encodedata \
    2626                $(srcdir)/launcher.tcl \
     27                $(srcdir)/mapviewer-test \
    2728                $(srcdir)/grabdata \
    2829                $(srcdir)/nanovis-test \
  • branches/1.3/gui/apps/launcher.tcl

    r3177 r4513  
    2424#  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
    2525# ======================================================================
    26 package require RapptureGUI
    27 set guidir $RapptureGUI::library
    28 
    29 package require RapptureBuilder
    30 set blddir $RapptureBuilder::library
    31 
    32 package require RapptureTester
    33 set testdir $RapptureTester::library
    34 
    35 set mainscript [file join $guidir scripts main.tcl]
     26set mainscript ""
    3627set alist ""
    3728set toolxml ""
     
    4536        switch -- $opt {
    4637            -run {
     38                package require RapptureGUI
     39                set guidir $RapptureGUI::library
    4740                set mainscript [file join $guidir scripts main.tcl]
     41                set reqpkgs Tk
    4842            }
    4943            -builder {
     44                package require RapptureBuilder
     45                set blddir $RapptureBuilder::library
    5046                set mainscript [file join $blddir scripts main.tcl]
     47                set reqpkgs Tk
    5148            }
    5249            -tester {
     50                package require RapptureTester
     51                set testdir $RapptureTester::library
    5352                set mainscript [file join $testdir scripts main.tcl]
     53                set reqpkgs Tk
    5454            }
    5555            -tool {
     
    6565                lappend alist $opt [lindex $argv 0]
    6666                set argv [lrange $argv 1 end]
     67            }
     68            -auto {
     69                # for the tester in automatic mode -- don't load Tk
     70                package require RapptureTester
     71                set testdir $RapptureTester::library
     72                set mainscript [file join $testdir scripts auto.tcl]
     73                set reqpkgs ""
    6774            }
    6875            -load {
     
    8188                puts stderr "  rappture ?-run? ?-tool toolFile? ?-nosim 0/1? ?-load file file ...?"
    8289                puts stderr "  rappture -builder ?-tool toolFile?"
    83                 puts stderr "  rappture -tester ?-tool toolFile? ?-testdir directory?"
     90                puts stderr "  rappture -tester ?-auto? ?-tool toolFile? ?-testdir directory?"
    8491                exit 1
    8592            }
    8693        }
    8794    }
     95}
     96
     97# If no arguments, assume that it's the -run option
     98if {$mainscript eq ""} {
     99    package require RapptureGUI
     100    set guidir $RapptureGUI::library
     101    set mainscript [file join $guidir scripts main.tcl]
     102    set reqpkgs Tk
    88103}
    89104
     
    97112#       blt::bgexec.  It doesn't try to redirect stderr into a file.
    98113set argv $alist
    99 package require Tk
     114foreach name $reqpkgs {
     115    package require $name
     116}
    100117source  $mainscript
  • branches/1.3/gui/apps/rappture-csh.env.in

    r3985 r4513  
    2121set bindir=@bindir@
    2222set libdir=@libdir@
    23 set vtkdir=@VTKDIR@
     23set vtk_tcl_dir=@VTK_TCL_DIR@
    2424set python_version=@PYTHON_VERSION@
    2525set tcl_version=@TCL_VERSION@
     
    2929
    3030if ( $?LD_LIBRARY_PATH ) then
    31   setenv LD_LIBRARY_PATH "${libdir}:${vtkdir}:$LD_LIBRARY_PATH"
     31  setenv LD_LIBRARY_PATH "${libdir}:$LD_LIBRARY_PATH"
    3232else
    33   setenv LD_LIBRARY_PATH "${libdir}:${vtkdir}:${libdir}/vtk"
     33  setenv LD_LIBRARY_PATH "${libdir}"
    3434endif
    3535
    3636if ( $?DYLD_LIBRARY_PATH ) then
    37   setenv DYLD_LIBRARY_PATH "${libdir}:${vtkdir}:$DYLD_LIBRARY_PATH"
     37  setenv DYLD_LIBRARY_PATH "${libdir}:$DYLD_LIBRARY_PATH"
    3838else
    39   setenv DYLD_LIBRARY_PATH "${libdir}:${vtkdir}"
     39  setenv DYLD_LIBRARY_PATH "${libdir}"
    4040endif
    4141
     
    8989
    9090if ( $?TCLLIBPATH ) then
    91   setenv TCLLIBPATH "${vtkdir} $TCLLIBPATH"
     91  setenv TCLLIBPATH "${vtk_tcl_dir} $TCLLIBPATH"
    9292else
    93   setenv TCLLIBPATH "${vtkdir}"
     93  setenv TCLLIBPATH "${vtk_tcl_dir}"
    9494endif
    9595
  • branches/1.3/gui/apps/rappture.env.in

    r3985 r4513  
    2020libdir=@libdir@
    2121bindir=@bindir@
    22 vtkdir=@VTKDIR@
     22vtk_tcl_dir=@VTK_TCL_DIR@
    2323python_version=@PYTHON_VERSION@
    2424tcl_version=@TCL_VERSION@
     
    4747export PERL5LIB RUBYLIB PYTHONPATH
    4848
    49 TCLLIBPATH="${vtkdir} $TCLLIBPATH"
     49TCLLIBPATH="${vtk_tcl_dir} $TCLLIBPATH"
    5050TCL_LIBRARY=${libdir}/tcl${tcl_version}:$TCL_LIBRARY
    5151TK_LIBRARY=${libdir}/tk${tcl_version}:$TK_LIBRARY
  • branches/1.3/gui/apps/rappture.in

    r3177 r4513  
    1616dir=`dirname $0`
    1717. $dir/rappture.env
    18 exec tclsh $dir/launcher.tcl -- "$@"
     18exec tclsh $dir/launcher.tcl "$@"
  • branches/1.3/gui/apps/rappture.use.in

    r3985 r4513  
    1111libdir=@libdir@
    1212bindir=@bindir@
    13 vtkdir=@VTKDIR@
     13vtk_tcl_dir=@VTK_TCL_DIR@
    1414python_version=@PYTHON_VERSION@
    1515tcl_version=@TCL_VERSION@
     
    2929prepend PYTHONPATH ${libdir}/python${python_version}/site-packages
    3030
    31 prepend TCLLIBPATH ${vtkdir}
     31prepend TCLLIBPATH ${vtk_tcl_dir}
    3232prepend TCL_LIBRARY ${libdir}/tcl${tcl_version}
    3333prepend TK_LIBRARY ${libdir}/tk${tcl_version}
Note: See TracChangeset for help on using the changeset viewer.