Changeset 1679


Ignore:
Timestamp:
Mar 30, 2010 3:18:53 PM (14 years ago)
Author:
gah
Message:
 
Location:
trunk/gui/apps
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/gui/apps/rappture-csh.env.in

    r1583 r1679  
    2121set bindir=@bindir@
    2222set libdir=@libdir@
     23set vtkdir=@VTKDIR@
     24set python_version=@PYTHON_VERSION@
     25set tcl_version=@TCL_VERSION@
    2326
    2427set path = ( $bindir $path )
    2528
    26 if ( $?TCLLIBPATH ) then
    27   setenv TCLLIBPATH "${libdir}/vtk $TCLLIBPATH"
     29if ( $?LD_LIBRARY_PATH ) then
     30  setenv LD_LIBRARY_PATH "${libdir}:${vtkdir}:$LD_LIBRARY_PATH"
    2831else
    29   setenv TCLLIBPATH "${libdir}/vtk"
    30 endif
    31 
    32 if ( $?LD_LIBRARY_PATH ) then
    33   setenv LD_LIBRARY_PATH "${libdir}:${libdir}/vtk-5.2:${libdir}/vtk:$LD_LIBRARY_PATH"
    34 else
    35   setenv LD_LIBRARY_PATH "${libdir}:${libdir}/vtk-5.2:${libdir}/vtk"
     32  setenv LD_LIBRARY_PATH "${libdir}:${vtkdir}:${libdir}/vtk"
    3633endif
    3734
    3835if ( $?DYLD_LIBRARY_PATH ) then
    39   setenv DYLD_LIBRARY_PATH "${libdir}:${libdir}/vtk-5.2/${libdir}/vtk:$DYLD_LIBRARY_PATH"
     36  setenv DYLD_LIBRARY_PATH "${libdir}:${vtkdir}:$DYLD_LIBRARY_PATH"
    4037else
    41   setenv DYLD_LIBRARY_PATH "${libdir}:${libdir}/vtk-5.2/${libdir}/vtk"
     38  setenv DYLD_LIBRARY_PATH "${libdir}:${vtkdir}"
    4239endif
    4340
    … …  
    6663endif
    6764
     65if ( $?PYTHONPATH ) then
     66  setenv PYTHONPATH  "${libdir}/python${python_version}/site-packages:$PYTHONPATH"
     67else
     68  setenv PYTHONPATH  "${libdir}/python${python_version}/site-packages"
     69endif
     70
    6871if ( $?RUBYLIB ) then
    6972  setenv RUBYLIB "${libdir}/ruby:$RUBYLIB"
    … …  
    7376
    7477if ( $?TCL_LIBRARY ) then
    75   setenv TCL_LIBRARY "${libdir}/tcl8.4:$TCL_LIBRARY"
     78  setenv TCL_LIBRARY "${libdir}/tcl${tcl_version}:$TCL_LIBRARY"
    7679else
    77   setenv TCL_LIBRARY "${libdir}/tcl8.4"
     80  setenv TCL_LIBRARY "${libdir}/tcl${tcl_version}"
    7881endif
    7982
    8083if ( $?TK_LIBRARY ) then
    81   setenv TK_LIBRARY "${libdir}/tk8.4:$TK_LIBRARY"
     84  setenv TK_LIBRARY "${libdir}/tk${tcl_version}:$TK_LIBRARY"
    8285else
    83   setenv TK_LIBRARY "${libdir}/tk8.4"
     86  setenv TK_LIBRARY "${libdir}/tk${tcl_version}"
    8487endif
    8588
    86 set python_version=@PYTHON_VERSION@
    87 
    88 if ( $?PYTHONPATH ) then
    89   setenv PYTHONPATH  "${libdir}/python${python_version}/site-packages:$PYTHONPATH"
     89if ( $?TCLLIBPATH ) then
     90  setenv TCLLIBPATH "${vtkdir} $TCLLIBPATH"
    9091else
    91   setenv PYTHONPATH  "${libdir}/python${python_version}/site-packages"
     92  setenv TCLLIBPATH "${vtkdir}"
    9293endif

  • trunk/gui/apps/rappture.env.in

    r1583 r1679  
    2020libdir=@libdir@
    2121bindir=@bindir@
     22vtkdir=@VTKDIR@
     23python_version=@PYTHON_VERSION@
     24tcl_version=@TCL_VERSION@
    2225
    23 # no need to edit the rest...
    24 export PATH=${bindir}:$PATH
     26# No need to edit anything else
     27PATH=${bindir}:$PATH
    2528
    26 export TCLLIBPATH="${libdir}/vtk $TCLLIBPATH"
     29LD_LIBRARY_PATH=${libdir}:${vtkdir}:$LD_LIBRARY_PATH
    2730
    28 vtk_library_path=${libdir}/vtk-5.2:${libdir}/vtk
     31# For MacOS X
     32DYLD_LIBRARY_PATH=${libdir}:${vtkdir}:$DYLD_LIBRARY_PATH
    2933
    30 export LD_LIBRARY_PATH=${libdir}:$vtk_library_path:$LD_LIBRARY_PATH
    31 
    32 export DYLD_LIBRARY_PATH=${libdir}:${libdir}/vtk:$DYLD_LIBRARY_PATH
     34export PATH LD_LIBRARY_PATH DYLD_LIBRARY_PATH
    3335
    3436MATLABPATH=${libdir}/matlab:$MATLABPATH
     37OCTAVE_LOADPATH=:${libdir}/octave:$OCTAVE_LOADPATH
    3538OCTAVE_PATH=:${libdir}/octave:$OCTAVE_PATH
    36 OCTAVE_LOADPATH=:${libdir}/octave:$OCTAVE_LOADPATH
    37 PERL5LIB=${libdir}/perl:$PERL5LIB
    38 RUBYLIB=${libdir}/ruby:$RUBYLIB
    39 TCL_LIBRARY=${libdir}/tcl8.4:$TCL_LIBRARY
    40 TK_LIBRARY=${libdir}/tk8.4:$TK_LIBRARY
    4139
    4240export MATLABPATH OCTAVE_PATH OCTAVE_LOADPATH
    43 export PERL5LIB RUBYLIB TCL_LIBRARY TK_LIBRARY PYTHONPATH
    4441
    45 # This is done specifically for python right now.
    46 python_version="@PYTHON_VERSION@"
     42PERL5LIB=${libdir}/perl:$PERL5LIB
    4743PYTHONPATH=${libdir}/python${python_version}/site-packages:${PYTHONPATH}
     44RUBYLIB=${libdir}/ruby:$RUBYLIB
    4845
     46export PERL5LIB RUBYLIB PYTHONPATH
     47
     48TCLLIBPATH="${vtkdir} $TCLLIBPATH"
     49TCL_LIBRARY=${libdir}/tcl${tcl_version}:$TCL_LIBRARY
     50TK_LIBRARY=${libdir}/tk${tcl_version}:$TK_LIBRARY
     51
     52export TCL_LIBRARY TK_LIBRARY TCLLIBPATH
     53

  • trunk/gui/apps/rappture.use.in

    r1673 r1679  
    1111libdir=@libdir@
    1212bindir=@bindir@
     13vtkdir=@VTKDIR@
     14python_version=@PYTHON_VERSION@
     15tcl_version=@TCL_VERSION@
    1316
    14 prepend PATH ${bindir}
     17prepend PATH ${bindir}/bin
    1518
    16 prepend TCLLIBPATH ${libdir}/vtk
    17 
    18 prepend LD_LIBRARY_PATH ${libdir}/vtk
    19 prepend LD_LIBRARY_PATH ${libdir}/vtk-5.2
     19prepend LD_LIBRARY_PATH ${vtkdir}
    2020prepend LD_LIBRARY_PATH ${libdir}
    21 
    22 prepend DYLD_LIBRARY_PATH ${libdir}/vtk
    23 prepend DYLD_LIBRARY_PATH ${libdir}/vtk-5.2
     21prepend DYLD_LIBRARY_PATH ${vtkdir}
    2422prepend DYLD_LIBRARY_PATH ${libdir}
    2523
    2624prepend MATLABPATH ${libdir}/matlab
    27 
    2825prepend OCTAVE_PATH :${libdir}/octave:
    2926prepend OCTAVE_LOADPATH :${libdir}/octave:
    3027
    3128prepend PERL5LIB ${libdir}/perl
    32 
    3329prepend RUBYLIB ${libdir}/ruby
    34 
    35 prepend TCL_LIBRARY ${libdir}/tcl8.4
    36 
    37 prepend TK_LIBRARY ${libdir}/tk8.4
    38 
    39 python_version="@PYTHON_VERSION@"
    4030prepend PYTHONPATH ${libdir}/python${python_version}/site-packages
    4131
     32prepend TCLLIBPATH ${vtkdir}
     33prepend TCL_LIBRARY ${libdir}/tcl${tcl_version}
     34prepend TK_LIBRARY ${libdir}/tk${tcl_version}
     35
    4236tags DEVEL
Note: See TracChangeset for help on using the changeset viewer.