Changeset 2081

Timestamp:

Feb 2, 2011, 8:05:25 PM (14 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:

• Makefile.in (modified) (1 diff)
• builder/Makefile.in (modified) (3 diffs)
• builder/irappture.in (deleted)
• builder/objects (deleted)
• builder/objects.tcl (deleted)
• builder/scripts (added)
• builder/scripts/Makefile.in (added)
• builder/scripts/dragdrop.tcl (moved) (moved from trunk/builder/dragdrop.tcl)
• builder/scripts/filmstrip.tcl (moved) (moved from trunk/builder/filmstrip.tcl)
• builder/scripts/hierlist.tcl (moved) (moved from trunk/builder/hierlist.tcl)
• builder/scripts/images (moved) (moved from trunk/builder/images)
• builder/scripts/main.tcl (moved) (moved from trunk/builder/main.tcl)
• builder/scripts/objpath.tcl (moved) (moved from trunk/builder/objpath.tcl)
• builder/scripts/slideframes.tcl (moved) (moved from trunk/builder/slideframes.tcl)
• builder/scripts/tweener.tcl (moved) (moved from trunk/builder/tweener.tcl)
• builder/types (deleted)
• builder/validations (deleted)
• configure (modified) (2 diffs)
• configure.in (modified) (1 diff)
• gui/apps/launcher.tcl (modified) (1 diff)
• gui/apps/rappture.in (modified) (1 diff)
• gui/scripts/Makefile.in (modified) (1 diff)
• gui/scripts/main.tcl (modified) (1 diff)
• lang/tcl/scripts/Makefile.in (modified) (3 diffs)
• lang/tcl/scripts/objects.tcl (modified) (1 diff)
• tester/Makefile.in (added)
• tester/images/wait.png (deleted)
• tester/scripts (added)
• tester/scripts/Makefile.in (added)
• tester/scripts/images (copied) (copied from trunk/tester/images)
• tester/scripts/images/wait16.png (copied) (copied from trunk/tester/images/wait16.png)
• tester/scripts/images/wait64.png (copied) (copied from trunk/tester/images/wait64.png)
• tester/scripts/main.tcl (moved) (moved from trunk/tester/tester.tcl)
• tester/scripts/resultspage.tcl (moved) (moved from trunk/tester/resultspage.tcl)
• tester/scripts/statuslist.tcl (moved) (moved from trunk/tester/statuslist.tcl)
• tester/scripts/test.tcl (moved) (moved from trunk/tester/test.tcl)
• tester/scripts/testtree.tcl (moved) (moved from trunk/tester/testtree.tcl)
• tester/scripts/testview.tcl (moved) (moved from trunk/tester/testview.tcl)
• tester/tclIndex (deleted)

trunk/Makefile.in

@@ -35 +35 @@
 
 ifneq ($(ENABLE_GUI),)
-  TARGETS += gui lang lib builder examples 
+  TARGETS += gui lang lib builder tester examples 
 endif
 

trunk/builder/Makefile.in

@@ -22 +22 @@
 INSTALL         = @INSTALL@
 
-FILES           = \
-                $(srcdir)/dragdrop.tcl \
-                $(srcdir)/filmstrip.tcl \
-                $(srcdir)/hierlist.tcl \
-                $(srcdir)/main.tcl \
-                $(srcdir)/objpath.tcl \
-                $(srcdir)/slideframes.tcl \
-                $(srcdir)/tweener.tcl
-
-IMAGEFILES      = \
-                $(srcdir)/images/drag.xbm \
-                $(srcdir)/images/dragm.xbm \
-                $(srcdir)/images/treemn.png \
-                $(srcdir)/images/treepl.png \
-                $(srcdir)/images/warn24.png \
-                $(srcdir)/images/err24.png
-
 PACKAGE_VERSION = @PACKAGE_VERSION@
 
@@ -47 +30 @@
 
 all:
+        $(MAKE) -C scripts all
 
 install: install-pkg install-scripts
@@ -58 +42 @@
 
 clean:
+        $(MAKE) -C scripts clean
         $(RM) tool.xml
 
 distclean: clean
         $(RM) Makefile *~
-

trunk/configure

@@ -9626 +9626 @@
 
 
-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"
+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 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"
 
 cat >confcache <<\_ACEOF
@@ -10333 +10333 @@
     "builder/Makefile") CONFIG_FILES="$CONFIG_FILES builder/Makefile" ;;
     "builder/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES builder/pkgIndex.tcl" ;;
+    "builder/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES builder/scripts/Makefile" ;;
     "tester/Makefile") CONFIG_FILES="$CONFIG_FILES tester/Makefile" ;;
     "tester/pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES tester/pkgIndex.tcl" ;;
+    "tester/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES tester/scripts/Makefile" ;;
     "lang/Makefile") CONFIG_FILES="$CONFIG_FILES lang/Makefile" ;;
     "lang/java/Makefile") CONFIG_FILES="$CONFIG_FILES lang/java/Makefile" ;;

trunk/configure.in

@@ -725 +725 @@
     builder/Makefile
     builder/pkgIndex.tcl
+    builder/scripts/Makefile
     tester/Makefile
     tester/pkgIndex.tcl
+    tester/scripts/Makefile
     lang/Makefile
     lang/java/Makefile

trunk/gui/apps/launcher.tcl

@@ -98 +98 @@
 
 # invoke the main program with the args
-set bindir [file dirname [info nameofexecutable]]
-set prog ""
-foreach name {wish wish8.5 wish8.4} {
-    if {[file executable [file join $bindir $prog]]} {
-        set prog [file join $bindir $name]
-        break
-    }
-}
-
-if {$prog eq ""} {
-    puts stderr "rappture: can't find wish program in $bindir"
-}
-
-#eval exec [list $prog $mainscript] $alist
-puts "RUNNING: exec $prog $mainscript $alist"
+eval exec wish [list $mainscript] $alist

trunk/gui/apps/rappture.in

@@ -16 +16 @@
 dir=`dirname $0`
 . $dir/rappture.env
-exec $dir/launcher.tcl $*
+exec tclsh $dir/launcher.tcl $*

trunk/gui/scripts/Makefile.in

@@ -71 +71 @@
                 $(srcdir)/isomarker.tcl \
                 $(srcdir)/loader.tcl \
+                $(srcdir)/main.tcl \
                 $(srcdir)/mainwin.tcl \
                 $(srcdir)/mesh.tcl \

trunk/gui/scripts/main.tcl

@@ -22 +22 @@
 # ======================================================================
 package require Itcl
+package require Img
 package require Rappture
 package require RapptureGUI

trunk/lang/tcl/scripts/Makefile.in

@@ -42 +42 @@
                 $(srcdir)/library.tcl \
                 $(srcdir)/objects.tcl \
-                $(srcdir)/objects/base.rp \
                 $(srcdir)/result.tcl \
                 $(srcdir)/units.tcl
@@ -86 +85 @@
 install-objects:
         $(MKDIR_P) -m 0755 $(destdir)/objects
+        $(INSTALL) -m 0444 $(srcdir)/objects/base.rp $(destdir)/objects
         for i in $(OBJECTS); do \
             echo "Installing object definition: $$i" ; \
@@ -91 +91 @@
             for j in $(srcdir)/objects/$$i/*; do \
                 $(INSTALL) -m 0444 $$j $(destdir)/objects/$$i ; \
-            done
+            done \
         done
 

trunk/lang/tcl/scripts/objects.tcl

@@ -292 +292 @@
         set rootf [file rootname $currFile]
         foreach ext {png jpg gif} {
-            if {[file readable $rootf.$ext]} {
+            if {[file readable $rootf.$ext]
+                  && [catch {package present Tk}] == 0} {
                 set imh [image create photo -file $rootf.$ext]
                 $currObjDef configure -image $imh