Changeset 2081


Ignore:
Timestamp:
Feb 2, 2011 8:05:25 PM (10 years ago)
Author:
mmc
Message:

Part 2 of the major reorganization to group all of the rappture utilties
under a single rappture command. Builds better now. Still need to fix
up the builder to work with the objects in a different location now.

Location:
trunk
Files:
5 added
7 deleted
10 edited
3 copied
14 moved

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.in

    r2080 r2081  
    3535
    3636ifneq ($(ENABLE_GUI),)
    37   TARGETS += gui lang lib builder examples
     37  TARGETS += gui lang lib builder tester examples
    3838endif
    3939
  • trunk/builder/Makefile.in

    r2080 r2081  
    2222INSTALL         = @INSTALL@
    2323
    24 FILES           = \
    25                 $(srcdir)/dragdrop.tcl \
    26                 $(srcdir)/filmstrip.tcl \
    27                 $(srcdir)/hierlist.tcl \
    28                 $(srcdir)/main.tcl \
    29                 $(srcdir)/objpath.tcl \
    30                 $(srcdir)/slideframes.tcl \
    31                 $(srcdir)/tweener.tcl
    32 
    33 IMAGEFILES      = \
    34                 $(srcdir)/images/drag.xbm \
    35                 $(srcdir)/images/dragm.xbm \
    36                 $(srcdir)/images/treemn.png \
    37                 $(srcdir)/images/treepl.png \
    38                 $(srcdir)/images/warn24.png \
    39                 $(srcdir)/images/err24.png
    40 
    4124PACKAGE_VERSION = @PACKAGE_VERSION@
    4225
     
    4730
    4831all:
     32        $(MAKE) -C scripts all
    4933
    5034install: install-pkg install-scripts
     
    5842
    5943clean:
     44        $(MAKE) -C scripts clean
    6045        $(RM) tool.xml
    6146
    6247distclean: clean
    6348        $(RM) Makefile *~
    64 
  • trunk/configure

    r2080 r2081  
    96269626
    96279627
    9628 ac_config_files="$ac_config_files Makefile packages/Makefile src/Makefile src/core/Makefile src/core2/Makefile src/objects/Makefile src/objects/RpHash.h gui/Makefile gui/apps/Makefile gui/apps/about gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile builder/Makefile builder/pkgIndex.tcl tester/Makefile tester/pkgIndex.tcl lang/Makefile lang/java/Makefile lang/java/rappture/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/octave2/Makefile lang/octave/octave3/Makefile lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/src/Makefile lang/tcl/scripts/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/java/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/2/Makefile examples/app-fermi/octave/3/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/perl/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/c-example/Makefile examples/canvas/Makefile examples/demo.bash examples/flow/Makefile examples/flow/demo1/Makefile examples/flow/demo2/Makefile examples/flow/demo3/Makefile examples/graph/Makefile examples/objects/Makefile examples/objects/axis/Makefile examples/objects/contour/Makefile examples/objects/curve/Makefile examples/objects/dxWriter/Makefile examples/objects/floatBuffer/Makefile examples/objects/histogram/Makefile examples/objects/library/Makefile examples/objects/number/Makefile examples/objects/path/Makefile examples/objects/plot/Makefile examples/objects/scatter/Makefile examples/objects/string/Makefile examples/objects/tree/Makefile examples/objects/xmlparser/Makefile examples/zoo/Makefile examples/zoo/binary/Makefile examples/zoo/boolean/Makefile examples/zoo/choice/Makefile examples/zoo/cloud/Makefile examples/zoo/cloud/matlab/Makefile examples/zoo/curve/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/group/Makefile examples/zoo/image/Makefile examples/zoo/image/docs/Makefile examples/zoo/image/examples/Makefile examples/zoo/integer/Makefile examples/zoo/integer2/Makefile examples/zoo/loader/Makefile examples/zoo/loader/examples/Makefile examples/zoo/loadrun/Makefile examples/zoo/log/Makefile examples/zoo/note/Makefile examples/zoo/note/docs/Makefile examples/zoo/number/Makefile examples/zoo/number2/Makefile examples/zoo/parallelepiped/Makefile examples/zoo/periodicelement/Makefile examples/zoo/phase/Makefile examples/zoo/sequence/Makefile examples/zoo/sequence/examples/Makefile examples/zoo/string/Makefile examples/zoo/structure/Makefile examples/zoo/structure/examples/Makefile examples/zoo/table/Makefile examples/zoo/unirect2d/Makefile oldtest/Makefile oldtest/src/Makefile"
     9628ac_config_files="$ac_config_files Makefile packages/Makefile src/Makefile src/core/Makefile src/core2/Makefile src/objects/Makefile src/objects/RpHash.h gui/Makefile gui/apps/Makefile gui/apps/about gui/apps/encodedata gui/apps/rappture gui/apps/rappture-csh.env gui/apps/rappture.env gui/apps/rappture.use gui/apps/rerun gui/apps/simsim gui/apps/xmldiff gui/pkgIndex.tcl gui/scripts/Makefile builder/Makefile builder/pkgIndex.tcl builder/scripts/Makefile tester/Makefile tester/pkgIndex.tcl tester/scripts/Makefile lang/Makefile lang/java/Makefile lang/java/rappture/Makefile lang/perl/Makefile lang/perl/Makefile.PL lang/python/Makefile lang/python/setup.py lang/matlab/Makefile lang/octave/Makefile lang/octave/octave2/Makefile lang/octave/octave3/Makefile lang/ruby/Makefile lang/ruby/build.rb lang/tcl/Makefile lang/tcl/pkgIndex.tcl lang/tcl/src/Makefile lang/tcl/scripts/Makefile lang/tcl/tests/Makefile lib/Makefile examples/3D/Makefile examples/Makefile examples/app-fermi/2.0/Makefile examples/app-fermi/Makefile examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/java/Makefile examples/app-fermi/matlab/Makefile examples/app-fermi/matlab/compiled/Makefile examples/app-fermi/matlab/uncompiled/Makefile examples/app-fermi/octave/2/Makefile examples/app-fermi/octave/3/Makefile examples/app-fermi/octave/Makefile examples/app-fermi/perl/Makefile examples/app-fermi/python/Makefile examples/app-fermi/ruby/Makefile examples/app-fermi/tcl/Makefile examples/app-fermi/wrapper/Makefile examples/app-fermi/wrapper/cee/Makefile examples/app-fermi/wrapper/perl/Makefile examples/app-fermi/wrapper/python/Makefile examples/app-fermi/wrapper/tcl/Makefile examples/c-example/Makefile examples/canvas/Makefile examples/demo.bash examples/flow/Makefile examples/flow/demo1/Makefile examples/flow/demo2/Makefile examples/flow/demo3/Makefile examples/graph/Makefile examples/objects/Makefile examples/objects/axis/Makefile examples/objects/contour/Makefile examples/objects/curve/Makefile examples/objects/dxWriter/Makefile examples/objects/floatBuffer/Makefile examples/objects/histogram/Makefile examples/objects/library/Makefile examples/objects/number/Makefile examples/objects/path/Makefile examples/objects/plot/Makefile examples/objects/scatter/Makefile examples/objects/string/Makefile examples/objects/tree/Makefile examples/objects/xmlparser/Makefile examples/zoo/Makefile examples/zoo/binary/Makefile examples/zoo/boolean/Makefile examples/zoo/choice/Makefile examples/zoo/cloud/Makefile examples/zoo/cloud/matlab/Makefile examples/zoo/curve/Makefile examples/zoo/enable/Makefile examples/zoo/field/Makefile examples/zoo/group/Makefile examples/zoo/image/Makefile examples/zoo/image/docs/Makefile examples/zoo/image/examples/Makefile examples/zoo/integer/Makefile examples/zoo/integer2/Makefile examples/zoo/loader/Makefile examples/zoo/loader/examples/Makefile examples/zoo/loadrun/Makefile examples/zoo/log/Makefile examples/zoo/note/Makefile examples/zoo/note/docs/Makefile examples/zoo/number/Makefile examples/zoo/number2/Makefile examples/zoo/parallelepiped/Makefile examples/zoo/periodicelement/Makefile examples/zoo/phase/Makefile examples/zoo/sequence/Makefile examples/zoo/sequence/examples/Makefile examples/zoo/string/Makefile examples/zoo/structure/Makefile examples/zoo/structure/examples/Makefile examples/zoo/table/Makefile examples/zoo/unirect2d/Makefile oldtest/Makefile oldtest/src/Makefile"
    96299629
    96309630cat >confcache <<\_ACEOF
     
    1033310333    "builder/Makefile") CONFIG_FILES="$CONFIG_FILES builder/Makefile" ;;
    1033410334    "builder/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES builder/pkgIndex.tcl" ;;
     10335    "builder/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES builder/scripts/Makefile" ;;
    1033510336    "tester/Makefile") CONFIG_FILES="$CONFIG_FILES tester/Makefile" ;;
    1033610337    "tester/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES tester/pkgIndex.tcl" ;;
     10338    "tester/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES tester/scripts/Makefile" ;;
    1033710339    "lang/Makefile") CONFIG_FILES="$CONFIG_FILES lang/Makefile" ;;
    1033810340    "lang/java/Makefile") CONFIG_FILES="$CONFIG_FILES lang/java/Makefile" ;;
  • trunk/configure.in

    r2080 r2081  
    725725    builder/Makefile
    726726    builder/pkgIndex.tcl
     727    builder/scripts/Makefile
    727728    tester/Makefile
    728729    tester/pkgIndex.tcl
     730    tester/scripts/Makefile
    729731    lang/Makefile
    730732    lang/java/Makefile
  • trunk/gui/apps/launcher.tcl

    r2080 r2081  
    9898
    9999# invoke the main program with the args
    100 set bindir [file dirname [info nameofexecutable]]
    101 set prog ""
    102 foreach name {wish wish8.5 wish8.4} {
    103     if {[file executable [file join $bindir $prog]]} {
    104         set prog [file join $bindir $name]
    105         break
    106     }
    107 }
    108 
    109 if {$prog eq ""} {
    110     puts stderr "rappture: can't find wish program in $bindir"
    111 }
    112 
    113 #eval exec [list $prog $mainscript] $alist
    114 puts "RUNNING: exec $prog $mainscript $alist"
     100eval exec wish [list $mainscript] $alist
  • trunk/gui/apps/rappture.in

    r2080 r2081  
    1616dir=`dirname $0`
    1717. $dir/rappture.env
    18 exec $dir/launcher.tcl $*
     18exec tclsh $dir/launcher.tcl $*
  • trunk/gui/scripts/Makefile.in

    r2023 r2081  
    7171                $(srcdir)/isomarker.tcl \
    7272                $(srcdir)/loader.tcl \
     73                $(srcdir)/main.tcl \
    7374                $(srcdir)/mainwin.tcl \
    7475                $(srcdir)/mesh.tcl \
  • trunk/gui/scripts/main.tcl

    r2080 r2081  
    2222# ======================================================================
    2323package require Itcl
     24package require Img
    2425package require Rappture
    2526package require RapptureGUI
  • trunk/lang/tcl/scripts/Makefile.in

    r2080 r2081  
    4242                $(srcdir)/library.tcl \
    4343                $(srcdir)/objects.tcl \
    44                 $(srcdir)/objects/base.rp \
    4544                $(srcdir)/result.tcl \
    4645                $(srcdir)/units.tcl
     
    8685install-objects:
    8786        $(MKDIR_P) -m 0755 $(destdir)/objects
     87        $(INSTALL) -m 0444 $(srcdir)/objects/base.rp $(destdir)/objects
    8888        for i in $(OBJECTS); do \
    8989            echo "Installing object definition: $$i" ; \
     
    9191            for j in $(srcdir)/objects/$$i/*; do \
    9292                $(INSTALL) -m 0444 $$j $(destdir)/objects/$$i ; \
    93             done
     93            done \
    9494        done
    9595
  • trunk/lang/tcl/scripts/objects.tcl

    r2080 r2081  
    292292        set rootf [file rootname $currFile]
    293293        foreach ext {png jpg gif} {
    294             if {[file readable $rootf.$ext]} {
     294            if {[file readable $rootf.$ext]
     295                  && [catch {package present Tk}] == 0} {
    295296                set imh [image create photo -file $rootf.$ext]
    296297                $currObjDef configure -image $imh
Note: See TracChangeset for help on using the changeset viewer.