Index: README =================================================================== diff -u -r6c86fa6bef2f9e07b87cc7913398e86dd9af8316 -r5f986f77097e53f96b60f28a7ccabeb2411f67a0 --- README (.../README) (revision 6c86fa6bef2f9e07b87cc7913398e86dd9af8316) +++ README (.../README) (revision 5f986f77097e53f96b60f28a7ccabeb2411f67a0) @@ -39,10 +39,10 @@ location, or use the variable auto_path in Tcl. For instance, to use the local, extracted tar ball, you can use something like (under UNIX): - export TCLLIBPATH="./xotcl-1.6.8" or - setenv TCLLIBPATH "./xotcl-1.6.8" + export TCLLIBPATH="./xotcl-1.6.9" or + setenv TCLLIBPATH "./xotcl-1.6.9" Under Windows: - set TCLLIBPATH=".\xotcl-1.6.8" + set TCLLIBPATH=".\xotcl-1.6.9" Linux Binary Distribution Index: configure =================================================================== diff -u -r6c86fa6bef2f9e07b87cc7913398e86dd9af8316 -r5f986f77097e53f96b60f28a7ccabeb2411f67a0 --- configure (.../configure) (revision 6c86fa6bef2f9e07b87cc7913398e86dd9af8316) +++ configure (.../configure) (revision 5f986f77097e53f96b60f28a7ccabeb2411f67a0) @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xotcl 1.6.8. +# Generated by GNU Autoconf 2.69 for xotcl 1.6.9. # # Report bugs to . # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='xotcl' PACKAGE_TARNAME='xotcl' -PACKAGE_VERSION='1.6.8' -PACKAGE_STRING='xotcl 1.6.8' +PACKAGE_VERSION='1.6.9' +PACKAGE_STRING='xotcl 1.6.9' PACKAGE_BUGREPORT='xotcl@alice.wu-wien.ac.at' PACKAGE_URL='' @@ -783,6 +783,7 @@ with_xowish with_all with_expat +enable_forward_compat86 with_tcl with_tk with_tkinclude @@ -1345,7 +1346,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.6.8 to adapt to many kinds of systems. +\`configure' configures xotcl 1.6.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1406,14 +1407,16 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xotcl 1.6.8:";; + short | recursive ) echo "Configuration of xotcl 1.6.9:";; esac cat <<\_ACEOF Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --forward-compat86 build XOTcl und Tcl 8.5 with forward compatibilit + for Tcl 8.6 (default: disabled) --enable-threads build with threads --enable-shared build and link with shared libraries (default: on) --enable-64bit enable 64bit support (default: off) @@ -1524,7 +1527,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xotcl configure 1.6.8 +xotcl configure 1.6.9 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1893,7 +1896,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.6.8, which was +It was created by xotcl $as_me 1.6.9, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2461,6 +2464,14 @@ fi +# Check whether --enable-forward-compat86 was given. +if test "${enable_forward_compat86+set}" = set; then : + enableval=$enable_forward_compat86; enable_forwardcompat=$enableval +else + enable_forwardcompat=no +fi + + subdirs="" if test "$with_all" = yes; then @@ -2490,8 +2501,14 @@ fi fi +if test "$enable_forwardcompat" = yes; then +$as_echo "#define XOTCL_FORWARD_COMPAT86 1" >>confdefs.h +fi + + + if test "$with_tk" = no; then with_xowish="" ; fi if test "$with_xotclsh" = yes; then XOTCLSH="xotclsh" ; else XOTCLSH=""; fi if test "$with_xowish" = yes; then XOWISH="xowish" ; else XOWISH=""; fi @@ -9877,7 +9894,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xotcl $as_me 1.6.8, which was +This file was extended by xotcl $as_me 1.6.9, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9930,7 +9947,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xotcl config.status 1.6.8 +xotcl config.status 1.6.9 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" Index: configure.ac =================================================================== diff -u -rb9e0cf554aa8692a66c9e7f2d616d21c9287cb25 -r5f986f77097e53f96b60f28a7ccabeb2411f67a0 --- configure.ac (.../configure.ac) (revision b9e0cf554aa8692a66c9e7f2d616d21c9287cb25) +++ configure.ac (.../configure.ac) (revision 5f986f77097e53f96b60f28a7ccabeb2411f67a0) @@ -11,7 +11,7 @@ # for this package, and can be a relative path, such as: # #-------------------------------------------------------------------- -define(XOTclVersion, 1.6.8) +define(XOTclVersion, 1.6.9) AC_INIT([xotcl],[XOTclVersion],[xotcl@alice.wu-wien.ac.at]) AC_CONFIG_AUX_DIR([tclconfig]) @@ -58,6 +58,11 @@ --without-expat falls back to the bundled expat installation], [with_expat=$withval],[with_expat=bundle]) +AC_ARG_ENABLE([forward-compat86], + AS_HELP_STRING([--forward-compat86], + [build XOTcl und Tcl 8.5 with forward compatibilit for Tcl 8.6 (default: disabled)]), + [enable_forwardcompat=$enableval], [enable_forwardcompat=no]) + subdirs="" if test "$with_all" = yes; then @@ -86,6 +91,10 @@ fi fi +if test "$enable_forwardcompat" = yes; then + AC_DEFINE([XOTCL_FORWARD_COMPAT86], [1], [Are we building forward compatibility?]) +fi + AC_SUBST([subdirs]) if test "$with_tk" = no; then with_xowish="" ; fi Index: generic/xotcl.c =================================================================== diff -u -rfab24fa76060a5c722c7454af72f8707d27811ae -r5f986f77097e53f96b60f28a7ccabeb2411f67a0 --- generic/xotcl.c (.../xotcl.c) (revision fab24fa76060a5c722c7454af72f8707d27811ae) +++ generic/xotcl.c (.../xotcl.c) (revision 5f986f77097e53f96b60f28a7ccabeb2411f67a0) @@ -5226,6 +5226,7 @@ # include # endif +#if !defined(XOTCL_FORWARD_COMPAT86) static void MakeProcError( Tcl_Interp *interp, /* The interpreter in which the procedure was @@ -5325,6 +5326,7 @@ return TCL_OK; } #endif +#endif /* * method dispatch @@ -5495,7 +5497,8 @@ * here or in PushProcCallFrame. At the same time, we could do the * non-pos-arg handling here as well. */ -#if !defined(PRE85) && !defined(NRE) + +#if !defined(PRE85) && !defined(NRE) && !defined(XOTCL_FORWARD_COMPAT86) /*fprintf(stderr,"\tproc=%s cp=%p %d\n", Tcl_GetCommandName(interp, cmd),cp, isTclProc);*/ result = PushProcCallFrame(cp, interp, objc, objv, /*isLambda*/ 0); @@ -5966,7 +5969,7 @@ Tcl_Obj *resultBody; resultBody = Tcl_NewStringObj("", 0); INCR_REF_COUNT(resultBody); -#if defined(PRE85) || defined(NRE) +#if defined(PRE85) || defined(NRE) || defined(XOTCL_FORWARD_COMPAT86) Tcl_AppendStringsToObj(resultBody, "::xotcl::initProcNS\n", (char *) NULL); #endif if (nonposArgs) { @@ -6742,7 +6745,7 @@ static char * StripBodyPrefix(char *body) { -#if defined(PRE85) || defined(NRE) +#if defined(PRE85) || defined(NRE) || defined(XOTCL_FORWARD_COMPAT86) if (strncmp(body, "::xotcl::initProcNS\n", 20) == 0) body+=20; #endif @@ -6960,34 +6963,33 @@ Tcl_CallFrame *cf = (Tcl_CallFrame *)Tcl_Interp_varFramePtr(interp); int found = 0; while (cf) { - /* fprintf(stderr, " ... compare fp = %p and cfp %p procFrame %p oc=%d\n", - cf, csc->currentFramePtr, - Tcl_Interp_framePtr(interp), Tcl_CallFrame_objc(Tcl_Interp_framePtr(interp)) - );*/ + fprintf(stderr, " ... compare fp = %p and cfp %p procFrame %p oc=%d\n", + cf, csc->currentFramePtr, + Tcl_Interp_framePtr(interp), Tcl_CallFrame_objc(Tcl_Interp_framePtr(interp)) + ); if (cf == csc->currentFramePtr) { found = 1; break; } cf = (Tcl_CallFrame *)((CallFrame *)cf)->callerPtr; } /* - if (!found) { + if (!found) { if (Tcl_Interp_varFramePtr(interp)) { - fprintf(stderr,"found (csc->currentFramePtr %p)= %d cur level=%d\n", - csc->currentFramePtr, found, - Tcl_CallFrame_level(Tcl_Interp_varFramePtr(interp))); + fprintf(stderr,"found (csc->currentFramePtr %p)= %d cur level=%d\n", + csc->currentFramePtr, found, + Tcl_CallFrame_level(Tcl_Interp_varFramePtr(interp))); } else { - fprintf(stderr,"no varFramePtr\n"); + fprintf(stderr,"no varFramePtr\n"); } return TCL_OK; - } + } */ } #endif /*fprintf(stderr,"givenMethod = %s, csc = %p, useCallstackObj %d, objc %d currentFramePtr %p\n", givenMethod, csc, useCallstackObjs, objc, csc->currentFramePtr);*/ - /* if no args are given => use args from stack */ if (objc < 2 && useCallstackObjs && csc->currentFramePtr) { @@ -12275,7 +12277,7 @@ return result; } -#if defined(PRE85) || defined(NRE) +#if defined(PRE85) || defined(NRE) || defined(XOTCL_FORWARD_COMPAT86) int XOTclInitProcNSCmd(ClientData cd, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { Tcl_CallFrame *varFramePtr = (Tcl_CallFrame *) Tcl_Interp_varFramePtr(interp); @@ -13358,7 +13360,7 @@ Tcl_CreateObjCommand(interp, "::xotcl::configure", XOTclConfigureCommand, 0, 0); Tcl_CreateObjCommand(interp, "::xotcl::deprecated", XOTcl_DeprecatedCmd, 0, 0); Tcl_CreateObjCommand(interp, "::xotcl::finalize", XOTclFinalizeObjCmd, 0, 0); -#if defined(PRE85) || defined(NRE) +#if defined(PRE85) || defined(NRE) || defined(XOTCL_FORWARD_COMPAT86) #ifdef XOTCL_BYTECODE instructions[INST_INITPROC].cmdPtr = (Command *) #endif Index: library/xml/TclExpat-1.1/configure =================================================================== diff -u -r6c86fa6bef2f9e07b87cc7913398e86dd9af8316 -r5f986f77097e53f96b60f28a7ccabeb2411f67a0 --- library/xml/TclExpat-1.1/configure (.../configure) (revision 6c86fa6bef2f9e07b87cc7913398e86dd9af8316) +++ library/xml/TclExpat-1.1/configure (.../configure) (revision 5f986f77097e53f96b60f28a7ccabeb2411f67a0) @@ -733,6 +733,7 @@ enable_option_checking with_xotcl with_expat +enable_forward_compat86 with_tcl with_tclinclude enable_threads @@ -1362,6 +1363,8 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --forward-compat86 build XOTcl und Tcl 8.5 with forward compatibilit + for Tcl 8.6 (default: disabled) --enable-threads build with threads --enable-shared build and link with shared libraries (default: on) --enable-64bit enable 64bit support (default: off) @@ -2354,6 +2357,14 @@ fi +# Check whether --enable-forward-compat86 was given. +if test "${enable_forward_compat86+set}" = set; then : + enableval=$enable_forward_compat86; enable_forwardcompat=$enableval +else + enable_forwardcompat=no +fi + + case $with_expat in bundle) ;; sys) @@ -8565,7 +8576,7 @@ $as_echo "#define USE_TCL_STUBS 1" >>confdefs.h -#AC_DEFINE(USE_TK_STUBS) +#AC_DEFINE([USE_TK_STUBS]) #-------------------------------------------------------------------- # This macro generates a line to use when building a library. It Index: library/xml/TclExpat-1.1/configure.ac =================================================================== diff -u -rb9e0cf554aa8692a66c9e7f2d616d21c9287cb25 -r5f986f77097e53f96b60f28a7ccabeb2411f67a0 --- library/xml/TclExpat-1.1/configure.ac (.../configure.ac) (revision b9e0cf554aa8692a66c9e7f2d616d21c9287cb25) +++ library/xml/TclExpat-1.1/configure.ac (.../configure.ac) (revision 5f986f77097e53f96b60f28a7ccabeb2411f67a0) @@ -48,6 +48,11 @@ --without-expat falls back to the bundled expat installation], [with_expat=$withval],[with_expat=bundle]) +AC_ARG_ENABLE([forward-compat86], + AS_HELP_STRING([--forward-compat86], + [build XOTcl und Tcl 8.5 with forward compatibilit for Tcl 8.6 (default: disabled)]), + [enable_forwardcompat=$enableval], [enable_forwardcompat=no]) + case $with_expat in bundle) ;; sys)