Changeset 2310


Ignore:
Timestamp:
Jul 10, 2011 6:47:35 PM (11 years ago)
Author:
gah
Message:

update from trunk

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure

    r2298 r2310  
    607607subdirs
    608608VTKDIR
     609TK_VERSION
    609610TK_XLIBSW
    610611TK_LIB_SPEC
    611 TK_VERSION
     612TK_INC_SPEC
    612613TCL_VERSION
    613614TCL_LIB_SPEC
     
    27152716
    27162717
    2717 with_tclsh=yes
    2718 rp_with_tclsh="yes"
    2719 rp_with_mkoctfile2="no"
    2720 rp_with_mkoctfile3="no"
    2721 rp_with_octave="yes"
    2722 rp_with_vtk="yes"
    2723 rp_with_matlab="yes"
    2724 rp_with_perl="yes"
    2725 rp_with_python="yes"
    2726 rp_with_ruby="yes"
    2727 rp_with_java="yes"
    2728 with_install="yes"
    2729 
    27302718#------------------------------------------------------------------------
    27312719# Handle the --prefix=... option
     
    27462734  with_install=yes
    27472735fi
     2736
    27482737
    27492738if test "$with_install" != "yes"; then
     
    72377226# Check whether --with-tclsh was given.
    72387227if test "${with_tclsh+set}" = set; then :
    7239   withval=$with_tclsh; rp_with_tclsh=$withval
    7240 else
    7241   rp_with_tclsh=yes
     7228  withval=$with_tclsh;
     7229else
     7230  with_tclsh=yes
    72427231fi
    72437232
    72447233
    72457234TCLSH=""
    7246 if test "${rp_with_tclsh}" != "no" ; then
     7235if test "${with_tclsh}" != "no" ; then
    72477236  tclsh="tclsh${TCL_VERSION}"
    7248   if test "${rp_with_tclsh}" = "yes" ; then
     7237  if test "${with_tclsh}" = "yes" ; then
    72497238    # Extract the first word of "${tclsh}", so it can be a program name with args.
    72507239set dummy ${tclsh}; ac_word=$2
     
    73027291  *)
    73037292  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    7304 as_dummy="${rp_with_tclsh}/bin:${rp_with_tclsh}"
     7293as_dummy="${with_tclsh}/bin:${with_tclsh}"
    73057294for as_dir in $as_dummy
    73067295do
     
    73437332# Check whether --with-vtk was given.
    73447333if test "${with_vtk+set}" = set; then :
    7345   withval=$with_vtk; rp_with_vtk=$withval
    7346 else
    7347   rp_with_vtk=yes
     7334  withval=$with_vtk;
     7335else
     7336  with_vtk=yes
    73487337fi
    73497338
     
    73537342VTKDIR=""
    73547343
    7355 if test "$rp_with_vtk" != "no" ; then
    7356   if test "$rp_with_vtk" = "yes" ; then
     7344if test "$with_vtk" != "no" ; then
     7345  if test "$with_vtk" = "yes" ; then
    73577346    for path in \
    73587347     $libdir \
     
    84648453
    84658454
    8466 rp_with_ruby="yes"
    8467 
    84688455RUBY=""
    84698456RUBY_DEV_PKG="no"
     
    84728459# Check whether --with-ruby was given.
    84738460if test "${with_ruby+set}" = set; then :
    8474   withval=$with_ruby; rp_with_ruby=$withval
    8475 fi
    8476 
    8477 
    8478 if test "${rp_with_ruby}" != "no" ; then
    8479   if test "${rp_with_ruby}" = "yes" ; then
     8461  withval=$with_ruby;
     8462else
     8463  with_ruby="yes"
     8464fi
     8465
     8466
     8467if test "${with_ruby}" != "no" ; then
     8468  if test "${with_ruby}" = "yes" ; then
    84808469    # Extract the first word of "ruby", so it can be a program name with args.
    84818470set dummy ruby; ac_word=$2
     
    85328521  *)
    85338522  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    8534 as_dummy="${rp_with_ruby}/bin:${rp_with_ruby}"
     8523as_dummy="${with_ruby}/bin:${with_ruby}"
    85358524for as_dir in $as_dummy
    85368525do
     
    96149603
    96159604
     9605
    96169606ac_configure_args="--disable-threads --enable-shared"
    96179607
     
    96209610
    96219611
    9622 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"
     9612ac_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"
    96239613
    96249614cat >confcache <<\_ACEOF
     
    1038410374    "examples/app-fermi/matlab/compiled/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/matlab/compiled/Makefile" ;;
    1038510375    "examples/app-fermi/matlab/uncompiled/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/matlab/uncompiled/Makefile" ;;
    10386     "examples/app-fermi/octave/2/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/2/Makefile" ;;
    10387     "examples/app-fermi/octave/3/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/3/Makefile" ;;
     10376    "examples/app-fermi/octave/octave2/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/octave2/Makefile" ;;
     10377    "examples/app-fermi/octave/octave3/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/octave3/Makefile" ;;
    1038810378    "examples/app-fermi/octave/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/octave/Makefile" ;;
    1038910379    "examples/app-fermi/perl/Makefile") CONFIG_FILES="$CONFIG_FILES examples/app-fermi/perl/Makefile" ;;
     
    1042910419    "examples/zoo/field/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/field/Makefile" ;;
    1043010420    "examples/zoo/group/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/group/Makefile" ;;
    10431     "examples/zoo/image/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/image/Makefile" ;;
     10421    "examples/zoo/image/Makefilexs") CONFIG_FILES="$CONFIG_FILES examples/zoo/image/Makefilexs" ;;
    1043210422    "examples/zoo/image/docs/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/image/docs/Makefile" ;;
    1043310423    "examples/zoo/image/examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/zoo/image/examples/Makefile" ;;
  • trunk/configure.in

    r2298 r2310  
    44AC_CONFIG_AUX_DIR(cf)
    55AC_CONFIG_HEADER(src/core/config.h)
    6 
    7 with_tclsh=yes
    8 rp_with_tclsh="yes"
    9 rp_with_mkoctfile2="no"
    10 rp_with_mkoctfile3="no"
    11 rp_with_octave="yes"
    12 rp_with_vtk="yes"
    13 rp_with_matlab="yes"
    14 rp_with_perl="yes"
    15 rp_with_python="yes"
    16 rp_with_ruby="yes"
    17 rp_with_java="yes"
    18 with_install="yes"
    196
    207#------------------------------------------------------------------------
     
    3522    [],
    3623    [with_install=yes])
     24
    3725if test "$with_install" != "yes"; then
    3826    INSTALL_PREFIX=$with_install
     
    153141    [AS_HELP_STRING([--with-tclsh[=DIR]],
    154142        [location of tclsh @<:@default=yes@:>@])],
    155     [rp_with_tclsh=$withval],
    156     [rp_with_tclsh=yes])
     143    [],
     144    [with_tclsh=yes])
    157145
    158146TCLSH=""
    159 if test "${rp_with_tclsh}" != "no" ; then
     147if test "${with_tclsh}" != "no" ; then
    160148  tclsh="tclsh${TCL_VERSION}"
    161   if test "${rp_with_tclsh}" = "yes" ; then
     149  if test "${with_tclsh}" = "yes" ; then
    162150    AC_PATH_PROG(TCLSH, ${tclsh}, [], [${exec_prefix}/bin:${PATH}])
    163151  else
    164     AC_PATH_PROG(TCLSH, ${tclsh}, [], [${rp_with_tclsh}/bin:${rp_with_tclsh}])
     152    AC_PATH_PROG(TCLSH, ${tclsh}, [], [${with_tclsh}/bin:${with_tclsh}])
    165153  fi
    166154  if test "x${TCLSH}" = "x" ; then
     
    177165    [AS_HELP_STRING([--with-vtk[=DIR]],
    178166        [location of vtk library @<:@default=yes@:>@])],
    179     [rp_with_vtk=$withval], [rp_with_vtk=yes])
     167    [],
     168    [with_vtk=yes])
    180169
    181170AC_MSG_CHECKING([for vtk])
    182171VTKDIR=""
    183172
    184 if test "$rp_with_vtk" != "no" ; then
    185   if test "$rp_with_vtk" = "yes" ; then
     173if test "$with_vtk" != "no" ; then
     174  if test "$with_vtk" = "yes" ; then
    186175    for path in \
    187176     $libdir \
     
    209198RP_LANG_JAVA
    210199
    211 rp_with_ruby="yes"
    212 
    213200RUBY=""
    214201RUBY_DEV_PKG="no"
     
    217204    [ruby],
    218205    [AS_HELP_STRING([--with-ruby=DIR], [location of ruby @<:@default=yes@:>@])],
    219     [rp_with_ruby=$withval])
    220 
    221 if test "${rp_with_ruby}" != "no" ; then
    222   if test "${rp_with_ruby}" = "yes" ; then
     206    [],
     207    [with_ruby="yes"])
     208
     209if test "${with_ruby}" != "no" ; then
     210  if test "${with_ruby}" = "yes" ; then
    223211    AC_PATH_PROG(RUBY, ruby)
    224212  else
    225     AC_PATH_PROG(RUBY, ruby, [], [${rp_with_ruby}/bin:${rp_with_ruby}])
     213    AC_PATH_PROG(RUBY, ruby, [], [${with_ruby}/bin:${with_ruby}])
    226214  fi
    227215fi
     
    261249# -----------------------------------------------------------------------
    262250#
    263 # Compiler characteristics:     
     251# Compiler characteristics:
    264252#   Check for existence of types of size_t and pid_t
    265253#
     
    429417AC_SUBST(TCL_VERSION)
    430418AC_SUBST(TCL_VERSION)
    431 AC_SUBST(TK_VERSION)
     419AC_SUBST(TK_INC_SPEC)
    432420AC_SUBST(TK_LIB_SPEC)
    433421AC_SUBST(TK_XLIBSW)
     422AC_SUBST(TK_VERSION)
    434423AC_SUBST(VTKDIR)
    435424
     
    495484    examples/app-fermi/matlab/compiled/Makefile
    496485    examples/app-fermi/matlab/uncompiled/Makefile
    497     examples/app-fermi/octave/2/Makefile
    498     examples/app-fermi/octave/3/Makefile
     486    examples/app-fermi/octave/octave2/Makefile
     487    examples/app-fermi/octave/octave3/Makefile
    499488    examples/app-fermi/octave/Makefile
    500489    examples/app-fermi/perl/Makefile
     
    540529    examples/zoo/field/Makefile
    541530    examples/zoo/group/Makefile
    542     examples/zoo/image/Makefile
     531    examples/zoo/image/Makefilexs
    543532    examples/zoo/image/docs/Makefile
    544533    examples/zoo/image/examples/Makefile
  • trunk/gui/src/RpDiffview.c

    r2135 r2310  
    23962396    Tcl_HashEntry *entryPtr;
    23972397    Tcl_DString buffer;
    2398     DiffviewSubseq *K, *newK, newCandidate; int Kmax; int Klen;
     2398    DiffviewSubseq *K, *newK, newCandidate;
     2399    int Kmax; int Klen;
    23992400    Tcl_Obj *listPtr, **objv;
    24002401    int i, j, candidateIdx, subseqLen, longestMatch;
     
    24022403    int len, created, o, objc, index1, *lcsIndex1, index2, *lcsIndex2;
    24032404    char *key;
     2405
     2406    newCandidate.index1 = -1;           /* Suppress compiler warning. */
     2407    newCandidate.index2 = -1;
     2408    newCandidate.next = -1;
    24042409
    24052410    /*
  • trunk/lang/tcl/src/RpRusage.c

    r2195 r2310  
    380380 */
    381381static void
    382 RpDestroyMarkNames(cdata, interp)
    383     ClientData cdata;         /* data being destroyed */
    384     Tcl_Interp *interp;       /* interpreter that owned the data */
     382RpDestroyMarkNames(
     383    ClientData cdata,                   /* data being destroyed */
     384    Tcl_Interp *interp)                 /* Interpreter that owned the data */
    385385{
    386386    Tcl_HashTable *markNamesPtr = cdata;
     
    388388    Tcl_HashSearch search;
    389389
    390     for (entryPtr=Tcl_FirstHashEntry(markNamesPtr, &search);
    391          entryPtr != NULL;
     390    for (entryPtr = Tcl_FirstHashEntry(markNamesPtr, &search); entryPtr != NULL;
    392391         entryPtr = Tcl_NextHashEntry(&search)) {
    393392        ckfree( (char*)Tcl_GetHashValue(entryPtr) );
Note: See TracChangeset for help on using the changeset viewer.