Changeset 2310

Timestamp:

Jul 10, 2011, 6:47:35 PM (13 years ago)

Author:

gah

Message:

update from trunk

Location:

trunk

Files:

• configure (modified) (14 diffs)
• configure.in (modified) (10 diffs)
• gui/src/RpDiffview.c (modified) (2 diffs)
• lang/tcl/src/RpRusage.c (modified) (2 diffs)

trunk/configure

@@ -607 +607 @@
 subdirs
 VTKDIR
+TK_VERSION
 TK_XLIBSW
 TK_LIB_SPEC
-TK_VERSION
+TK_INC_SPEC
 TCL_VERSION
 TCL_LIB_SPEC
@@ -2715 +2716 @@
 
 
-with_tclsh=yes
-rp_with_tclsh="yes"
-rp_with_mkoctfile2="no"
-rp_with_mkoctfile3="no"
-rp_with_octave="yes"
-rp_with_vtk="yes"
-rp_with_matlab="yes"
-rp_with_perl="yes"
-rp_with_python="yes"
-rp_with_ruby="yes"
-rp_with_java="yes"
-with_install="yes"
-
 #------------------------------------------------------------------------
 # Handle the --prefix=... option
@@ -2746 +2734 @@
   with_install=yes
 fi
+
 
 if test "$with_install" != "yes"; then
@@ -7237 +7226 @@
 # Check whether --with-tclsh was given.
 if test "${with_tclsh+set}" = set; then :
-  withval=$with_tclsh; rp_with_tclsh=$withval
-else
-  rp_with_tclsh=yes
+  withval=$with_tclsh;
+else
+  with_tclsh=yes
 fi
 
 
 TCLSH=""
-if test "${rp_with_tclsh}" != "no" ; then
+if test "${with_tclsh}" != "no" ; then
   tclsh="tclsh${TCL_VERSION}"
-  if test "${rp_with_tclsh}" = "yes" ; then
+  if test "${with_tclsh}" = "yes" ; then
     # Extract the first word of "${tclsh}", so it can be a program name with args.
 set dummy ${tclsh}; ac_word=$2
@@ -7302 +7291 @@
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="${rp_with_tclsh}/bin:${rp_with_tclsh}"
+as_dummy="${with_tclsh}/bin:${with_tclsh}"
 for as_dir in $as_dummy
 do
@@ -7343 +7332 @@
 # Check whether --with-vtk was given.
 if test "${with_vtk+set}" = set; then :
-  withval=$with_vtk; rp_with_vtk=$withval
-else
-  rp_with_vtk=yes
+  withval=$with_vtk;
+else
+  with_vtk=yes
 fi
 
@@ -7353 +7342 @@
 VTKDIR=""
 
-if test "$rp_with_vtk" != "no" ; then
-  if test "$rp_with_vtk" = "yes" ; then
+if test "$with_vtk" != "no" ; then
+  if test "$with_vtk" = "yes" ; then
     for path in \
      $libdir \
@@ -8464 +8453 @@
 
 
-rp_with_ruby="yes"
-
 RUBY=""
 RUBY_DEV_PKG="no"
@@ -8472 +8459 @@
 # Check whether --with-ruby was given.
 if test "${with_ruby+set}" = set; then :
-  withval=$with_ruby; rp_with_ruby=$withval
-fi
-
-
-if test "${rp_with_ruby}" != "no" ; then
-  if test "${rp_with_ruby}" = "yes" ; then
+  withval=$with_ruby;
+else
+  with_ruby="yes"
+fi
+
+
+if test "${with_ruby}" != "no" ; then
+  if test "${with_ruby}" = "yes" ; then
     # Extract the first word of "ruby", so it can be a program name with args.
 set dummy ruby; ac_word=$2
@@ -8532 +8521 @@
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="${rp_with_ruby}/bin:${rp_with_ruby}"
+as_dummy="${with_ruby}/bin:${with_ruby}"
 for as_dir in $as_dummy
 do
@@ -9614 +9603 @@
 
 
+
 ac_configure_args="--disable-threads --enable-shared"
 
@@ -9620 +9610 @@
 
 
-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 gui/src/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"
+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 gui/src/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/octave2/Makefile examples/app-fermi/octave/octave3/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/Makefilexs 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
@@ -10384 +10374 @@
     "examples/app-fermi/matlab/compiled/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/matlab/compiled/Makefile" ;;
     "examples/app-fermi/matlab/uncompiled/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/matlab/uncompiled/Makefile" ;;
-    "examples/app-fermi/octave/2/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/2/Makefile" ;;
-    "examples/app-fermi/octave/3/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/3/Makefile" ;;
+    "examples/app-fermi/octave/octave2/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/octave2/Makefile" ;;
+    "examples/app-fermi/octave/octave3/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/octave3/Makefile" ;;
     "examples/app-fermi/octave/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/Makefile" ;;
     "examples/app-fermi/perl/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/perl/Makefile" ;;
@@ -10429 +10419 @@
     "examples/zoo/field/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/field/Makefile" ;;
     "examples/zoo/group/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/group/Makefile" ;;
-    "examples/zoo/image/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/image/Makefile" ;;
+    "examples/zoo/image/Makefilexs") CONFIG_FILES="$CONFIG_FILES examples/zoo/image/Makefilexs" ;;
     "examples/zoo/image/docs/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/image/docs/Makefile" ;;
     "examples/zoo/image/examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/image/examples/Makefile" ;;

trunk/configure.in

@@ -4 +4 @@
 AC_CONFIG_AUX_DIR(cf)
 AC_CONFIG_HEADER(src/core/config.h)
-
-with_tclsh=yes
-rp_with_tclsh="yes"
-rp_with_mkoctfile2="no"
-rp_with_mkoctfile3="no"
-rp_with_octave="yes"
-rp_with_vtk="yes"
-rp_with_matlab="yes"
-rp_with_perl="yes"
-rp_with_python="yes"
-rp_with_ruby="yes"
-rp_with_java="yes"
-with_install="yes"
 
 #------------------------------------------------------------------------
@@ -35 +22 @@
     [],
     [with_install=yes])
+
 if test "$with_install" != "yes"; then
     INSTALL_PREFIX=$with_install
@@ -153 +141 @@
     [AS_HELP_STRING([--with-tclsh[=DIR]],
         [location of tclsh @<:@default=yes@:>@])],
-    [rp_with_tclsh=$withval],
-    [rp_with_tclsh=yes])
+    [],
+    [with_tclsh=yes])
 
 TCLSH=""
-if test "${rp_with_tclsh}" != "no" ; then
+if test "${with_tclsh}" != "no" ; then
   tclsh="tclsh${TCL_VERSION}"
-  if test "${rp_with_tclsh}" = "yes" ; then 
+  if test "${with_tclsh}" = "yes" ; then 
     AC_PATH_PROG(TCLSH, ${tclsh}, [], [${exec_prefix}/bin:${PATH}])
   else 
-    AC_PATH_PROG(TCLSH, ${tclsh}, [], [${rp_with_tclsh}/bin:${rp_with_tclsh}])
+    AC_PATH_PROG(TCLSH, ${tclsh}, [], [${with_tclsh}/bin:${with_tclsh}])
   fi
   if test "x${TCLSH}" = "x" ; then
@@ -177 +165 @@
     [AS_HELP_STRING([--with-vtk[=DIR]],
         [location of vtk library @<:@default=yes@:>@])],
-    [rp_with_vtk=$withval], [rp_with_vtk=yes])
+    [], 
+    [with_vtk=yes])
 
 AC_MSG_CHECKING([for vtk])
 VTKDIR=""
 
-if test "$rp_with_vtk" != "no" ; then
-  if test "$rp_with_vtk" = "yes" ; then
+if test "$with_vtk" != "no" ; then
+  if test "$with_vtk" = "yes" ; then
     for path in \
      $libdir \
@@ -209 +198 @@
 RP_LANG_JAVA
 
-rp_with_ruby="yes"
-
 RUBY=""
 RUBY_DEV_PKG="no"
@@ -217 +204 @@
     [ruby],
     [AS_HELP_STRING([--with-ruby=DIR], [location of ruby @<:@default=yes@:>@])],
-    [rp_with_ruby=$withval])
-
-if test "${rp_with_ruby}" != "no" ; then
-  if test "${rp_with_ruby}" = "yes" ; then
+    [],
+    [with_ruby="yes"])
+
+if test "${with_ruby}" != "no" ; then
+  if test "${with_ruby}" = "yes" ; then
     AC_PATH_PROG(RUBY, ruby)
   else
-    AC_PATH_PROG(RUBY, ruby, [], [${rp_with_ruby}/bin:${rp_with_ruby}])
+    AC_PATH_PROG(RUBY, ruby, [], [${with_ruby}/bin:${with_ruby}])
   fi
 fi
@@ -261 +249 @@
 # -----------------------------------------------------------------------
 #
-# Compiler characteristics:     
+# Compiler characteristics:
 #   Check for existence of types of size_t and pid_t
 #
@@ -429 +417 @@
 AC_SUBST(TCL_VERSION)
 AC_SUBST(TCL_VERSION)
-AC_SUBST(TK_VERSION)
+AC_SUBST(TK_INC_SPEC)
 AC_SUBST(TK_LIB_SPEC)
 AC_SUBST(TK_XLIBSW)
+AC_SUBST(TK_VERSION)
 AC_SUBST(VTKDIR)
 
@@ -495 +484 @@
     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/octave2/Makefile
+    examples/app-fermi/octave/octave3/Makefile
     examples/app-fermi/octave/Makefile
     examples/app-fermi/perl/Makefile
@@ -540 +529 @@
     examples/zoo/field/Makefile
     examples/zoo/group/Makefile
-    examples/zoo/image/Makefile
+    examples/zoo/image/Makefilexs
     examples/zoo/image/docs/Makefile
     examples/zoo/image/examples/Makefile

trunk/gui/src/RpDiffview.c

@@ -2396 +2396 @@
     Tcl_HashEntry *entryPtr;
     Tcl_DString buffer;
-    DiffviewSubseq *K, *newK, newCandidate; int Kmax; int Klen;
+    DiffviewSubseq *K, *newK, newCandidate; 
+    int Kmax; int Klen;
     Tcl_Obj *listPtr, **objv;
     int i, j, candidateIdx, subseqLen, longestMatch;
@@ -2402 +2403 @@
     int len, created, o, objc, index1, *lcsIndex1, index2, *lcsIndex2;
     char *key;
+
+    newCandidate.index1 = -1;           /* Suppress compiler warning. */
+    newCandidate.index2 = -1;
+    newCandidate.next = -1;
 
     /*

trunk/lang/tcl/src/RpRusage.c

@@ -380 +380 @@
  */
 static void
-RpDestroyMarkNames(cdata, interp)
-    ClientData cdata;         /* data being destroyed */
-    Tcl_Interp *interp;       /* interpreter that owned the data */
+RpDestroyMarkNames(
+    ClientData cdata,                   /* data being destroyed */
+    Tcl_Interp *interp)                 /* Interpreter that owned the data */
 {
     Tcl_HashTable *markNamesPtr = cdata;
@@ -388 +388 @@
     Tcl_HashSearch search;
 
-    for (entryPtr=Tcl_FirstHashEntry(markNamesPtr, &search);
-         entryPtr != NULL;
+    for (entryPtr = Tcl_FirstHashEntry(markNamesPtr, &search); entryPtr != NULL;
          entryPtr = Tcl_NextHashEntry(&search)) {
         ckfree( (char*)Tcl_GetHashValue(entryPtr) );