Changeset 2080 for trunk/gui

Timestamp:

Feb 2, 2011, 4:51:29 PM (14 years ago)

Author:

mmc

Message:

Part 1 of a major reorganization of content. Moving "instant" to "builder"
and setting up "builder" more like the "gui" part as a package. Moving the
Rappture::object stuff from the builder into the main installation, so it
can be shared by the tester as well. Moving "driver" into gui/scripts
where it belongs. Creating a new "launcher.tcl" script that decides
which of the three parts to launch based on command line options. Still
need to sort out the Makefiles to get this all right...

Location:

trunk/gui

Files:

• apps/Makefile.in (modified) (1 diff)
• apps/launcher.tcl (added)
• apps/rappture.in (modified) (2 diffs)
• scripts/main.tcl (moved) (moved from trunk/gui/apps/driver) (2 diffs)

trunk/gui/apps/Makefile.in

@@ -22 +22 @@
 SCRIPTS = \
                 encodedata \
-                $(srcdir)/driver \
+                $(srcdir)/launcher.tcl \
                 $(srcdir)/grabdata \
                 $(srcdir)/nanovis-test \

trunk/gui/apps/rappture.in

@@ -9 +9 @@
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2004-2007  Purdue Research Foundation
+#  Copyright (c) 2004-2011  Purdue Research Foundation
 #
 #  See the file "license.terms" for information on usage and
@@ -16 +16 @@
 dir=`dirname $0`
 . $dir/rappture.env
-exec $dir/driver $*
+exec $dir/launcher.tcl $*

trunk/gui/scripts/main.tcl

@@ -9 +9 @@
 #
 #  RUN AS FOLLOWS:
-#    driver ?-tool <toolfile>?
+#    wish main.tcl ?-tool <toolfile>?
 #
 #  If the <toolfile> is not specified, it defaults to "tool.xml" in
@@ -16 +16 @@
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2004-2005  Purdue Research Foundation
+#  Copyright (c) 2004-2011  Purdue Research Foundation
 #
 #  See the file "license.terms" for information on usage and
 #  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # ======================================================================
-#\
-exec wish "$0" $*
-# ----------------------------------------------------------------------
-# wish executes everything from here on...
-
 package require Itcl
 package require Rappture