Index: xotcl/ChangeLog =================================================================== diff -u -N -re44f69435e8db4aa6ed2ffffe8caaa6586c2fc5f -rcaee4f272cfc744a06a7df61e2f3c73da1b6be64 --- xotcl/ChangeLog (.../ChangeLog) (revision e44f69435e8db4aa6ed2ffffe8caaa6586c2fc5f) +++ xotcl/ChangeLog (.../ChangeLog) (revision caee4f272cfc744a06a7df61e2f3c73da1b6be64) @@ -1,3 +1,39 @@ +2007-10-04: + + * Revise fix below. The problem was apparently that change of a + call of Tcl_FindCommand to Tcl_GetCommandFromObj(), where the + latter one had bad side-effects when it is called during + deletion. Although the fix below fixed the symptoms, the new + approach is better since it is apparently not required any more + to fetch the cmd during PrimitiveODestroy to ensure it is not + called twice. The problem appeared in XOTcl between 1.5.3 and + 1.5.4 and happens only in 8.4.* Tcl. + + * Improve debugging code to make it easier to trace + problems with Tcl_Objs. + + * Serializer: Added dependency rule in serializer to ensure slots of + superclasses are listed before subclasses. (Thanks to Stefan + Sobernig for reporting the problem) + + * Serializer: moved deactivation of traces into "Serializer all" + to get simpler results on "o serialize". + + * Regression tests: extended tests to address + the newly identified and fixed problem cases. + +2007-09-29: + + * Fix for Tcl 8.4.16 (and maybe some other recent tcl 8.4.* + versions, 8.5 is fine) for situations, where Tcl variable + contain references to deleted XOTcl objects. The fix added a + epoch increment to CallStackDoDestroy(). + +2007-09-29: + + * Fix for cases, where volatile objects are destroyed + (e.g. manually) before the corresponding trace variable. + 2007-09-18: * Release of XOTcl 1.5.5 Index: xotcl/Makefile =================================================================== diff -u -N -rfce8f28780c2c91fc8320c5a480eb2b6031b3b5b -rcaee4f272cfc744a06a7df61e2f3c73da1b6be64 --- xotcl/Makefile (.../Makefile) (revision fce8f28780c2c91fc8320c5a480eb2b6031b3b5b) +++ xotcl/Makefile (.../Makefile) (revision caee4f272cfc744a06a7df61e2f3c73da1b6be64) @@ -12,25 +12,25 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: Makefile,v 1.47 2007/09/13 15:21:54 neumann Exp $ +# RCS: @(#) $Id: Makefile,v 1.48 2007/10/05 09:05:59 neumann Exp $ #======================================================================== # Add additional lines to handle any additional AC_SUBST cases that # have been added in a customized configure script. #======================================================================== -#XOTCL_VERSION = 1.5.5 +#XOTCL_VERSION = 1.5.6 XOTCL_VERSION = 1.5 src_lib_dir = ${srcdir}/library src_doc_dir = ${srcdir}/doc src_test_dir = ${srcdir}/tests src_app_dir = ${srcdir}/apps src_generic_dir = ${srcdir}/generic -TCL_LIB_SPEC = -L/usr/local/aolserver-4.5/lib -ltcl8.4 +TCL_LIB_SPEC = -L/usr/lib -ltcl8.4 TK_LIB_SPEC = -subdirs = library/store/XOTclSdbm/ library/store/XOTclGdbm/ library/xml/TclExpat-1.1/ -aol_prefix = /usr/local/aolserver-4.5 +subdirs = +aol_prefix = /usr/local/aolserver # Requires native paths PLATFORM_DIR = `echo $(srcdir)/unix` @@ -42,9 +42,9 @@ src_app_dir_native = `echo ${src_app_dir}` src_generic_dir_native = `echo ${src_generic_dir}` -libdirs = comm lib serialize actiweb rdf registry store xml patterns +libdirs = comm lib serialize libsrc = COPYRIGHT pkgIndex.tcl -appdirs = comm scripts utils actiweb persistence +appdirs = comm scripts utils appsrc = COPYRIGHT DOC_SOURCE = \ @@ -98,23 +98,23 @@ # configuration options) composed of the named objects. #======================================================================== -PKG_LIB_FILE = libxotcl1.5.5.dylib -PKG_STUB_LIB_FILE = libxotclstub1.5.5.a +PKG_LIB_FILE = libxotcl1.5.6.dylib +PKG_STUB_LIB_FILE = libxotclstub1.5.6.a lib_BINARIES = $(PKG_LIB_FILE) $(PKG_STUB_LIB_FILE) BINARIES = $(lib_BINARIES) SHELL = /bin/sh srcdir = . -prefix = /usr/local/aolserver-4.5 -exec_prefix = /usr/local/aolserver-4.5 +prefix = /usr +exec_prefix = /usr bindir = ${exec_prefix}/bin -libdir = /usr/local/aolserver-4.5/lib -datadir = /usr/local/aolserver-4.5/share +libdir = /usr/lib +datadir = /usr/share mandir = ${prefix}/man -includedir = /usr/local/aolserver-4.5/include +includedir = /usr/include DESTDIR = @@ -126,7 +126,7 @@ INSTALL_SCRIPT = ${INSTALL} PACKAGE_NAME = xotcl -PACKAGE_VERSION = 1.5.5 +PACKAGE_VERSION = 1.5.6 CC = gcc CFLAGS_DEFAULT = -Os CFLAGS_WARNING = -Wall -Wno-implicit-int @@ -143,19 +143,19 @@ SHLIB_CFLAGS = -fno-common SHLIB_LD = ${CC} -dynamiclib ${CFLAGS} ${LDFLAGS_DEFAULT} -Wl,-single_module SHLIB_LD_FLAGS = @SHLIB_LD_FLAGS@ -SHLIB_LD_LIBS = ${LIBS} -L/usr/local/aolserver-4.5/lib -ltclstub8.4 +SHLIB_LD_LIBS = ${LIBS} -L/usr/lib -ltclstub8.4 STLIB_LD = ${AR} cr TCL_DEFS = -DNO_VALUES_H=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_PTHREAD_ATFORK=1 -DTCL_THREADS=1 -DHAVE_COREFOUNDATION=1 -DMAC_OSX_TCL=1 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRSTR=1 -DHAVE_STRTOL=1 -DHAVE_STRTOLL=1 -DHAVE_STRTOULL=1 -DHAVE_TMPNAM=1 -DHAVE_WAITPID=1 -DHAVE_GETPWUID_R_5=1 -DHAVE_GETPWUID_R=1 -DHAVE_GETPWNAM_R_5=1 -DHAVE_GETPWNAM_R=1 -DHAVE_GETGRGID_R_5=1 -DHAVE_GETGRGID_R=1 -DHAVE_GETGRNAM_R_5=1 -DHAVE_GETGRNAM_R=1 -DHAVE_MTSAFE_GETHOSTBYNAME=1 -DHAVE_MTSAFE_GETHOSTBYADDR=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_TM_GMTOFF=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_PUTENV_THAT_COPIES=1 -DHAVE_LANGINFO=1 -DHAVE_COPYFILE=1 -DHAVE_LIBKERN_OSATOMIC_H=1 -DHAVE_OSSPINLOCKLOCK=1 -DHAVE_PTHREAD_ATFORK=1 -DUSE_VFORK=1 -DTCL_DEFAULT_ENCODING=\"utf-8\" -DTCL_LOAD_FROM_MEMORY=1 -DHAVE_AVAILABILITYMACROS_H=1 -DHAVE_FTS=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_SYS_FILIO_H=1 -TCL_BIN_DIR = /usr/local/aolserver-4.5/lib -TCL_SRC_DIR = /usr/local/src/tcl8.4.14 +TCL_BIN_DIR = /usr/lib +TCL_SRC_DIR = /usr/local/src/tcl8.4.16 # This is necessary for packages that use private Tcl headers -#TCL_TOP_DIR_NATIVE = "/usr/local/src/tcl8.4.14" +#TCL_TOP_DIR_NATIVE = "/usr/local/src/tcl8.4.16" # Not used, but retained for reference of what libs Tcl required TCL_LIBS = ${DL_LIBS} ${LIBS} ${MATH_LIBS} -pkgdatadir = /usr/local/aolserver-4.5/share/xotcl1.5.5 -pkglibdir = /usr/local/aolserver-4.5/lib/xotcl1.5.5 -pkgincludedir = /usr/local/aolserver-4.5/include/xotcl1.5.5 +pkgdatadir = /usr/share/xotcl1.5.6 +pkglibdir = /usr/lib/xotcl1.5.6 +pkgincludedir = /usr/include/xotcl1.5.6 # XOTCLSH = xotclsh @@ -171,20 +171,20 @@ DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \ PATH="$(EXTRA_PATH):$(PATH)" \ TCLLIBPATH="$(top_builddir) ${srcdir}" -TCLSH_PROG = /usr/local/aolserver-4.5/bin/tclsh8.4 +TCLSH_PROG = /usr/bin/tclsh8.4 TCLSH = $(TCLSH_ENV) $(TCLSH_PROG) SHARED_BUILD = 1 -INCLUDES = -I"/usr/local/src/tcl8.4.14/generic" -I"/usr/local/src/tcl8.4.14/unix" -I./generic -EXTRA_CFLAGS = -DXOTCLVERSION=\"1.5\" -DXOTCLPATCHLEVEL=\".5\" -DHAVE_TCL_COMPILE_H=1 +INCLUDES = -I"/usr/local/src/tcl8.4.16/generic" -I"/usr/local/src/tcl8.4.16/unix" -I./generic +EXTRA_CFLAGS = -DXOTCLVERSION=\"1.5\" -DXOTCLPATCHLEVEL=\".6\" -DHAVE_TCL_COMPILE_H=1 # TCL_DEFS is not strictly need here, but if you remove it, then you # must make sure that configure.in checks for the necessary components # that your library may use. TCL_DEFS can actually be a problem if # you do not compile with a similar machine setup as the Tcl core was # compiled with. -#DEFS = $(TCL_DEFS) -DPACKAGE_NAME=\"xotcl\" -DPACKAGE_TARNAME=\"xotcl\" -DPACKAGE_VERSION=\"1.5.5\" -DPACKAGE_STRING=\"xotcl\ 1.5.5\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DNO_VALUES_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DTCL_THREADS=1 -DTCL_WIDE_INT_TYPE=long\ long -DUSE_TCL_STUBS=1 -DCOMPILE_XOTCL_STUBS=1 $(EXTRA_CFLAGS) -DEFS = -DPACKAGE_NAME=\"xotcl\" -DPACKAGE_TARNAME=\"xotcl\" -DPACKAGE_VERSION=\"1.5.5\" -DPACKAGE_STRING=\"xotcl\ 1.5.5\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DNO_VALUES_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DTCL_THREADS=1 -DTCL_WIDE_INT_TYPE=long\ long -DUSE_TCL_STUBS=1 -DCOMPILE_XOTCL_STUBS=1 $(EXTRA_CFLAGS) +#DEFS = $(TCL_DEFS) -DPACKAGE_NAME=\"xotcl\" -DPACKAGE_TARNAME=\"xotcl\" -DPACKAGE_VERSION=\"1.5.6\" -DPACKAGE_STRING=\"xotcl\ 1.5.6\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DNO_VALUES_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DTCL_THREADS=1 -DTCL_WIDE_INT_TYPE=long\ long -DUSE_TCL_STUBS=1 -DCOMPILE_XOTCL_STUBS=1 $(EXTRA_CFLAGS) +DEFS = -DPACKAGE_NAME=\"xotcl\" -DPACKAGE_TARNAME=\"xotcl\" -DPACKAGE_VERSION=\"1.5.6\" -DPACKAGE_STRING=\"xotcl\ 1.5.6\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DNO_VALUES_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DTCL_THREADS=1 -DTCL_WIDE_INT_TYPE=long\ long -DUSE_TCL_STUBS=1 -DCOMPILE_XOTCL_STUBS=1 $(EXTRA_CFLAGS) CONFIG_CLEAN_FILES = Makefile xotclConfig.sh apps/utils/xotclsh apps/utils/xowish unix/xotcl.spec unix/pkgIndex.unix autom4te.cache/ @@ -335,7 +335,7 @@ gdb: $(TCLSH_ENV) gdb $(TCLSH_PROG) $(SCRIPT) -test: binaries libraries test-core test-http test-actiweb +test: binaries libraries test-core test-http test-nohttp: binaries libraries test-core #TESTFLAGS = -srcdir $(srcdir) @@ -634,7 +634,7 @@ @echo " setenv TCLLIBPATH \"$(TCLLIBPATH)\"" @echo " and" @if test "x$(XOTCLSH)" = "x" ; then \ - echo " /usr/local/aolserver-4.5/bin/tclsh8.4" ; \ + echo " /usr/bin/tclsh8.4" ; \ echo " package require XOTcl; namespace import -force xotcl::*" ; \ echo " or" ; \ echo " put the 'package require' line into your ~/.tclshrc" ; \ @@ -657,8 +657,8 @@ bin-tar: (cd ..; tar zcvf xotcl-$(PACKAGE_VERSION)-bin-linux-i686-glibc.tar.gz \ `find $(exec_prefix)/bin/xotclsh $(exec_prefix)/bin/xowish \ - $(prefix)/lib/xotcl* \ - $(prefix)/lib/libxotcl* \ + $(prefix)/lib/xotcl$(PACKAGE_VERSION)* \ + $(prefix)/lib/libxotcl$(PACKAGE_VERSION)* \ $(prefix)/include/xotcl*.h \ $(DESTDIR)$(pkglibdir) $(prefix)/man/man1/xo* \ -type f -o -type l | fgrep -v CVS | fgrep -v SCCS | fgrep -v .junk| fgrep -v .db | fgrep -v "~" | fgrep -v "#" | fgrep -v /receiver/` \ Index: xotcl/apps/utils/xotclsh =================================================================== diff -u -N -re525b7364d9b1fbc7b06e81becf4fe0df06c4209 -rcaee4f272cfc744a06a7df61e2f3c73da1b6be64 --- xotcl/apps/utils/xotclsh (.../xotclsh) (revision e525b7364d9b1fbc7b06e81becf4fe0df06c4209) +++ xotcl/apps/utils/xotclsh (.../xotclsh) (revision caee4f272cfc744a06a7df61e2f3c73da1b6be64) @@ -1,7 +1,7 @@ -#!/usr/local/aolserver-4.5/bin/tclsh8.4 +#!/usr/bin/tclsh8.4 if {$argc == 0} { puts "Don't use [info script] as interactive shell! Use instead:" - puts " /usr/local/aolserver-4.5/bin/tclsh8.4" + puts " /usr/bin/tclsh8.4" puts " package require XOTcl; namespace import ::xotcl::*" } else { package require XOTcl Index: xotcl/apps/utils/xowish =================================================================== diff -u -N -re525b7364d9b1fbc7b06e81becf4fe0df06c4209 -rcaee4f272cfc744a06a7df61e2f3c73da1b6be64 --- xotcl/apps/utils/xowish (.../xowish) (revision e525b7364d9b1fbc7b06e81becf4fe0df06c4209) +++ xotcl/apps/utils/xowish (.../xowish) (revision caee4f272cfc744a06a7df61e2f3c73da1b6be64) @@ -1,5 +1,5 @@ #!@WISH_PROG@ -###!/usr/local/aolserver-4.5/bin/tclsh8.4 +###!/usr/bin/tclsh8.4 ###package require Tk if {$argc == 0} { puts "Don't use [info script] as interactive shell! Use instead:" Index: xotcl/configure =================================================================== diff -u -N -rfce8f28780c2c91fc8320c5a480eb2b6031b3b5b -rcaee4f272cfc744a06a7df61e2f3c73da1b6be64 --- xotcl/configure (.../configure) (revision fce8f28780c2c91fc8320c5a480eb2b6031b3b5b) +++ xotcl/configure (.../configure) (revision caee4f272cfc744a06a7df61e2f3c73da1b6be64) @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for xotcl 1.5.5. +# Generated by GNU Autoconf 2.59 for xotcl 1.5.6. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -267,8 +267,8 @@ # Identity of this package. PACKAGE_NAME='xotcl' PACKAGE_TARNAME='xotcl' -PACKAGE_VERSION='1.5.5' -PACKAGE_STRING='xotcl 1.5.5' +PACKAGE_VERSION='1.5.6' +PACKAGE_STRING='xotcl 1.5.6' PACKAGE_BUGREPORT='' # Factoring default headers for most tests. @@ -777,7 +777,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xotcl 1.5.5 to adapt to many kinds of systems. +\`configure' configures xotcl 1.5.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -834,7 +834,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xotcl 1.5.5:";; + short | recursive ) echo "Configuration of xotcl 1.5.6:";; esac cat <<\_ACEOF @@ -979,7 +979,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -xotcl configure 1.5.5 +xotcl configure 1.5.6 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -993,7 +993,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xotcl $as_me 1.5.5, which was +It was created by xotcl $as_me 1.5.6, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1572,7 +1572,7 @@ # do not modify the following lines manually, they are generated with changeXOTclVersion XOTCL_MAJOR_VERSION=1 XOTCL_MINOR_VERSION=5 -XOTCL_RELEASE_LEVEL=.5 +XOTCL_RELEASE_LEVEL=.6 XOTCL_VERSION=${XOTCL_MAJOR_VERSION}.${XOTCL_MINOR_VERSION} NODOT_VERSION=${XOTCL_MAJOR_VERSION}${XOTCL_MINOR_VERSION} @@ -10804,7 +10804,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by xotcl $as_me 1.5.5, which was +This file was extended by xotcl $as_me 1.5.6, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10859,7 +10859,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xotcl config.status 1.5.5 +xotcl config.status 1.5.6 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -11479,3 +11479,5 @@ + + Index: xotcl/configure.in =================================================================== diff -u -N -rfce8f28780c2c91fc8320c5a480eb2b6031b3b5b -rcaee4f272cfc744a06a7df61e2f3c73da1b6be64 --- xotcl/configure.in (.../configure.in) (revision fce8f28780c2c91fc8320c5a480eb2b6031b3b5b) +++ xotcl/configure.in (.../configure.in) (revision caee4f272cfc744a06a7df61e2f3c73da1b6be64) @@ -11,7 +11,7 @@ # for this package, and can be a relative path, such as: # #-------------------------------------------------------------------- -define(XOTclVersion, 1.5.5) +define(XOTclVersion, 1.5.6) AC_INIT([xotcl], [XOTclVersion]) #-------------------------------------------------------------------- @@ -104,7 +104,7 @@ # do not modify the following lines manually, they are generated with changeXOTclVersion XOTCL_MAJOR_VERSION=1 XOTCL_MINOR_VERSION=5 -XOTCL_RELEASE_LEVEL=.5 +XOTCL_RELEASE_LEVEL=.6 XOTCL_VERSION=${XOTCL_MAJOR_VERSION}.${XOTCL_MINOR_VERSION} NODOT_VERSION=${XOTCL_MAJOR_VERSION}${XOTCL_MINOR_VERSION} @@ -491,3 +491,5 @@ + + Index: xotcl/doc/xo-daemon.html =================================================================== diff -u -N -re44f69435e8db4aa6ed2ffffe8caaa6586c2fc5f -rcaee4f272cfc744a06a7df61e2f3c73da1b6be64 --- xotcl/doc/xo-daemon.html (.../xo-daemon.html) (revision e44f69435e8db4aa6ed2ffffe8caaa6586c2fc5f) +++ xotcl/doc/xo-daemon.html (.../xo-daemon.html) (revision caee4f272cfc744a06a7df61e2f3c73da1b6be64) @@ -76,7 +76,7 @@ Date: - [::xotcl::rcs date {$Date: 2007/09/18 19:27:33 $}] + [::xotcl::rcs date {$Date: 2007/10/05 09:06:00 $}] Index: xotcl/doc/xo-whichPkg.html =================================================================== diff -u -N -re44f69435e8db4aa6ed2ffffe8caaa6586c2fc5f -rcaee4f272cfc744a06a7df61e2f3c73da1b6be64 --- xotcl/doc/xo-whichPkg.html (.../xo-whichPkg.html) (revision e44f69435e8db4aa6ed2ffffe8caaa6586c2fc5f) +++ xotcl/doc/xo-whichPkg.html (.../xo-whichPkg.html) (revision caee4f272cfc744a06a7df61e2f3c73da1b6be64) @@ -50,7 +50,7 @@ Date: - [::xotcl::rcs date {$Date: 2007/09/18 19:27:33 $}] + [::xotcl::rcs date {$Date: 2007/10/05 09:06:00 $}] Index: xotcl/generic/xotcl.c =================================================================== diff -u -N -rfce8f28780c2c91fc8320c5a480eb2b6031b3b5b -rcaee4f272cfc744a06a7df61e2f3c73da1b6be64 --- xotcl/generic/xotcl.c (.../xotcl.c) (revision fce8f28780c2c91fc8320c5a480eb2b6031b3b5b) +++ xotcl/generic/xotcl.c (.../xotcl.c) (revision caee4f272cfc744a06a7df61e2f3c73da1b6be64) @@ -1,4 +1,4 @@ -/* $Id: xotcl.c,v 1.49 2007/09/13 15:21:54 neumann Exp $ +/* $Id: xotcl.c,v 1.50 2007/10/05 09:06:00 neumann Exp $ * * XOTcl - Extended Object Tcl * @@ -750,9 +750,11 @@ #if defined(XOTCLOBJ_TRACE) void objTrace(char *string, XOTclObject *obj) { - if(obj) - fprintf(stderr,"--- %s tcl %p (%d) xotcl %p (%d) %s \n", string, - obj->cmdName, obj->cmdName->refCount, obj, obj->refCount, ObjStr(obj->cmdName)); + if (obj) + fprintf(stderr,"--- %s tcl %p %s (%d %p) xotcl %p (%d) %s \n", string, + obj->cmdName, obj->cmdName->typePtr ? obj->cmdName->typePtr->name : "NULL", + obj->cmdName->refCount, obj->cmdName->internalRep.twoPtrValue.ptr1, + obj, obj->refCount, ObjStr(obj->cmdName)); else fprintf(stderr,"--- No object: %s\n",string); } @@ -2371,7 +2373,8 @@ oid = obj->id; obj->id = 0; if (obj->teardown && oid) { - Tcl_DeleteCommandFromToken(in, oid); + /* This command will call PrimitiveODestroy or PrimitiveCDestroy */ + Tcl_DeleteCommandFromToken(in, oid); } } @@ -3395,7 +3398,7 @@ while (cmdList) { - if(Tcl_Command_cmdEpoch(cmdList->cmdPtr)) { + if (Tcl_Command_cmdEpoch(cmdList->cmdPtr)) { cmdList = cmdList->next; } else { cls = XOTclGetClassFromCmdPtr(cmdList->cmdPtr); @@ -4318,7 +4321,7 @@ FilterSeekCurrent(in, obj, &cmdList); while (cmdList) { - if(Tcl_Command_cmdEpoch(cmdList->cmdPtr)) { + if (Tcl_Command_cmdEpoch(cmdList->cmdPtr)) { cmdList = cmdList->next; } else if (FilterActiveOnObj(in, obj, cmdList->cmdPtr)) { /* fprintf(stderr, "Filter <%s> -- Active on: %s\n", @@ -5001,7 +5004,7 @@ callMethod = methodName; #ifdef AUTOVARS - if(!isNext) { + if (!isNext) { #endif /* Only start new filter chain, if (a) filters are defined and @@ -6915,9 +6918,9 @@ PrimitiveODestroy(ClientData cd) { XOTclObject *obj = (XOTclObject*)cd; Tcl_Interp *in; - Tcl_Command cmd; - /*fprintf(stderr, "****** PrimitiveODestroy %p\n",obj);*/ + + /* fprintf(stderr, "****** PrimitiveODestroy %p\n",obj);*/ assert(obj && !(obj->flags & XOTCL_DESTROYED)); /* @@ -6954,11 +6957,23 @@ while (obj->filterStack != NULL) FilterStackPop(obj); - cmd = Tcl_GetCommandFromObj(in, obj->cmdName); +#if 0 + { + /* Prevent that PrimitiveODestroy is called more than once. + This code was used in earlier versions of XOTcl + but does not seem necessary any more. If it has to be used + again in the future, don't use Tcl_GetCommandFromObj() + in Tcl 8.4.* versions. + */ + Tcl_Command cmd = Tcl_FindCommand(in, ObjStr(obj->cmdName), 0, 0); + /* cmd = Tcl_GetCommandFromObj(in, obj->cmdName);*/ + + if (cmd != NULL) { + Tcl_Command_deleteProc(cmd) = 0; + } + } +#endif - if (cmd != NULL) - Tcl_Command_deleteProc(cmd) = 0; - if (obj->nsPtr) { /*fprintf(stderr,"primitive odestroy calls deletenamespace for obj %p\n",obj);*/ XOTcl_DeleteNamespace(in, obj->nsPtr); @@ -9688,6 +9703,22 @@ return XOTclVarErrMsg(in, "Can't destroy object ", ObjStr(objv[1]), " that does not exist.", (char *) NULL); + + /* fprintf(stderr,"instdestroy obj=%s, opt=%p\n",ObjStr(delobj->cmdName),delobj->opt);*/ + + if (delobj->opt && delobj->opt->volatileVarName) { + /* + Somebody destroys a volatile object manually while + the vartrace is still active. Destroying the object will + be a problem in case the variable is deleted later + and fires the trace. So, we unset the variable here + which will cause a destroy via var trace, which in + turn clears the volatileVarName flag. + */ + /* fprintf(stderr,"volatile var name %s\n",delobj->opt->volatileVarName);*/ + return Tcl_UnsetVar2(in, delobj->opt->volatileVarName, 0, 0); + } + /* * latch, and call delete command if not already in progress */ @@ -9952,7 +9983,12 @@ if (XOTclObjConvertObject(in, obj, &o) == TCL_OK) { Tcl_Obj *res = Tcl_GetObjResult(in); /* save the result */ INCR_REF_COUNT(res); - + + /* clear variable, destroy is called from trace */ + if (o->opt && o->opt->volatileVarName) { + o->opt->volatileVarName = NULL; + } + if (callMethod((ClientData)o, in, XOTclGlobalObjects[XOTE_DESTROY],2,0,0) != TCL_OK) { result = "Destroy for volatile object failed"; } else @@ -10646,14 +10682,17 @@ char *vn; callFrameContext ctx = {0}; - if (objc != 1) return XOTclObjErrArgCnt(in, obj->cmdName, "volatile"); + if (objc != 1) + return XOTclObjErrArgCnt(in, obj->cmdName, "volatile"); CallStackUseActiveFrames(in, &ctx); vn = NSTail(fullName); if (Tcl_SetVar2(in, vn, 0, fullName, 0) != NULL) { - result = Tcl_TraceVar(in, vn, TCL_TRACE_UNSETS, (Tcl_VarTraceProc*)XOTclUnsetTrace, - (ClientData)o); + XOTclObjectOpt *opt = XOTclRequireObjectOpt(obj); + result = Tcl_TraceVar(in, vn, TCL_TRACE_UNSETS, (Tcl_VarTraceProc*)XOTclUnsetTrace, + (ClientData)o); + opt->volatileVarName = vn; } CallStackRestoreSavedFrames(in, &ctx); Index: xotcl/generic/xotclInt.h =================================================================== diff -u -N -re44f69435e8db4aa6ed2ffffe8caaa6586c2fc5f -rcaee4f272cfc744a06a7df61e2f3c73da1b6be64 --- xotcl/generic/xotclInt.h (.../xotclInt.h) (revision e44f69435e8db4aa6ed2ffffe8caaa6586c2fc5f) +++ xotcl/generic/xotclInt.h (.../xotclInt.h) (revision caee4f272cfc744a06a7df61e2f3c73da1b6be64) @@ -1,5 +1,5 @@ /* -*- Mode: c++ -*- - * $Id: xotclInt.h,v 1.25 2007/09/18 19:27:33 neumann Exp $ + * $Id: xotclInt.h,v 1.26 2007/10/05 09:06:00 neumann Exp $ * Extended Object Tcl (XOTcl) * * Copyright (C) 1999-2006 Gustaf Neumann, Uwe Zdun @@ -470,6 +470,7 @@ Tcl_HashTable metaData; #endif ClientData clientData; + char *volatileVarName; short checkoptions; } XOTclObjectOpt; Index: xotcl/library/lib/changeXOTclVersion.xotcl =================================================================== diff -u -N -r57972e5a2972b1eb5dd63f6e3d483670117feebf -rcaee4f272cfc744a06a7df61e2f3c73da1b6be64 --- xotcl/library/lib/changeXOTclVersion.xotcl (.../changeXOTclVersion.xotcl) (revision 57972e5a2972b1eb5dd63f6e3d483670117feebf) +++ xotcl/library/lib/changeXOTclVersion.xotcl (.../changeXOTclVersion.xotcl) (revision caee4f272cfc744a06a7df61e2f3c73da1b6be64) @@ -6,7 +6,7 @@ # set XOTCL_MAJOR_VERSION 1 set XOTCL_MINOR_VERSION 5 -set XOTCL_RELEASE_LEVEL .5 +set XOTCL_RELEASE_LEVEL .6 # example settings: # 1.0 Index: xotcl/library/serialize/Serializer.xotcl =================================================================== diff -u -N -re525b7364d9b1fbc7b06e81becf4fe0df06c4209 -rcaee4f272cfc744a06a7df61e2f3c73da1b6be64 --- xotcl/library/serialize/Serializer.xotcl (.../Serializer.xotcl) (revision e525b7364d9b1fbc7b06e81becf4fe0df06c4209) +++ xotcl/library/serialize/Serializer.xotcl (.../Serializer.xotcl) (revision caee4f272cfc744a06a7df61e2f3c73da1b6be64) @@ -1,4 +1,4 @@ -# $Id: Serializer.xotcl,v 1.18 2007/08/14 16:38:26 neumann Exp $ +# $Id: Serializer.xotcl,v 1.19 2007/10/05 09:06:00 neumann Exp $ package require XOTcl 1.5 package provide xotcl::serializer 1.0 @@ -15,7 +15,7 @@ authors { Gustaf Neumann, Gustaf.Neumann@wu-wien.ac.at } - date { $Date: 2007/08/14 16:38:26 $ } + date { $Date: 2007/10/05 09:06:00 $ } } @ Serializer proc all { @@ -343,7 +343,9 @@ Serializer instproc Class-needsNothing x { if {![my Object-needsNothing $x]} {return 0} - if {[my needsOneOf [$x info superclass]]} {return 0} + set scs [$x info superclass] + if {[my needsOneOf $scs]} {return 0} + foreach sc $scs {if {[my needsOneOf [$sc info slots]]} {return 0}} #if {[my needsOneOf [$x info instmixin ]]} {return 0} return 1 } @@ -395,7 +397,7 @@ # (3) re-activating the traces after variable initialization set exports "" - set pre_cmds "::xotcl::Object instproc trace args {}\n" + set pre_cmds "" # delete ::xotcl from the namespace list, if it exists... catch {unset namespace(::xotcl)} @@ -412,7 +414,7 @@ } } - append post_cmds "::xotcl::alias ::xotcl::Object trace -objscope ::trace\n" + #append post_cmds "::xotcl::alias ::xotcl::Object trace -objscope ::trace\n" return $pre_cmds$result$post_cmds$exports } Serializer instproc deepSerialize o { @@ -487,6 +489,7 @@ my exportMethods [list ::xotcl::Object proc __exitHandler] set r { set ::xotcl::__filterstate [::xotcl::configure filter off] + ::xotcl::Object instproc trace args {} ::xotcl::Slot instmixin add ::xotcl::Slot::Nocheck } append r "::xotcl::configure softrecreate [::xotcl::configure softrecreate]" @@ -504,6 +507,7 @@ } } append r { + ::xotcl::alias ::xotcl::Object trace -objscope ::trace ::xotcl::Slot instmixin delete ::xotcl::Slot::Nocheck ::xotcl::configure filter $::xotcl::__filterstate unset ::xotcl::__filterstate Index: xotcl/library/store/XOTclGdbm/configure =================================================================== diff -u -N -rfce8f28780c2c91fc8320c5a480eb2b6031b3b5b -rcaee4f272cfc744a06a7df61e2f3c73da1b6be64 --- xotcl/library/store/XOTclGdbm/configure (.../configure) (revision fce8f28780c2c91fc8320c5a480eb2b6031b3b5b) +++ xotcl/library/store/XOTclGdbm/configure (.../configure) (revision caee4f272cfc744a06a7df61e2f3c73da1b6be64) @@ -10996,3 +10996,5 @@ + + Index: xotcl/library/store/XOTclGdbm/configure.in =================================================================== diff -u -N -r57972e5a2972b1eb5dd63f6e3d483670117feebf -rcaee4f272cfc744a06a7df61e2f3c73da1b6be64 --- xotcl/library/store/XOTclGdbm/configure.in (.../configure.in) (revision 57972e5a2972b1eb5dd63f6e3d483670117feebf) +++ xotcl/library/store/XOTclGdbm/configure.in (.../configure.in) (revision caee4f272cfc744a06a7df61e2f3c73da1b6be64) @@ -3,7 +3,7 @@ dnl generate the file "configure", which is run during Tcl installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.18 2007/09/05 19:09:23 neumann Exp $ +# RCS: @(#) $Id: configure.in,v 1.19 2007/10/05 09:06:00 neumann Exp $ #----------------------------------------------------------------------- # Sample configure.in for Tcl Extensions. The only places you should @@ -281,3 +281,5 @@ + + Index: xotcl/library/store/XOTclSdbm/configure =================================================================== diff -u -N -rfce8f28780c2c91fc8320c5a480eb2b6031b3b5b -rcaee4f272cfc744a06a7df61e2f3c73da1b6be64 --- xotcl/library/store/XOTclSdbm/configure (.../configure) (revision fce8f28780c2c91fc8320c5a480eb2b6031b3b5b) +++ xotcl/library/store/XOTclSdbm/configure (.../configure) (revision caee4f272cfc744a06a7df61e2f3c73da1b6be64) @@ -10942,3 +10942,5 @@ + + Index: xotcl/library/store/XOTclSdbm/configure.in =================================================================== diff -u -N -r57972e5a2972b1eb5dd63f6e3d483670117feebf -rcaee4f272cfc744a06a7df61e2f3c73da1b6be64 --- xotcl/library/store/XOTclSdbm/configure.in (.../configure.in) (revision 57972e5a2972b1eb5dd63f6e3d483670117feebf) +++ xotcl/library/store/XOTclSdbm/configure.in (.../configure.in) (revision caee4f272cfc744a06a7df61e2f3c73da1b6be64) @@ -3,7 +3,7 @@ dnl generate the file "configure", which is run during Tcl installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.18 2007/09/05 19:09:23 neumann Exp $ +# RCS: @(#) $Id: configure.in,v 1.19 2007/10/05 09:06:00 neumann Exp $ #----------------------------------------------------------------------- # Sample configure.in for Tcl Extensions. The only places you should @@ -240,3 +240,5 @@ + + Index: xotcl/library/xml/TclExpat-1.1/configure =================================================================== diff -u -N -rfce8f28780c2c91fc8320c5a480eb2b6031b3b5b -rcaee4f272cfc744a06a7df61e2f3c73da1b6be64 --- xotcl/library/xml/TclExpat-1.1/configure (.../configure) (revision fce8f28780c2c91fc8320c5a480eb2b6031b3b5b) +++ xotcl/library/xml/TclExpat-1.1/configure (.../configure) (revision caee4f272cfc744a06a7df61e2f3c73da1b6be64) @@ -10982,3 +10982,5 @@ + + Index: xotcl/library/xml/TclExpat-1.1/configure.in =================================================================== diff -u -N -r57972e5a2972b1eb5dd63f6e3d483670117feebf -rcaee4f272cfc744a06a7df61e2f3c73da1b6be64 --- xotcl/library/xml/TclExpat-1.1/configure.in (.../configure.in) (revision 57972e5a2972b1eb5dd63f6e3d483670117feebf) +++ xotcl/library/xml/TclExpat-1.1/configure.in (.../configure.in) (revision caee4f272cfc744a06a7df61e2f3c73da1b6be64) @@ -3,7 +3,7 @@ dnl generate the file "configure", which is run during Tcl installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.18 2007/09/05 19:09:23 neumann Exp $ +# RCS: @(#) $Id: configure.in,v 1.19 2007/10/05 09:06:00 neumann Exp $ #----------------------------------------------------------------------- # Sample configure.in for Tcl Extensions. The only places you should @@ -245,3 +245,5 @@ + + Index: xotcl/tests/testx.xotcl =================================================================== diff -u -N -re525b7364d9b1fbc7b06e81becf4fe0df06c4209 -rcaee4f272cfc744a06a7df61e2f3c73da1b6be64 --- xotcl/tests/testx.xotcl (.../testx.xotcl) (revision e525b7364d9b1fbc7b06e81becf4fe0df06c4209) +++ xotcl/tests/testx.xotcl (.../testx.xotcl) (revision caee4f272cfc744a06a7df61e2f3c73da1b6be64) @@ -1,4 +1,4 @@ -#$Id: testx.xotcl,v 1.34 2007/08/14 16:38:27 neumann Exp $ +#$Id: testx.xotcl,v 1.35 2007/10/05 09:06:00 neumann Exp $ package require XOTcl namespace import -force xotcl::* @@ -2934,6 +2934,18 @@ namespace delete foo ::errorCheck [Object isobject ::foo::Foo] 0 "Namespace delete under object" + # destroy test + set x [Object create x] + x destroy + ::errorCheck [catch {$x set a 1}] 1 "Reference to destroyed object still valid" + + Object create x -volatile + unset x + ::errorCheck [catch {x destroy}] 1 "Object should not exist anymore" + + Object create x -volatile + x destroy + ::errorCheck [catch {unset x}] 1 "Variable should not exist anymore" } Index: xotcl/unix/pkgIndex.unix =================================================================== diff -u -N -r57972e5a2972b1eb5dd63f6e3d483670117feebf -rcaee4f272cfc744a06a7df61e2f3c73da1b6be64 --- xotcl/unix/pkgIndex.unix (.../pkgIndex.unix) (revision 57972e5a2972b1eb5dd63f6e3d483670117feebf) +++ xotcl/unix/pkgIndex.unix (.../pkgIndex.unix) (revision caee4f272cfc744a06a7df61e2f3c73da1b6be64) @@ -1,4 +1,4 @@ - package ifneeded XOTcl 1.5.5 [list load \ - [file join $dir libxotcl1.5.5.dylib] XOTcl] + package ifneeded XOTcl 1.5.6 [list load \ + [file join $dir libxotcl1.5.6.dylib] XOTcl] Index: xotcl/unix/xotcl.spec =================================================================== diff -u -N -r57972e5a2972b1eb5dd63f6e3d483670117feebf -rcaee4f272cfc744a06a7df61e2f3c73da1b6be64 --- xotcl/unix/xotcl.spec (.../xotcl.spec) (revision 57972e5a2972b1eb5dd63f6e3d483670117feebf) +++ xotcl/unix/xotcl.spec (.../xotcl.spec) (revision caee4f272cfc744a06a7df61e2f3c73da1b6be64) @@ -1,13 +1,13 @@ Summary: Object Oriented Extension for Tcl Name: xotcl -Version: 1.5.5 +Version: 1.5.6 Release: 0 License: bsd style open source Group: Development/Languages -Source: http://www.xotcl.org/xotcl-1.5.5.tar.gz +Source: http://www.xotcl.org/xotcl-1.5.6.tar.gz URL: http://www.xotcl.org Packager: Gustaf.Neumann@wu-wien.ac.at -Distribution: Fedorea Core 3 +Distribution: Fedorea Core 7 Requires: tcl Prefix: /usr BuildRoot: %{_tmppath}/%{name}-root @@ -23,28 +23,29 @@ consult http://www.xotcl.org %prep -%setup -q -n xotcl-1.5.5 +%setup -q -n xotcl-1.5.6 %build autoconf -./configure --with-tcl=/usr/lib --with-all --prefix=/usr/local/aolserver-4.5 --exec-prefix=/usr/local/aolserver-4.5 -#make CFLAGS_DEFAULT='-O3 -mcpu=i686 -Wall -fomit-frame-pointer' +# ./configure --with-tcl=/usr/lib --with-all --prefix=/usr --exec-prefix=/usr +./configure --with-tcl=/usr/lib --with-all --prefix=/usr --exec-prefix=/usr +# make CFLAGS_DEFAULT='-O3 -mcpu=i686 -Wall -fomit-frame-pointer' make CFLAGS_DEFAULT='-O3 -Wall -fomit-frame-pointer' %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -rm -f $RPM_BUILD_ROOT/usr/lib/libxotcl1.5.5.so -ln -s xotcl1.5.5/libxotcl1.5.5.so $RPM_BUILD_ROOT/usr/lib +rm -f $RPM_BUILD_ROOT/usr/lib/libxotcl1.5.6.so +ln -s xotcl1.5.6/libxotcl1.5.6.so $RPM_BUILD_ROOT/usr/lib %files %defattr(-, root, root) %doc doc %_bindir/xotclsh %_bindir/xowish -%_prefix/lib/xotcl1.5.5 -%_prefix/lib/libxotcl1.5.5.so +%_prefix/lib/xotcl1.5.6 +%_prefix/lib/libxotcl1.5.6.so %_prefix/lib/xotclexpat* %_prefix/lib/xotclgdbm* %_prefix/lib/xotclsdbm* Index: xotcl/xotclConfig.sh =================================================================== diff -u -N -r57972e5a2972b1eb5dd63f6e3d483670117feebf -rcaee4f272cfc744a06a7df61e2f3c73da1b6be64 --- xotcl/xotclConfig.sh (.../xotclConfig.sh) (revision 57972e5a2972b1eb5dd63f6e3d483670117feebf) +++ xotcl/xotclConfig.sh (.../xotclConfig.sh) (revision caee4f272cfc744a06a7df61e2f3c73da1b6be64) @@ -15,7 +15,7 @@ XOTCL_VERSION='1.5' XOTCL_MAJOR_VERSION='1' XOTCL_MINOR_VERSION='5' -XOTCL_RELEASE_LEVEL='.5' +XOTCL_RELEASE_LEVEL='.6' # String to pass to compiles to pick up includes during build # (i.e., assuming nothing has been installed) @@ -24,34 +24,34 @@ # String to pass to compiles to pick up the XOTcl includes from their # installed directory. -XOTCL_INCLUDE_DIR="/usr/local/aolserver-4.5/include/xotcl1.5.5" +XOTCL_INCLUDE_DIR="/usr/include/xotcl1.5.6" XOTCL_INCLUDE_SPEC="-I$XOTCL_INCLUDE_DIR" # The name of the XOTcl library (may be either a .a file or a shared library): -XOTCL_LIB_FILE=libxotcl1.5.5.dylib +XOTCL_LIB_FILE=libxotcl1.5.6.dylib # String to pass to linker to pick up the XOTcl library from its # build directory. -XOTCL_BUILD_LIB_SPEC='-L/Users/neumann/src/xotcl-1.5.5 -lxotcl1.5.5' +XOTCL_BUILD_LIB_SPEC='-L/Users/neumann/src/xotcl-1.5.6 -lxotcl1.5.6' # String to pass to linker to pick up the XOTcl library from its # installed directory. -XOTCL_LIB_SPEC='-L/usr/local/aolserver-4.5/lib/xotcl1.5.5 -lxotcl1.5.5' +XOTCL_LIB_SPEC='-L/usr/lib/xotcl1.5.6 -lxotcl1.5.6' # The name of the XOTcl stub library (a .a file): -# XOTCL_STUB_LIB_FILE=libxotclstub1.5.5.a +# XOTCL_STUB_LIB_FILE=libxotclstub1.5.6.a # String to pass to linker to pick up the XOTcl stub library from its # build directory. -XOTCL_BUILD_STUB_LIB_SPEC='-L/Users/neumann/src/xotcl-1.5.5 -lxotclstub1.5.5' +XOTCL_BUILD_STUB_LIB_SPEC='-L/Users/neumann/src/xotcl-1.5.6 -lxotclstub1.5.6' # String to pass to linker to pick up the XOTcl stub library from its # installed directory. -XOTCL_STUB_LIB_SPEC='-L/usr/local/aolserver-4.5/lib/xotcl1.5.5 -lxotclstub1.5.5' +XOTCL_STUB_LIB_SPEC='-L/usr/lib/xotcl1.5.6 -lxotclstub1.5.6' # Name of the xotcl stub library with full path in build and install directory -XOTCL_BUILD_STUB_LIB_PATH='/Users/neumann/src/xotcl-1.5.5/libxotclstub1.5.5.a' -XOTCL_STUB_LIB_PATH='/usr/local/aolserver-4.5/lib/xotcl1.5.5/libxotclstub1.5.5.a' +XOTCL_BUILD_STUB_LIB_PATH='/Users/neumann/src/xotcl-1.5.6/libxotclstub1.5.6.a' +XOTCL_STUB_LIB_PATH='/usr/lib/xotcl1.5.6/libxotclstub1.5.6.a' # Location of the top-level source directories from which XOTcl # was built. This is the directory that contains generic, unix, etc. @@ -61,9 +61,9 @@ XOTCL_SRC_DIR='.' # shared and unshared library suffix -XOTCL_SHARED_LIB_SUFFIX=1.5.5.dylib -XOTCL_UNSHARED_LIB_SUFFIX=1.5.5.a +XOTCL_SHARED_LIB_SUFFIX=1.5.6.dylib +XOTCL_UNSHARED_LIB_SUFFIX=1.5.6.a # the shell in whose installation dirs the xotcl package is installed -XOTCL_COMPATIBLE_TCLSH=/usr/local/aolserver-4.5/bin/tclsh8.4 +XOTCL_COMPATIBLE_TCLSH=/usr/bin/tclsh8.4