Index: COMPILE.win =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r46f02e4868e118466d888b35d6b281b3f2ba31ac --- COMPILE.win (.../COMPILE.win) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ COMPILE.win (.../COMPILE.win) (revision 46f02e4868e118466d888b35d6b281b3f2ba31ac) @@ -1,4 +1,4 @@ -$Id: COMPILE.win,v 1.1 2004/05/23 22:50:39 neumann Exp $ +$Id: COMPILE.win,v 1.1.1.1 2004/05/23 22:50:39 neumann Exp $ ******************************** XOTcl Windows compilation guide: ******************************** Index: ChangeLog =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r46f02e4868e118466d888b35d6b281b3f2ba31ac --- ChangeLog (.../ChangeLog) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ ChangeLog (.../ChangeLog) (revision 46f02e4868e118466d888b35d6b281b3f2ba31ac) @@ -1,79 +1,14 @@ - -2007-10-12: - * Release of XOTcl 1.5.6 - -2007-10-09: - * More fixes for treating gobal volatile objects - during shutdown: - - do not allow to create new objects during shutdown - - do not allow objects to be set volatile during shutdown - - handle cases, where application level destroy methods - fail (this could lead to remaining tcl traces pointing - to destroyed objects) - - handle namespaced variables helding deletion traces - for volatile objects - Guess, it would be much simpler to use Tcl-level - unset traces than C-level unset traces... - -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 - deleted before the corrsoponding trace variable. - -2007-09-18: +2007-09-00: * Release of XOTcl 1.5.5 -2007-09-18: - * Fix rpm build (most probably due to TEA 3.6) - -2007-09-13: - * Use AssocData instead of the clientdata of the - global namespace to store the XOTcl interpreter's - -2007-09-13: - * Upgrade to TEA 3.6 - -2007-09-10: - * Make forward option -earlybinding more robust, when - forwards are done to Tcl procs - 2007-08-16: - * Fix introspection problem for copied objects and classes + * fix introspection problem for copied objects and classes (remove superfluous ::xotcl::initProcNS) Must have been a bug from before XOTcl 1.0 - * Allow to load XOTcl compiled for Tcl 8.4 to be loaded + * allow to load xotcl compiled for Tcl 8.4 to be loaded into a tclsh8.5 (again, substantial change). - The behavior can be turned off by setting + the behavior can be turned of by setting FORWARD_COMPATIBLE to 0 One can now test now 4 versions: @@ -82,8 +17,8 @@ c) a version compiled for Tcl 8.4 with compatibility layer in tclsh8.4 d) a version compiled for Tcl 8.4 with compatibility layer in tclsh8.5 - Tests showed that the overhead is for the compatibility - layer is between 1.1% and 2.3%, the difference between + My tests showed that the overhead is for the compatibility + layer is between 1.1 and 2.3%, the difference between tcl8.5 and tcl8.4 is much larger. 2007-08-10: @@ -167,6 +102,7 @@ from slot objects (Many thanks for Nico L'INSALATA for noting this problem). + 2007-06-05: * Fixed spelling mistakes in the tutorial (Many thanks to Robert Hicks for reporting) @@ -176,6 +112,80 @@ starting with a "-". (Many thanks to Shishir Ramam for reporting) +2007-05-05: + * changed configure to perform the following three steps + a) get default values from slot objects + b) set provided configuration values (method setvalues) + c) check if all required values are provided + This are the same steps as performed by nonpos args + handling. + + Essentially, configure behaves like the following method + + ::xotcl::Object instproc configure args { + set sos [my info slotobjects] + foreach so $sos { + if {[$so exists default]} { + my set [$so name] [$so default] + } + if {[$so exists initcmd]} { + eval [$so initcmd] + } + } + set r [eval my setvalues $args] + foreach so $sos { + if {[$so exists required]} { + if {![my exists [$so name]]} { + error "required attribute [$so name] missing" + } + } + } + return $r + } + + * configure returns now an argument list for init. + This makes it possible to let configure pass nonposargs + to init + +2007-05-03: + * Change initialization of objects such that they + get all data from the slot objects. The internal + variables __defaults and __initcmd are gone. + +2007-04-04: + * renamed XOTclAddClass and XOTclFreeClasses + to XOTclClassListAdd and XOTclClassListFree + * new C functions + XOTclObjectListAdd and XOTclObjectListFree + * renamed XOTclOGetInstVar2 and XOTclOSetInstVar2 to + XOTcl_ObjGetVar2 and XOTcl_ObjSetVar2 + (same interface like Tcl_ObjGetVar2 and Tcl_ObjSetVar2, + except first argument is an xotcl object) + * new C functions + XOTcl_GetVar2Ex and XOTcl_SetVar2Ex + (same interface like Tcl_GetVar2Ex and Tcl_SetVar2Ex, + except first argument is an xotcl object) + +2007-04-03: + * new method info slotobjects + +TODO DOCUMENT +renamed + +isclass, ismetaclass -> info + + #::xotcl::alias object isclass ::xotcl::cmd::Object::isclass + #::xotcl::alias object ismetaclass ::xotcl::cmd::Object::ismetaclass + + # ::xotcl::relation ::oo::object instmixin object + + * info class: dropped optional argument. + * info classchildren: removed + * info classparent: removed + # ::errorCheck [Class info class Object] 1 "Class info is type Object" + comment and test new info + (e.g. is) + 2007-03-16: * fixed a bug where a Tcl call adds a namespace to an object, but xotcl did not notice it. (Many thanks for Stefan Sobernig @@ -184,7 +194,7 @@ 2007-01-14: * fixing error message propagation for methods called via configure. (Many thanks for Kristoffer Lawson - for reporting the bug) + for reporting the bug) 2006-12-12 * changing "test == " to "test =" as required by FreeBSD @@ -196,12 +206,82 @@ (many thanks to Martin Matuska for providing the patch) + +2006-11-20 + * fix propagating break code "return -code break" from tcl-implemented + methods (Many thanks to Artur Trzewik for reporting) + +2006-11-10 + * Changed error messages emitted by XOTclObjErrArgCnt to include + name of registered method rather than the hard-coded name + (Necessary, when methods are registered via alias under different names) + + * changed name from ::xotcl::setrelation to ::xotcl::relation (old name deprecated) + + * ::xotcl::relation can be used to set or query the relation + (like "set", when no value is given in the last argument). + Changed names from xotcl-way to more generic names + + usage: ::xotcl::relation + where relationName is one of + class + superclass + object-filter + class-filter + object-mixin + class-mixin + + * new primitive command ::xotcl::is + ::xotcl::is type + ::xotcl::is object + ::xotcl::is class + ::xotcl::is metaclass + ::xotcl::is mixin + +2006-11-01 + * fixed overwriting error messages in configure + * added ? to pattern characters for info commands + +2006-10-31 + protect/unportect added (arguments called currently + tip #257 compatible export/unexport + +... initslots.... + +CallStackDoDestroy(Tcl_Interp *in, XOTclObject *obj) { + Tcl_Command oid; + +2006-10-28 + * Tcl_DeleteCommandFromToken can change the Tcl result; + make sure, the old result is saved, when a callstackframe is popped + +2006-10-18 + * ignore next on deallocated objects + * check names in alloc instead of create + +2006-10-17 + * ::xotcl::alias: get original proc in cases, a namespace imported + command was specified + * "instdestroy" renamed to "dealloc"; TODO depcreacte? + +2006-10-05 + * provided new toplevel classes ::oo::object and ::oo::class + * moved more configuration from C to the startup file. + * allow both "self calledproc" and "self calledmethod" + * made self methods slightly faster (e.g. self proc) + * TODO copy depends on "proc" and "instproc" + +2006-10-02 + * new option "-local" added to ":xotcl::my" to prevent subclasses + to overload implementation details accidently (as suggested by Neil Madden). + (Should probably implemented differently to allow mixins + filters) + 2006-11-25 * Release of XOTcl 1.5.3 2006-11-24 * provided compatibility with Tcl 8.5 - (checking callframe level instead of empty varframe for toplevel + (checking callframe level instead of empty varframe for toplevel frames) * provided compatibility with Tcl 8.4.14 @@ -222,6 +302,7 @@ * library/comm/Access.xotcl: fixed handling of chunked encoding + 2006-09-29 , Uwe Zdun * Release of XOTcl 1.5.2 Index: Makefile =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r46f02e4868e118466d888b35d6b281b3f2ba31ac --- Makefile (.../Makefile) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ Makefile (.../Makefile) (revision 46f02e4868e118466d888b35d6b281b3f2ba31ac) @@ -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.49 2007/10/12 19:53:32 neumann Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.21 2006/10/04 20:40:23 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.6 -XOTCL_VERSION = 1.5 +#XOTCL_VERSION = 1.6.0 +XOTCL_VERSION = 1.6 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/lib -ltcl8.5 +TCL_LIB_SPEC = -L/usr/local/aolserver-4.5/lib -ltcl8.4 TK_LIB_SPEC = subdirs = -aol_prefix = /usr/local/aolserver +aol_prefix = /usr/local/aolserver-4.5 # Requires native paths PLATFORM_DIR = `echo $(srcdir)/unix` @@ -98,23 +98,23 @@ # configuration options) composed of the named objects. #======================================================================== -PKG_LIB_FILE = libxotcl1.5.6.dylib -PKG_STUB_LIB_FILE = libxotclstub1.5.6.a +PKG_LIB_FILE = libxotcl1.6.0.dylib +PKG_STUB_LIB_FILE = libxotclstub1.6.0.a lib_BINARIES = $(PKG_LIB_FILE) $(PKG_STUB_LIB_FILE) BINARIES = $(lib_BINARIES) SHELL = /bin/sh srcdir = . -prefix = /usr/local -exec_prefix = /usr/local +prefix = /usr/local/aolserver-4.5 +exec_prefix = /usr/local/aolserver-4.5 bindir = ${exec_prefix}/bin -libdir = /usr/local/lib -datadir = /usr/local/share +libdir = /usr/local/aolserver-4.5/lib +datadir = /usr/local/aolserver-4.5/share mandir = ${prefix}/man -includedir = /usr/local/include +includedir = /usr/local/aolserver-4.5/include DESTDIR = @@ -126,8 +126,8 @@ INSTALL_SCRIPT = ${INSTALL} PACKAGE_NAME = xotcl -PACKAGE_VERSION = 1.5.6 -CC = gcc +PACKAGE_VERSION = 1.6.0 +CC = gcc -pipe CFLAGS_DEFAULT = -Os CFLAGS_WARNING = -Wall -Wno-implicit-int CLEANFILES = *.o *.a *.so *~ core gmon.out @@ -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/lib -ltclstub8.5 +SHLIB_LD_LIBS = ${LIBS} -L/usr/local/aolserver-4.5/lib -ltclstub8.4 STLIB_LD = ${AR} cr -TCL_DEFS = -DPACKAGE_NAME=\"tcl\" -DPACKAGE_TARNAME=\"tcl\" -DPACKAGE_VERSION=\"8.5\" -DPACKAGE_STRING=\"tcl\ 8.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 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_PTHREAD_GET_STACKSIZE_NP=1 -DTCL_THREADS=1 -DTCL_CFGVAL_ENCODING=\"iso8859-1\" -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(\"hidden\"\)\)\) -DHAVE_COREFOUNDATION=1 -DMAC_OSX_TCL=1 -DTCL_SHLIB_EXT=\".dylib\" -DTCL_CFG_OPTIMIZED=1 -DTCL_CFG_DEBUG=1 -DTCL_TOMMATH=1 -DMP_PREC=4 -DTCL_WIDE_INT_TYPE=long\ long -DHAVE_GETCWD=1 -DHAVE_OPENDIR=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_STRUCT_TM_TM_ZONE=1 -DHAVE_TM_ZONE=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_MKTIME=1 -DHAVE_TM_GMTOFF=1 -DHAVE_STRUCT_STAT_ST_BLKSIZE=1 -DHAVE_ST_BLKSIZE=1 -DHAVE_INTPTR_T=1 -DHAVE_UINTPTR_T=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_PUTENV_THAT_COPIES=1 -DHAVE_LANGINFO=1 -DHAVE_CHFLAGS=1 -DHAVE_GETATTRLIST=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 -DTCL_WIDE_CLICKS=1 -DHAVE_AVAILABILITYMACROS_H=1 -DHAVE_FTS=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_SYS_FILIO_H=1 -DTCL_UNLOAD_DLLS=1 -TCL_BIN_DIR = /usr/local/lib -TCL_SRC_DIR = /Users/neumann/src/tcl/tcl +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 # This is necessary for packages that use private Tcl headers -#TCL_TOP_DIR_NATIVE = "/Users/neumann/src/tcl/tcl" +#TCL_TOP_DIR_NATIVE = "/usr/local/src/tcl8.4.14" # Not used, but retained for reference of what libs Tcl required TCL_LIBS = ${DL_LIBS} ${LIBS} ${MATH_LIBS} -pkgdatadir = /usr/local/share/xotcl1.5.6 -pkglibdir = /usr/local/lib/xotcl1.5.6 -pkgincludedir = /usr/local/include/xotcl1.5.6 +pkgdatadir = /usr/local/aolserver-4.5/share/xotcl1.6.0 +pkglibdir = /usr/local/aolserver-4.5/lib/xotcl1.6.0 +pkgincludedir = /usr/local/aolserver-4.5/include/xotcl1.6.0 # XOTCLSH = xotclsh @@ -171,27 +171,27 @@ DYLD_LIBRARY_PATH="$(EXTRA_PATH):$(DYLD_LIBRARY_PATH)" \ PATH="$(EXTRA_PATH):$(PATH)" \ TCLLIBPATH="$(top_builddir) ${srcdir}" -TCLSH_PROG = /usr/local/bin/tclsh8.5 +TCLSH_PROG = /usr/local/aolserver-4.5/bin/tclsh8.4 TCLSH = $(TCLSH_ENV) $(TCLSH_PROG) SHARED_BUILD = 1 -INCLUDES = -I"/Users/neumann/src/tcl/tcl/generic" -I"/Users/neumann/src/tcl/tcl/unix" -I./generic -EXTRA_CFLAGS = -DXOTCLVERSION=\"1.5\" -DXOTCLPATCHLEVEL=\".6\" -DHAVE_TCL_COMPILE_H=1 +INCLUDES = -I"/usr/local/src/tcl8.4.14/generic" -I"/usr/local/src/tcl8.4.14/unix" -I./generic +EXTRA_CFLAGS = -DXOTCLVERSION=\"1.6\" -DXOTCLPATCHLEVEL=\".0\" -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.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) +#DEFS = $(TCL_DEFS) -DPACKAGE_NAME=\"xotcl\" -DPACKAGE_TARNAME=\"xotcl\" -DPACKAGE_VERSION=\"1.6.0\" -DPACKAGE_STRING=\"xotcl\ 1.6.0\" -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.6.0\" -DPACKAGE_STRING=\"xotcl\ 1.6.0\" -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/ CPPFLAGS = LIBS = AR = ar -CFLAGS = -pipe ${CFLAGS_DEFAULT} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} +CFLAGS = ${CFLAGS_DEFAULT} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) #======================================================================== @@ -291,7 +291,7 @@ rm -rf $(DESTDIR)$(pkglibdir)/apps/$$i ; \ mkdir -p $(DESTDIR)$(pkglibdir)/apps/$$i; \ chmod 755 $(DESTDIR)$(pkglibdir)/apps/$$i; \ - for j in $(src_app_dir)/$$i/* ; do \ + for j in $(src_app_dir)/$$i/* ; do \ if test -d $$j; then \ mkdir -p $(DESTDIR)$(pkglibdir)/$$j; \ chmod 755 $(DESTDIR)$(pkglibdir)/$$j; \ @@ -301,7 +301,7 @@ else \ $(INSTALL) $$j $(DESTDIR)$(pkglibdir)/apps/$$i/; \ fi; \ - done; \ + done; \ done; @for i in $(appsrc) ; do \ echo " Installing $$i" ; \ @@ -634,7 +634,7 @@ @echo " setenv TCLLIBPATH \"$(TCLLIBPATH)\"" @echo " and" @if test "x$(XOTCLSH)" = "x" ; then \ - echo " /usr/local/bin/tclsh8.5" ; \ + echo " /usr/local/aolserver-4.5/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$(PACKAGE_VERSION)* \ - $(prefix)/lib/libxotcl$(PACKAGE_VERSION)* \ + $(prefix)/lib/xotcl* \ + $(prefix)/lib/libxotcl* \ $(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: Makefile.in =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r46f02e4868e118466d888b35d6b281b3f2ba31ac --- Makefile.in (.../Makefile.in) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ Makefile.in (.../Makefile.in) (revision 46f02e4868e118466d888b35d6b281b3f2ba31ac) @@ -12,7 +12,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: Makefile.in,v 1.25 2007/09/18 19:27:32 neumann Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.21 2006/10/04 20:40:23 neumann Exp $ #======================================================================== # Add additional lines to handle any additional AC_SUBST cases that @@ -291,7 +291,7 @@ rm -rf $(DESTDIR)$(pkglibdir)/apps/$$i ; \ mkdir -p $(DESTDIR)$(pkglibdir)/apps/$$i; \ chmod 755 $(DESTDIR)$(pkglibdir)/apps/$$i; \ - for j in $(src_app_dir)/$$i/* ; do \ + for j in $(src_app_dir)/$$i/* ; do \ if test -d $$j; then \ mkdir -p $(DESTDIR)$(pkglibdir)/$$j; \ chmod 755 $(DESTDIR)$(pkglibdir)/$$j; \ @@ -301,7 +301,7 @@ else \ $(INSTALL) $$j $(DESTDIR)$(pkglibdir)/apps/$$i/; \ fi; \ - done; \ + done; \ done; @for i in $(appsrc) ; do \ echo " Installing $$i" ; \ @@ -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$(PACKAGE_VERSION)* \ - $(prefix)/lib/libxotcl$(PACKAGE_VERSION)* \ + $(prefix)/lib/xotcl* \ + $(prefix)/lib/libxotcl* \ $(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: apps/actiweb/Counter.README =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r46f02e4868e118466d888b35d6b281b3f2ba31ac --- apps/actiweb/Counter.README (.../Counter.README) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ apps/actiweb/Counter.README (.../Counter.README) (revision 46f02e4868e118466d888b35d6b281b3f2ba31ac) @@ -1,4 +1,4 @@ -* $Id: Counter.README,v 1.1 2004/05/23 22:50:39 neumann Exp $ +* $Id: Counter.README,v 1.1.1.1 2004/05/23 22:50:39 neumann Exp $ * * Variationen des Counter-Themas im ActiWeb: * (Zeilenangaben ohne Kommentare und Leerzeilen) Index: apps/actiweb/Counter3.xotcl =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r46f02e4868e118466d888b35d6b281b3f2ba31ac --- apps/actiweb/Counter3.xotcl (.../Counter3.xotcl) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ apps/actiweb/Counter3.xotcl (.../Counter3.xotcl) (revision 46f02e4868e118466d888b35d6b281b3f2ba31ac) @@ -1,5 +1,5 @@ #!../../src/xotclsh -# $Id: Counter3.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $ +# $Id: Counter3.xotcl,v 1.1.1.1 2004/05/23 22:50:39 neumann Exp $ array set opts {-pkgdir .}; array set opts $argv lappend auto_path $opts(-pkgdir) Index: apps/actiweb/FormsWithState.xotcl =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r46f02e4868e118466d888b35d6b281b3f2ba31ac --- apps/actiweb/FormsWithState.xotcl (.../FormsWithState.xotcl) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ apps/actiweb/FormsWithState.xotcl (.../FormsWithState.xotcl) (revision 46f02e4868e118466d888b35d6b281b3f2ba31ac) @@ -1,5 +1,5 @@ #!../../src/xotclsh -# $Id: FormsWithState.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $ +# $Id: FormsWithState.xotcl,v 1.1.1.1 2004/05/23 22:50:39 neumann Exp $ # # Demo Program for Multi-Page Forms implemented via hidden # Form Fields -gn Index: apps/actiweb/MC.xotcl =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r46f02e4868e118466d888b35d6b281b3f2ba31ac --- apps/actiweb/MC.xotcl (.../MC.xotcl) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ apps/actiweb/MC.xotcl (.../MC.xotcl) (revision 46f02e4868e118466d888b35d6b281b3f2ba31ac) @@ -1,5 +1,5 @@ #!../../src/xotclsh -# $Id: MC.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $ +# $Id: MC.xotcl,v 1.1.1.1 2004/05/23 22:50:39 neumann Exp $ # # A simple multiple choice test application # Index: apps/actiweb/examples.README =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r46f02e4868e118466d888b35d6b281b3f2ba31ac --- apps/actiweb/examples.README (.../examples.README) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ apps/actiweb/examples.README (.../examples.README) (revision 46f02e4868e118466d888b35d6b281b3f2ba31ac) @@ -1,4 +1,4 @@ -* $Id: examples.README,v 1.1 2004/05/23 22:50:39 neumann Exp $ +* $Id: examples.README,v 1.1.1.1 2004/05/23 22:50:39 neumann Exp $ * * This directory contains several simple ActiWeb introductory examples * Index: apps/comm/webserver.xotcl =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r46f02e4868e118466d888b35d6b281b3f2ba31ac --- apps/comm/webserver.xotcl (.../webserver.xotcl) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ apps/comm/webserver.xotcl (.../webserver.xotcl) (revision 46f02e4868e118466d888b35d6b281b3f2ba31ac) @@ -1,5 +1,5 @@ #!../../src/xotclsh -# $Id: webserver.xotcl,v 1.9 2007/08/14 16:38:26 neumann Exp $ +# $Id: webserver.xotcl,v 1.6 2006/09/27 08:12:39 neumann Exp $ array set opts {-root ../../doc -port 8086 -protected-port 9096 -pkgdir .} array set opts $argv lappend auto_path $opts(-pkgdir) Index: apps/scripts/adapter.xotcl =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r46f02e4868e118466d888b35d6b281b3f2ba31ac --- apps/scripts/adapter.xotcl (.../adapter.xotcl) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ apps/scripts/adapter.xotcl (.../adapter.xotcl) (revision 46f02e4868e118466d888b35d6b281b3f2ba31ac) @@ -1,4 +1,4 @@ -# $Id: adapter.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $ +# $Id: adapter.xotcl,v 1.1.1.1 2004/05/23 22:50:39 neumann Exp $ Class Adapter -superclass Class @ @File { Index: apps/scripts/adapterExample.xotcl =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r46f02e4868e118466d888b35d6b281b3f2ba31ac --- apps/scripts/adapterExample.xotcl (.../adapterExample.xotcl) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ apps/scripts/adapterExample.xotcl (.../adapterExample.xotcl) (revision 46f02e4868e118466d888b35d6b281b3f2ba31ac) @@ -1,4 +1,4 @@ -# $Id: adapterExample.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $ +# $Id: adapterExample.xotcl,v 1.1.1.1 2004/05/23 22:50:39 neumann Exp $ # include the adapter pattern source adapter.xotcl Index: apps/scripts/composite.xotcl =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r46f02e4868e118466d888b35d6b281b3f2ba31ac --- apps/scripts/composite.xotcl (.../composite.xotcl) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ apps/scripts/composite.xotcl (.../composite.xotcl) (revision 46f02e4868e118466d888b35d6b281b3f2ba31ac) @@ -1,4 +1,4 @@ -#$Id: composite.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $ +#$Id: composite.xotcl,v 1.1.1.1 2004/05/23 22:50:39 neumann Exp $ Class Composite -superclass Class Composite metadata add description @ @File { Index: apps/scripts/compositeExample.xotcl =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r46f02e4868e118466d888b35d6b281b3f2ba31ac --- apps/scripts/compositeExample.xotcl (.../compositeExample.xotcl) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ apps/scripts/compositeExample.xotcl (.../compositeExample.xotcl) (revision 46f02e4868e118466d888b35d6b281b3f2ba31ac) @@ -1,4 +1,4 @@ -# $Id: compositeExample.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $ +# $Id: compositeExample.xotcl,v 1.1.1.1 2004/05/23 22:50:39 neumann Exp $ # include the pattern source composite.xotcl Index: apps/scripts/observer.xotcl =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r46f02e4868e118466d888b35d6b281b3f2ba31ac --- apps/scripts/observer.xotcl (.../observer.xotcl) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ apps/scripts/observer.xotcl (.../observer.xotcl) (revision 46f02e4868e118466d888b35d6b281b3f2ba31ac) @@ -1,4 +1,4 @@ -#$Id: observer.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $ +#$Id: observer.xotcl,v 1.1.1.1 2004/05/23 22:50:39 neumann Exp $ Class Observer -superclass Class Observer metadata add description Index: apps/scripts/pinger.xotcl =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r46f02e4868e118466d888b35d6b281b3f2ba31ac --- apps/scripts/pinger.xotcl (.../pinger.xotcl) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ apps/scripts/pinger.xotcl (.../pinger.xotcl) (revision 46f02e4868e118466d888b35d6b281b3f2ba31ac) @@ -1,4 +1,4 @@ -#$Id: pinger.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $ +#$Id: pinger.xotcl,v 1.1.1.1 2004/05/23 22:50:39 neumann Exp $ # include the pattern source observer.xotcl Index: apps/scripts/simpleFilters.xotcl =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r46f02e4868e118466d888b35d6b281b3f2ba31ac --- apps/scripts/simpleFilters.xotcl (.../simpleFilters.xotcl) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ apps/scripts/simpleFilters.xotcl (.../simpleFilters.xotcl) (revision 46f02e4868e118466d888b35d6b281b3f2ba31ac) @@ -1,4 +1,4 @@ -# $Id: simpleFilters.xotcl,v 1.1 2004/05/23 22:50:39 neumann Exp $ +# $Id: simpleFilters.xotcl,v 1.1.1.1 2004/05/23 22:50:39 neumann Exp $ @ @File { description { Index: apps/scripts/soccerClub.xotcl =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r46f02e4868e118466d888b35d6b281b3f2ba31ac --- apps/scripts/soccerClub.xotcl (.../soccerClub.xotcl) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ apps/scripts/soccerClub.xotcl (.../soccerClub.xotcl) (revision 46f02e4868e118466d888b35d6b281b3f2ba31ac) @@ -1,4 +1,4 @@ -# $Id: soccerClub.xotcl,v 1.7 2007/08/14 16:38:26 neumann Exp $ +# $Id: soccerClub.xotcl,v 1.4 2006/09/27 08:12:39 neumann Exp $ # This is a simple introductory example for the language XOTcl. # It demonstrates the basic language constructs on the example of # a soccer club. Index: apps/utils/xotclsh =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r46f02e4868e118466d888b35d6b281b3f2ba31ac --- apps/utils/xotclsh (.../xotclsh) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ apps/utils/xotclsh (.../xotclsh) (revision 46f02e4868e118466d888b35d6b281b3f2ba31ac) @@ -1,7 +1,7 @@ -#!/usr/local/bin/tclsh8.5 +#!/usr/local/aolserver-4.5/bin/tclsh8.4 if {$argc == 0} { puts "Don't use [info script] as interactive shell! Use instead:" - puts " /usr/local/bin/tclsh8.5" + puts " /usr/local/aolserver-4.5/bin/tclsh8.4" puts " package require XOTcl; namespace import ::xotcl::*" } else { package require XOTcl Index: apps/utils/xowish =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r46f02e4868e118466d888b35d6b281b3f2ba31ac --- apps/utils/xowish (.../xowish) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ apps/utils/xowish (.../xowish) (revision 46f02e4868e118466d888b35d6b281b3f2ba31ac) @@ -1,5 +1,5 @@ #!@WISH_PROG@ -###!/usr/local/bin/tclsh8.5 +###!/usr/local/aolserver-4.5/bin/tclsh8.4 ###package require Tk if {$argc == 0} { puts "Don't use [info script] as interactive shell! Use instead:" Index: configure =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r46f02e4868e118466d888b35d6b281b3f2ba31ac --- configure (.../configure) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ configure (.../configure) (revision 46f02e4868e118466d888b35d6b281b3f2ba31ac) @@ -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.6. +# Generated by GNU Autoconf 2.59 for xotcl 1.6.0. # # 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.6' -PACKAGE_STRING='xotcl 1.5.6' +PACKAGE_VERSION='1.6.0' +PACKAGE_STRING='xotcl 1.6.0' 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.6 to adapt to many kinds of systems. +\`configure' configures xotcl 1.6.0 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.6:";; + short | recursive ) echo "Configuration of xotcl 1.6.0:";; 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.6 +xotcl configure 1.6.0 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.6, which was +It was created by xotcl $as_me 1.6.0, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1338,7 +1338,7 @@ # TEA extensions pass this us the version of TEA they think they # are compatible with. - TEA_VERSION="3.6" + TEA_VERSION="3.5" echo "$as_me:$LINENO: checking for correct TEA configuration" >&5 echo $ECHO_N "checking for correct TEA configuration... $ECHO_C" >&6 @@ -1349,15 +1349,15 @@ The PACKAGE_NAME variable must be defined by your TEA configure.in" >&2;} { (exit 1); exit 1; }; } fi - if test x"3.6" = x ; then + if test x"3.5" = x ; then { { echo "$as_me:$LINENO: error: TEA version not specified." >&5 echo "$as_me: error: TEA version not specified." >&2;} { (exit 1); exit 1; }; } - elif test "3.6" != "${TEA_VERSION}" ; then - echo "$as_me:$LINENO: result: warning: requested TEA version \"3.6\", have \"${TEA_VERSION}\"" >&5 -echo "${ECHO_T}warning: requested TEA version \"3.6\", have \"${TEA_VERSION}\"" >&6 + elif test "3.5" != "${TEA_VERSION}" ; then + echo "$as_me:$LINENO: result: warning: requested TEA version \"3.5\", have \"${TEA_VERSION}\"" >&5 +echo "${ECHO_T}warning: requested TEA version \"3.5\", have \"${TEA_VERSION}\"" >&6 else echo "$as_me:$LINENO: result: ok (TEA ${TEA_VERSION})" >&5 echo "${ECHO_T}ok (TEA ${TEA_VERSION})" >&6 @@ -1571,8 +1571,8 @@ # do not modify the following lines manually, they are generated with changeXOTclVersion XOTCL_MAJOR_VERSION=1 -XOTCL_MINOR_VERSION=5 -XOTCL_RELEASE_LEVEL=.6 +XOTCL_MINOR_VERSION=6 +XOTCL_RELEASE_LEVEL=.0 XOTCL_VERSION=${XOTCL_MAJOR_VERSION}.${XOTCL_MINOR_VERSION} NODOT_VERSION=${XOTCL_MAJOR_VERSION}${XOTCL_MINOR_VERSION} @@ -1733,7 +1733,7 @@ if test -f "${TCL_BIN_DIR}/tclConfig.sh" ; then echo "$as_me:$LINENO: result: loading" >&5 echo "${ECHO_T}loading" >&6 - . "${TCL_BIN_DIR}/tclConfig.sh" + . ${TCL_BIN_DIR}/tclConfig.sh else echo "$as_me:$LINENO: result: could not find ${TCL_BIN_DIR}/tclConfig.sh" >&5 echo "${ECHO_T}could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6 @@ -1749,7 +1749,7 @@ # of TCL_BUILD_LIB_SPEC. An extension should make use of TCL_LIB_SPEC # instead of TCL_BUILD_LIB_SPEC since it will work with both an # installed and uninstalled version of Tcl. - if test -f "${TCL_BIN_DIR}/Makefile" ; then + if test -f ${TCL_BIN_DIR}/Makefile ; then TCL_LIB_SPEC=${TCL_BUILD_LIB_SPEC} TCL_STUB_LIB_SPEC=${TCL_BUILD_STUB_LIB_SPEC} TCL_STUB_LIB_PATH=${TCL_BUILD_STUB_LIB_PATH} @@ -1759,7 +1759,7 @@ # against Tcl.framework installed in an arbitary location. case ${TCL_DEFS} in *TCL_FRAMEWORK*) - if test -f "${TCL_BIN_DIR}/${TCL_LIB_FILE}"; then + if test -f ${TCL_BIN_DIR}/${TCL_LIB_FILE}; then for i in "`cd ${TCL_BIN_DIR}; pwd`" \ "`cd ${TCL_BIN_DIR}/../..; pwd`"; do if test "`basename "$i"`" = "${TCL_LIB_FILE}.framework"; then @@ -1768,7 +1768,7 @@ fi done fi - if test -f "${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}"; then + if test -f ${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}; then TCL_STUB_LIB_SPEC="-L${TCL_BIN_DIR} ${TCL_STUB_LIB_FLAG}" TCL_STUB_LIB_PATH="${TCL_BIN_DIR}/${TCL_STUB_LIB_FILE}" fi @@ -1950,7 +1950,7 @@ if test -f "${TK_BIN_DIR}/tkConfig.sh" ; then echo "$as_me:$LINENO: result: loading" >&5 echo "${ECHO_T}loading" >&6 - . "${TK_BIN_DIR}/tkConfig.sh" + . ${TK_BIN_DIR}/tkConfig.sh else echo "$as_me:$LINENO: result: could not find ${TK_BIN_DIR}/tkConfig.sh" >&5 echo "${ECHO_T}could not find ${TK_BIN_DIR}/tkConfig.sh" >&6 @@ -1966,7 +1966,7 @@ # of TK_BUILD_LIB_SPEC. An extension should make use of TK_LIB_SPEC # instead of TK_BUILD_LIB_SPEC since it will work with both an # installed and uninstalled version of Tcl. - if test -f "${TK_BIN_DIR}/Makefile" ; then + if test -f ${TK_BIN_DIR}/Makefile ; then TK_LIB_SPEC=${TK_BUILD_LIB_SPEC} TK_STUB_LIB_SPEC=${TK_BUILD_STUB_LIB_SPEC} TK_STUB_LIB_PATH=${TK_BUILD_STUB_LIB_PATH} @@ -1976,7 +1976,7 @@ # against Tk.framework installed in an arbitary location. case ${TK_DEFS} in *TK_FRAMEWORK*) - if test -f "${TK_BIN_DIR}/${TK_LIB_FILE}"; then + if test -f ${TK_BIN_DIR}/${TK_LIB_FILE}; then for i in "`cd ${TK_BIN_DIR}; pwd`" \ "`cd ${TK_BIN_DIR}/../..; pwd`"; do if test "`basename "$i"`" = "${TK_LIB_FILE}.framework"; then @@ -1985,7 +1985,7 @@ fi done fi - if test -f "${TK_BIN_DIR}/${TK_STUB_LIB_FILE}"; then + if test -f ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}; then TK_STUB_LIB_SPEC="-L${TK_BIN_DIR} ${TK_STUB_LIB_FLAG}" TK_STUB_LIB_PATH="${TK_BIN_DIR}/${TK_STUB_LIB_FILE}" fi @@ -3724,12 +3724,9 @@ if test -z "$no_pipe" -a -n "$GCC"; then echo "$as_me:$LINENO: checking if the compiler understands -pipe" >&5 echo $ECHO_N "checking if the compiler understands -pipe... $ECHO_C" >&6 -if test "${tcl_cv_cc_pipe+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -pipe" - cat >conftest.$ac_ext <<_ACEOF + OLDCC="$CC" + CC="$CC -pipe" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3766,21 +3763,17 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - tcl_cv_cc_pipe=yes + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -tcl_cv_cc_pipe=no +CC="$OLDCC" + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS=$hold_cflags -fi -echo "$as_me:$LINENO: result: $tcl_cv_cc_pipe" >&5 -echo "${ECHO_T}$tcl_cv_cc_pipe" >&6 - if test $tcl_cv_cc_pipe = yes; then - CFLAGS="$CFLAGS -pipe" - fi fi #-------------------------------------------------------------------- @@ -6529,8 +6522,6 @@ ;; *) # check for existence - allows for generic/win/unix VPATH - # To add more dirs here (like 'src'), you have to update VPATH - # in Makefile.in as well if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \ -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \ ; then @@ -6675,12 +6666,6 @@ TCL_INCLUDES="${TCL_INCLUDES} ${TCL_INCLUDE_SPEC} `echo "${TCL_INCLUDE_SPEC}" | sed -e 's/Headers/PrivateHeaders/'`"; fi ;; esac - else - if test ! -f "${TCL_SRC_DIR}/generic/tclInt.h" ; then - { { echo "$as_me:$LINENO: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&5 -echo "$as_me: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&2;} - { (exit 1); exit 1; }; } - fi fi @@ -6692,7 +6677,6 @@ - echo "$as_me:$LINENO: result: Using srcdir found in tclConfig.sh: ${TCL_SRC_DIR}" >&5 echo "${ECHO_T}Using srcdir found in tclConfig.sh: ${TCL_SRC_DIR}" >&6 @@ -8069,15 +8053,7 @@ #AC_DEFINE(_XOPEN_SOURCE, 1, [Do we want to use the XOPEN network library?]) #LIBS="$LIBS -lxnet" # Use the XOPEN network library - if test "`uname -m`" = "ia64" ; then - SHLIB_SUFFIX=".so" - # Use newer C++ library for C++ extensions - #if test "$GCC" != "yes" ; then - # CPPFLAGS="-AA" - #fi - else - SHLIB_SUFFIX=".sl" - fi + SHLIB_SUFFIX=".sl" echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6 if test "${ac_cv_lib_dld_shl_load+set}" = set; then @@ -8347,8 +8323,7 @@ # get rid of the warnings. #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" - # TEA specific: use LDFLAGS_DEFAULT instead of LDFLAGS here: - SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS_DEFAULT}' + SHLIB_LD="${CC} -shared" DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" LDFLAGS="$LDFLAGS -Wl,--export-dynamic" @@ -8357,71 +8332,7 @@ if test "`uname -m`" = "alpha" ; then CFLAGS="$CFLAGS -mieee" fi - if test $do64bit = yes; then - echo "$as_me:$LINENO: checking if compiler accepts -m64 flag" >&5 -echo $ECHO_N "checking if compiler accepts -m64 flag... $ECHO_C" >&6 -if test "${tcl_cv_cc_m64+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - hold_cflags=$CFLAGS - CFLAGS="$CFLAGS -m64" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - tcl_cv_cc_m64=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -tcl_cv_cc_m64=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS=$hold_cflags -fi -echo "$as_me:$LINENO: result: $tcl_cv_cc_m64" >&5 -echo "${ECHO_T}$tcl_cv_cc_m64" >&6 - if test $tcl_cv_cc_m64 = yes; then - CFLAGS="$CFLAGS -m64" - do64bit_ok=yes - fi - fi - # The combo of gcc + glibc has a bug related # to inlining of functions like strtod(). The # -fno-builtin flag should address this problem @@ -8616,146 +8527,17 @@ Darwin-*) CFLAGS_OPTIMIZE="-Os" SHLIB_CFLAGS="-fno-common" - # To avoid discrepancies between what headers configure sees during - # preprocessing tests and compiling tests, move any -isysroot and - # -mmacosx-version-min flags from CFLAGS to CPPFLAGS: - CPPFLAGS="${CPPFLAGS} `echo " ${CFLAGS}" | \ - awk 'BEGIN {FS=" +-";ORS=" "}; {for (i=2;i<=NF;i++) \ - if ($i~/^(isysroot|mmacosx-version-min)/) print "-"$i}'`" - CFLAGS="`echo " ${CFLAGS}" | \ - awk 'BEGIN {FS=" +-";ORS=" "}; {for (i=2;i<=NF;i++) \ - if (!($i~/^(isysroot|mmacosx-version-min)/)) print "-"$i}'`" if test $do64bit = yes; then + do64bit_ok=yes case `arch` in ppc) - echo "$as_me:$LINENO: checking if compiler accepts -arch ppc64 flag" >&5 -echo $ECHO_N "checking if compiler accepts -arch ppc64 flag... $ECHO_C" >&6 -if test "${tcl_cv_cc_arch_ppc64+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - hold_cflags=$CFLAGS - CFLAGS="$CFLAGS -arch ppc64 -mpowerpc64 -mcpu=G5" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - tcl_cv_cc_arch_ppc64=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -tcl_cv_cc_arch_ppc64=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS=$hold_cflags -fi -echo "$as_me:$LINENO: result: $tcl_cv_cc_arch_ppc64" >&5 -echo "${ECHO_T}$tcl_cv_cc_arch_ppc64" >&6 - if test $tcl_cv_cc_arch_ppc64 = yes; then - CFLAGS="$CFLAGS -arch ppc64 -mpowerpc64 -mcpu=G5" - do64bit_ok=yes - fi;; + CFLAGS="$CFLAGS -arch ppc64 -mpowerpc64 -mcpu=G5";; i386) - echo "$as_me:$LINENO: checking if compiler accepts -arch x86_64 flag" >&5 -echo $ECHO_N "checking if compiler accepts -arch x86_64 flag... $ECHO_C" >&6 -if test "${tcl_cv_cc_arch_x86_64+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - hold_cflags=$CFLAGS - CFLAGS="$CFLAGS -arch x86_64" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - tcl_cv_cc_arch_x86_64=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -tcl_cv_cc_arch_x86_64=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS=$hold_cflags -fi -echo "$as_me:$LINENO: result: $tcl_cv_cc_arch_x86_64" >&5 -echo "${ECHO_T}$tcl_cv_cc_arch_x86_64" >&6 - if test $tcl_cv_cc_arch_x86_64 = yes; then - CFLAGS="$CFLAGS -arch x86_64" - do64bit_ok=yes - fi;; + CFLAGS="$CFLAGS -arch x86_64";; *) { echo "$as_me:$LINENO: WARNING: Don't know how enable 64-bit on architecture \`arch\`" >&5 -echo "$as_me: WARNING: Don't know how enable 64-bit on architecture \`arch\`" >&2;};; +echo "$as_me: WARNING: Don't know how enable 64-bit on architecture \`arch\`" >&2;} + do64bit_ok=no;; esac else # Check for combined 32-bit and 64-bit fat build @@ -8832,7 +8614,7 @@ DL_LIBS="" # Don't use -prebind when building for Mac OS X 10.4 or later only: test "`echo "${MACOSX_DEPLOYMENT_TARGET}" | awk -F '10\\.' '{print int($2)}'`" -lt 4 -a \ - "`echo "${CPPFLAGS}" | awk -F '-mmacosx-version-min=10\\.' '{print int($2)}'`" -lt 4 && \ + "`echo "${CFLAGS}" | awk -F '-mmacosx-version-min=10\\.' '{print int($2)}'`" -lt 4 && \ LDFLAGS="$LDFLAGS -prebind" LDFLAGS="$LDFLAGS -headerpad_max_install_names" echo "$as_me:$LINENO: checking if ld accepts -search_paths_first flag" >&5 @@ -8901,10 +8683,10 @@ LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH" # TEA specific: for Tk extensions, remove 64-bit arch flags from - # CFLAGS et al. for combined 32 & 64 bit fat builds as neither - # TkAqua nor TkX11 can be built for 64-bit at present. - test "$fat_32_64" = yes && test -n "${TK_BIN_DIR}" && for v in CFLAGS CPPFLAGS LDFLAGS; do - eval $v'="`echo "$'$v' "|sed -e "s/-arch ppc64 / /g" -e "s/-arch x86_64 / /g"`"'; done + # CFLAGS for combined 32-bit and 64-bit fat builds as neither TkAqua + # nor TkX11 can be built for 64-bit at present. + test "$fat_32_64" = yes && test -n "${TK_BIN_DIR}" && \ + CFLAGS="`echo "$CFLAGS " | sed -e 's/-arch ppc64 / /g' -e 's/-arch x86_64 / /g'`" ;; NEXTSTEP-*) SHLIB_CFLAGS="" @@ -9247,8 +9029,6 @@ echo "$as_me: WARNING: 64bit support being disabled -- don't know magic for this platform" >&2;} fi - - # Step 4: disable dynamic loading if requested via a command-line switch. # Check whether --enable-load or --disable-load was given. @@ -10292,11 +10072,11 @@ `ls -d ${TCL_PREFIX}/bin 2>/dev/null`" for i in $list ; do if test -f "$i/${TCLSH_PROG}" ; then - REAL_TCL_BIN_DIR="`cd "$i"; pwd`/" + REAL_TCL_BIN_DIR="`cd "$i"; pwd`" break fi done - TCLSH_PROG="${REAL_TCL_BIN_DIR}${TCLSH_PROG}" + TCLSH_PROG="${REAL_TCL_BIN_DIR}/${TCLSH_PROG}" fi echo "$as_me:$LINENO: result: ${TCLSH_PROG}" >&5 echo "${ECHO_T}${TCLSH_PROG}" >&6 @@ -10532,7 +10312,6 @@ LTLIBOBJS=$ac_ltlibobjs -CFLAGS="${CFLAGS} ${CPPFLAGS}"; CPPFLAGS="" : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -10804,7 +10583,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by xotcl $as_me 1.5.6, which was +This file was extended by xotcl $as_me 1.6.0, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10859,7 +10638,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xotcl config.status 1.5.6 +xotcl config.status 1.6.0 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Index: configure.in =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r46f02e4868e118466d888b35d6b281b3f2ba31ac --- configure.in (.../configure.in) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ configure.in (.../configure.in) (revision 46f02e4868e118466d888b35d6b281b3f2ba31ac) @@ -11,15 +11,15 @@ # for this package, and can be a relative path, such as: # #-------------------------------------------------------------------- -define(XOTclVersion, 1.5.6) +define(XOTclVersion, 1.6.0) AC_INIT([xotcl], [XOTclVersion]) #-------------------------------------------------------------------- # Call TEA_INIT as the first TEA_ macro to set up initial vars. # This will define a ${TEA_PLATFORM} variable == "unix" or "windows". #-------------------------------------------------------------------- -TEA_INIT([3.6]) +TEA_INIT([3.5]) AC_CONFIG_AUX_DIR(config) #-------------------------------------------------------------------- @@ -103,8 +103,8 @@ # do not modify the following lines manually, they are generated with changeXOTclVersion XOTCL_MAJOR_VERSION=1 -XOTCL_MINOR_VERSION=5 -XOTCL_RELEASE_LEVEL=.6 +XOTCL_MINOR_VERSION=6 +XOTCL_RELEASE_LEVEL=.0 XOTCL_VERSION=${XOTCL_MAJOR_VERSION}.${XOTCL_MINOR_VERSION} NODOT_VERSION=${XOTCL_MAJOR_VERSION}${XOTCL_MINOR_VERSION} @@ -363,6 +363,8 @@ if test "${TEA_PLATFORM}" != "windows" ; then +if test "${TEA_PLATFORM}" != "windows" ; then + XOTCL_BUILD_LIB_SPEC="-L`pwd` -lxotcl${PACKAGE_VERSION}" XOTCL_LIB_SPEC="-L${pkglibdir} -lxotcl${PACKAGE_VERSION}" @@ -391,6 +393,17 @@ fi +else + +XOTCL_BUILD_LIB_SPEC="`pwd`/${PKG_LIB_FILE}" +XOTCL_LIB_SPEC="${pkglibdir}/${PKG_LIB_FILE}" +XOTCL_BUILD_STUB_LIB_PATH="`pwd`/${PKG_STUB_LIB_FILE}" +XOTCL_STUB_LIB_PATH="${pkglibdir}/${PKG_STUB_LIB_FILE}" +XOTCL_BUILD_STUB_LIB_SPEC="`pwd`/${PKG_STUB_LIB_FILE}" +XOTCL_STUB_LIB_SPEC="${pkglibdir}/${PKG_STUB_LIB_FILE}" + +fi + AC_SUBST(SHARED_LIB_SUFFIX) AC_SUBST(UNSHARED_LIB_SUFFIX) AC_SUBST(XOTCL_BUILD_LIB_SPEC) Index: doc/langRef-xotcl.pdf =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r46f02e4868e118466d888b35d6b281b3f2ba31ac Binary files differ Index: doc/langRef.xotcl =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r46f02e4868e118466d888b35d6b281b3f2ba31ac --- doc/langRef.xotcl (.../langRef.xotcl) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ doc/langRef.xotcl (.../langRef.xotcl) (revision 46f02e4868e118466d888b35d6b281b3f2ba31ac) @@ -1,5 +1,5 @@ -# $Id: langRef.xotcl,v 1.18 2007/09/05 19:09:22 neumann Exp $ -package provide XOTcl-langRef 1.5.5 +# $Id: langRef.xotcl,v 1.14 2006/10/04 20:40:23 neumann Exp $ +package provide XOTcl-langRef 1.5.2 package require XOTcl @ @File { @@ -124,7 +124,7 @@ } - date { $Date: 2007/09/05 19:09:22 $ } + date { $Date: 2006/10/04 20:40:23 $ } } ## @@ -230,7 +230,7 @@ } { Description { Resets an object or class into an initial state, as after construction. - Called during recreation process by the method 'recreate' + Called during recreation process by the method recreate. } return "empty string" } @@ -239,11 +239,18 @@ ?args? "'-' method calls" } { Description { - Calls the '-' (dash) methods. I.e. evaluates arguments and calls - everything starting with '-' (and not having a digit a - second char) as a method. Every list element until the next '-' - is interpreted as a method argument. configure/tt> is called - before the constructor during initialization and recreation. + Calls the '-' (dash) methods. This method evaluates its argument list + and calls everything starting with '-' (followed by an alpha character) + as a method. Every list element until the next '-' is interpreted as an + argument of the called method. XOTcl supports argument lists with a variable + number of arguments. If an argument of a method called this way starts + with a "-", the call can be placed safely + into a list (e.g. "Class c [list -strangearg -a-] -simplearg 2") to avoid + the interpretation of "a-" as a method. +

The method configure is called automatically by + the default create and recreate methods after + the default values are set.

+

In the following example, the variable set is called via configure before init: <@pre class='code'> Object o -set x 4 @@ -470,7 +477,19 @@ return "1 or 0" } +@ Object instproc init { + args "argument list" +} { + Description { + The method <@tt>init is called automatically by the default + <@tt>create method on initialized + objects (the default variables are set, the configure + methods are already performed). This method is solely a user hook for + applications to perform class specific initialzation after object creation. + } +} + @ Object instproc incr { varName "variable name" ?increment? "value to increment" @@ -524,6 +543,11 @@ <@li><@TT>objName info filterguard name: Returns the guards for filter identified by name. + <@li><@TT>objName info forward ?-definition? name: Checks, + whether <@TT>name<@/TT> is a forwarder (accepts wild chard characters). + When <@TT>-definition is specified, it returns the definition + of the forwarder. + <@li><@TT>objName info hasNamespace: From XOTcl version 0.9 on, namespaces of objects are allocated on demand. hasNamespace returns 1, if the @@ -547,6 +571,9 @@ of the object. With <@TT>-order modifier the order of mixins (whole hierarchy) is printed. + <@li><@TT>objName info mixinguard name: Returns the guards + for the mixin identified by name. + <@li><@TT>objName info nonposargs methodName: Returns non-positional arg list of methodName @@ -912,18 +939,18 @@ } @ Class instproc alloc { obj "new obj/class name" - ?args? "arguments passed to the new class after creation" + ?args? "arguments passed during creation" } { description { - Allocate memory for a new XOTcl object or class. <@tt>create<@/tt> uses - <@tt>alloc to allocate memory. But <@tt>create<@/tt> also - calls init and evaluates '-' arguments as method calls. - In seldom cases the programmer may want to suppress the - <@tt>create<@/tt> - mechanism and just allocate memory. Then <@tt>alloc can - be used. + Allocate (create) an uninitialized object or class. Typically, alloc + is called automatically by <@tt>create<@/tt> + to allocate an uninitialized object or class. + In contrast to alloc, <@tt>create<@/tt> also + initializes and configures the object. + The method alloc can be used by a programmer who may want to + create uninitialized objects/classes. } - return "new class name" + return "fully qualified name of created instance" } @ Class instproc allinstances { @@ -941,24 +968,25 @@ description { Create user-defined classes or objects. If the class is a meta-class, a class is created, otherwise an object. + The object creation protocol implemened by create works as follows: +

    +
  • create firstly calls <@tt>alloc + in order to create an uninitialized object or class. +
  • In the second step, the + default values for parameters are searched on superclasses and set in the created object. +
  • In the third step, the method <@tt>configure + is called with the passed + argument list to configure the object/class. +
  • Finally the constructor <@tt>init is called on the object + with all arguments up to the first '-' argument (as returned by configure). +
- Create firstly calls <@tt>alloc in order to allocate memory for the - new object. Then default values for parameters are searched on - superclasses (an set if found). Then <@tt>args is searched for args - starting with '-' followed by an alpha character. These arguments - are called as methods. '-' followed by a numerical is interpreted - as a negative number (and not as a method). If a value of a method - called this way starts with a "a", the call can be placed safely - into a list (e.g. "Class c [-strangearg -a-] -simplearg 2"). +

In the default XOTcl definition, the <@tt>create method + is called implicitly by the <@tt>unknown method of the metaclass + Class, when a class (meta-class) is called with an unknown + method. E.g. the following two commands are equivalent - Finally the constructor <@tt>init is called on the object - with all arguments up to the first '-' arg.<@p> - - The <@tt>create method is called implicitly through the - <@tt>unknown - mechanism when a class (meta-class) is called with an unknown - method. E.g. the following two commands are equivalent - <@pre class='code'> Car herby -color red Car create herby -color red <@/pre> @@ -971,8 +999,9 @@ <@pre class='code'> Class Car -init -superclass Vehicle <@/pre> + See also: <@tt>recreate } - return "name of the created instance (result of alloc)" + return "fully qualified name of the created instance (result of alloc)" } @ Class instproc info { @@ -1023,15 +1052,23 @@ all instfilterguards are integrated (<@TT> ClassName info instfilter -guards). - <@li><@TT>objName info instfilterguard name: Returns the guards + <@li><@TT>ClassName info instfilterguard name: Returns the guards for instfilter identified by name. + <@li><@TT>ClassName info instforward ?-definition? name: Checks, + whether <@TT>name<@/TT> is a forwarder (accepts wild chard characters). + When <@TT>-definition is specified, it returns the definition + of the forwarder. + <@li><@TT>ClassName info instinvar: Returns class invariants. <@li><@TT>ClassName info instmixin: Returns the list of instmixins of this class. + <@li><@TT>ClassName info isntmixinguard name: Returns the guards + for the instmixin identified by name. + <@li><@TT>ClassName info instnonposargs methodName: returns list of non-positional args of methodName @@ -1057,6 +1094,10 @@ Returns a list of all super-classes of the class, if superclassname was not specified, otherwise it returns 1 if superclassname is a superclass and 0 if not. + + <@li><@TT>ClassName info slots: + Returns the slot objects defined for this class. + <@/ul> } return "Value of introspected option as a string." @@ -1216,7 +1257,7 @@ @ Class instproc instproc { name "instance method name" - ?non-pos-args?" "optional non-positional arguments" + "?non-pos-args?" "optional non-positional arguments" args "instance method arguments" body "instance method body" "?preAssertion?" "optional assertions that must hold before the proc executes" @@ -1248,7 +1289,7 @@ If <@tt>-childof obj is specified, the new object is created as a child of the specified object. } - return "new object name" + return "fully qualified name of the created instance" } @ Class instproc parameter { @@ -1307,13 +1348,29 @@ ?args? "arbitrary arguments" } { description { - Hook called upon recreation of an object. Performs standard object - initialization, per default. May be overloaded/-written. It calls - another method cleanup which handles actual cleanup of the object - during next. That means, if you overload recreate, in the pre-part - the object still contains its old state, after next it is cleaned up. + Hook called upon recreation of an object in cases where the user wants to distinguish + between creation and recreation of objects. A recreation occurs, when an Object is created + with a name that exists already. + A typical use-case is the redefinition + of classes in and IDE, where the relations between classes/classes and object/classes + should be preserved (this is different to a destroy of the object). + +

The method recreate does not need to call alloc + but calls instead cleanup + to reset to the object (or class) to its initial state (e.g. remove variables, child objects, + for classes remove instaces, etc.). Then it performs the standard initialization + for the object or class. + +

If recreate is overloaded and the default recreate method is called via next, + the pre-part + (before next) contains its old state of the object, + while during the part after next the + object is cleaned up. +

To ease recreation of classes, see ::xotcl::configure softrecreate. + + See also: <@tt>create } - return "obj name" + return "fully qualified name of instance" } @ Class instproc superclass { Index: doc/tutorial.html =================================================================== diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r46f02e4868e118466d888b35d6b281b3f2ba31ac --- doc/tutorial.html (.../tutorial.html) (revision c72f9f638677608fab1502cd696c8f2d6b2952f9) +++ doc/tutorial.html (.../tutorial.html) (revision 46f02e4868e118466d888b35d6b281b3f2ba31ac) @@ -1,10 +1,10 @@ - + XOTcl - Tutorial - +