Changeset 632

Timestamp:

Mar 20, 2007, 2:12:34 PM (18 years ago)

Author:

dkearney

Message:

changing rappture script to source the rappture.env file
added option to simsim allowing user to specify the value for named elements on the command line
added simsim rappture.env to configure script and makefile

Location:

trunk

Files:

• Makefile.in (modified) (1 diff)
• configure (modified) (2 diffs)
• configure.in (modified) (1 diff)
• gui/apps/rappture.env.in (moved) (moved from trunk/gui/apps/rappture_env.in)
• gui/apps/rappture.in (modified) (1 diff)
• gui/apps/simsim (modified) (1 diff)
• gui/apps/simsim.py (modified) (3 diffs)

trunk/Makefile.in

@@ -10 +10 @@
         chmod 755 gui/apps/rappture
         cp gui/apps/rappture @prefix@/bin
+        cp gui/apps/rappture.env @prefix@/bin
         cp gui/apps/driver @prefix@/bin
         cp gui/apps/rerun @prefix@/bin
         cp gui/apps/simsim @prefix@/bin
+        cp gui/apps/simsim.py @prefix@/bin
         find @prefix@ -name .svn | xargs rm -rf
 

trunk/configure

@@ -5302 +5302 @@
 
 
-ac_config_files="$ac_config_files Makefile examples/demo.bash examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/wrapper/cee/Makefile examples/c-example/Makefile perl/Makefile.PL python/setup.py src/Makefile src/matlab/Makefile src/octave/Makefile src2/core/Makefile test/Makefile gui/apps/rappture"
+ac_config_files="$ac_config_files Makefile examples/demo.bash examples/app-fermi/cee/Makefile examples/app-fermi/fortran/Makefile examples/app-fermi/wrapper/cee/Makefile examples/c-example/Makefile perl/Makefile.PL python/setup.py src/Makefile src/matlab/Makefile src/octave/Makefile src2/core/Makefile test/Makefile gui/apps/rappture gui/apps/rappture.env"
 
 cat >confcache <<\_ACEOF
@@ -5885 +5885 @@
     "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
     "gui/apps/rappture") CONFIG_FILES="$CONFIG_FILES gui/apps/rappture" ;;
+    "gui/apps/rappture.env") CONFIG_FILES="$CONFIG_FILES gui/apps/rappture.env" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5

trunk/configure.in

@@ -210 +210 @@
             src2/core/Makefile \
             test/Makefile \
-            gui/apps/rappture   )
+            gui/apps/rappture \
+            gui/apps/rappture.env   )

trunk/gui/apps/rappture.in

@@ -9 +9 @@
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2004-2005  Purdue Research Foundation
+#  Copyright (c) 2004-2007  Purdue Research Foundation
 #
 #  See the file "license.terms" for information on usage and
 #  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # ======================================================================
-#
-# If you install Rappture elsewhere, edit the line below:
-RAPPTURE_INSTALL_DIR=@prefix@
 
-# no need to edit the rest...
-export PATH=$RAPPTURE_INSTALL_DIR/bin:$PATH
-export PERL5LIB=$RAPPTURE_INSTALL_DIR/lib/perl5:$PERL5LIB
-export PYTHONPATH=$RAPPTURE_INSTALL_DIR/lib/python@PYTHON_VERSION@/site-packages:$PYTHONPATH
-export MATLABPATH=$RAPPTURE_INSTALL_DIR/lib/matlab:$MATLABPATH
-export OCTAVE_PATH=:$RAPPTURE_INSTALL_DIR/lib/octave:$OCTAVE_PATH
-export LD_LIBRARY_PATH=$RAPPTURE_INSTALL_DIR/lib:$LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH=$RAPPTURE_INSTALL_DIR/lib:$DYLD_LIBRARY_PATH
-export TCL_LIBRARY=$RAPPTURE_INSTALL_DIR/lib/tcl8.4
-export TK_LIBRARY=$RAPPTURE_INSTALL_DIR/lib/tk8.4
+. rappture.env
 exec $RAPPTURE_INSTALL_DIR/bin/driver $*

trunk/gui/apps/simsim

@@ -11 +11 @@
 # ======================================================================
 #
-. rappture_env
+. rappture.env
 exec python simsim.py $*

trunk/gui/apps/simsim.py

@@ -5 +5 @@
 import random
 import getopt
+import time
 
 
@@ -78 +79 @@
     value = random.randint(0,1)
     if (value == 1):
-        value = "true"
+        value = "yes"
     else:
-        value = "false"
+        value = "no"
     child.put("current",str(value))
+
+def writeDriver(lib):
+    driverFile = 'driver%d.xml' % time.time()
+    fp = open(driverFile,'w')
+    fp.write(lib.xml())
+    fp.close()
+    return driverFile
 
 def printHelp():
@@ -131 +139 @@
             childList = childList + addList
 
-Rappture.result(lib)
+for pathValue in args:
+    (path,value) = pathValue.split(":")
+    lib.put(path+".current",value)
 
+print writeDriver(lib)