Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | merge trunk |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | dgp-method-type |
| Files: | files | file ages | folders |
| SHA1: |
dde8dc2497d98e50c8600fe89279ce59 |
| User & Date: | dgp 2017-06-29 16:23:13 |
Context
|
2017-06-29
| ||
| 16:48 | Commit to the patch; code history is in code history. check-in: 9b412503a3 user: dgp tags: dgp-method-type | |
| 16:23 | merge trunk check-in: dde8dc2497 user: dgp tags: dgp-method-type | |
| 15:25 | Bump to Itk 4.0.3. check-in: f48084eacd user: dgp tags: trunk | |
|
2016-09-19
| ||
| 19:01 | merge trunk check-in: 360f468ec5 user: dgp tags: dgp-method-type | |
Changes
Changes to ChangeLog.
1 2 3 4 5 6 7 |
2014-09-07 Arnulf P. Wiedemann <[email protected]> * generic/itkArchetype.c: Fix for SF bug #253. 2013-02-03 Arnulf P. Wiedemann <[email protected]> * bumped version to 4.0.0 for release * added tools directory * Makefile.in: added genstubs tag for generating stubs entries |
> > > > > |
1 2 3 4 5 6 7 8 9 10 11 12 |
NOTICE: This ChangeLog is no longer being maintained. To examine the series of changes checked into Itk sources, follow the Timeline https://core.tcl.tk/itk/timeline 2014-09-07 Arnulf P. Wiedemann <[email protected]> * generic/itkArchetype.c: Fix for SF bug #253. 2013-02-03 Arnulf P. Wiedemann <[email protected]> * bumped version to 4.0.0 for release * added tools directory * Makefile.in: added genstubs tag for generating stubs entries |
Changes to configure.
1 2 3 4 5 6 7 8 9 10 ... 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 .... 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 .... 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 .... 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 .... 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 .... 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 9995 ..... 10034 10035 10036 10037 10038 10039 10040 10041 10042 10043 10044 10045 10046 10047 10048 |
#! /bin/sh # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for itk 4.0.2. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ................................................................................ subdirs= MFLAGS= MAKEFLAGS= # Identity of this package. PACKAGE_NAME='itk' PACKAGE_TARNAME='itk' PACKAGE_VERSION='4.0.2' PACKAGE_STRING='itk 4.0.2' PACKAGE_BUGREPORT='' PACKAGE_URL='' # Factoring default headers for most tests. ac_includes_default="\ #include <stdio.h> #ifdef HAVE_SYS_TYPES_H ................................................................................ # # Report the --help message. # if test "$ac_init_help" = "long"; then # 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 itk 4.0.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... To assign environment variables (e.g., CC, CFLAGS...), specify them as VAR=VALUE. See below for descriptions of some of the useful variables. Defaults for the options are specified in brackets. ................................................................................ --x-includes=DIR X include files are in DIR --x-libraries=DIR X library files are in DIR _ACEOF fi if test -n "$ac_init_help"; then case $ac_init_help in short | recursive ) echo "Configuration of itk 4.0.2:";; 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] ................................................................................ cd "$ac_pwd" || { ac_status=$?; break; } done fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF itk configure 4.0.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF exit ................................................................................ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_mongrel cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by itk $as_me 4.0.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 [email protected] _ACEOF exec 5>>config.log { ................................................................................ test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # Save the log message, to keep $0 and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" This file was extended by itk $as_me 4.0.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 [email protected] ................................................................................ Report bugs to the package provider." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ itk config.status 4.0.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." |
| | | | | | | | | |
1 2 3 4 5 6 7 8 9 10 ... 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 .... 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 .... 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 .... 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 .... 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 .... 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 9995 ..... 10034 10035 10036 10037 10038 10039 10040 10041 10042 10043 10044 10045 10046 10047 10048 |
#! /bin/sh # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for itk 4.0.3. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ................................................................................ subdirs= MFLAGS= MAKEFLAGS= # Identity of this package. PACKAGE_NAME='itk' PACKAGE_TARNAME='itk' PACKAGE_VERSION='4.0.3' PACKAGE_STRING='itk 4.0.3' PACKAGE_BUGREPORT='' PACKAGE_URL='' # Factoring default headers for most tests. ac_includes_default="\ #include <stdio.h> #ifdef HAVE_SYS_TYPES_H ................................................................................ # # Report the --help message. # if test "$ac_init_help" = "long"; then # 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 itk 4.0.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... To assign environment variables (e.g., CC, CFLAGS...), specify them as VAR=VALUE. See below for descriptions of some of the useful variables. Defaults for the options are specified in brackets. ................................................................................ --x-includes=DIR X include files are in DIR --x-libraries=DIR X library files are in DIR _ACEOF fi if test -n "$ac_init_help"; then case $ac_init_help in short | recursive ) echo "Configuration of itk 4.0.3:";; 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] ................................................................................ cd "$ac_pwd" || { ac_status=$?; break; } done fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF itk configure 4.0.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF exit ................................................................................ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_mongrel cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by itk $as_me 4.0.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 [email protected] _ACEOF exec 5>>config.log { ................................................................................ test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # Save the log message, to keep $0 and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" This file was extended by itk $as_me 4.0.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS CONFIG_LINKS = $CONFIG_LINKS CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 [email protected] ................................................................................ Report bugs to the package provider." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ itk config.status 4.0.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." |
Changes to configure.in.
6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 |
#-----------------------------------------------------------------------
# This initializes the environment with PACKAGE_NAME and PACKAGE_VERSION
# set as provided. These will also be added as -D defs in your Makefile
# so you can encode the package version directly into the source files.
#-----------------------------------------------------------------------
AC_INIT([itk], [4.0.2])
#--------------------------------------------------------------------
# Call TEA_INIT as the first TEA_ macro to set up initial vars.
# This will define a ${TEA_PLATFORM} variable == "unix" or "windows"
# as well as PKG_LIB_FILE and PKG_STUB_LIB_FILE.
#--------------------------------------------------------------------
|
| |
6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 |
#-----------------------------------------------------------------------
# This initializes the environment with PACKAGE_NAME and PACKAGE_VERSION
# set as provided. These will also be added as -D defs in your Makefile
# so you can encode the package version directly into the source files.
#-----------------------------------------------------------------------
AC_INIT([itk], [4.0.3])
#--------------------------------------------------------------------
# Call TEA_INIT as the first TEA_ macro to set up initial vars.
# This will define a ${TEA_PLATFORM} variable == "unix" or "windows"
# as well as PKG_LIB_FILE and PKG_STUB_LIB_FILE.
#--------------------------------------------------------------------
|
Changes to generic/itk.h.
64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 |
# define TCL_FINAL_RELEASE 2 #endif #define ITK_MAJOR_VERSION 4 #define ITK_MINOR_VERSION 0 #define ITK_RELEASE_LEVEL TCL_FINAL_RELEASE #define ITK_RELEASE_SERIAL 2 #define ITK_VERSION "4.0" #define ITK_PATCH_LEVEL "4.0.2" /* * A special definition used to allow this header file to be included * in resource files so that they can get obtain version information from * this file. Resource compilers don't like all the C stuff, like typedefs * and procedure declarations, that occur below. |
| | |
64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 |
# define TCL_FINAL_RELEASE 2 #endif #define ITK_MAJOR_VERSION 4 #define ITK_MINOR_VERSION 0 #define ITK_RELEASE_LEVEL TCL_FINAL_RELEASE #define ITK_RELEASE_SERIAL 3 #define ITK_VERSION "4.0" #define ITK_PATCH_LEVEL "4.0.3" /* * A special definition used to allow this header file to be included * in resource files so that they can get obtain version information from * this file. Resource compilers don't like all the C stuff, like typedefs * and procedure declarations, that occur below. |
Changes to generic/itkOption.c.
228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 |
//fprintf(stderr, "EXE!%s!\n", Tcl_GetString(mcode->bodyPtr));
Itcl_SetCallFrameResolver(interp, opt->iclsPtr->resolvePtr);
saveNsPtr = Tcl_GetCurrentNamespace(interp);
//fprintf(stderr, "MCNS!%s!\n", saveNsPtr->fullName);
Itcl_SetCallFrameNamespace(interp, opt->iclsPtr->nsPtr);
result = Tcl_EvalObjEx(interp, mcode->bodyPtr, 0);
Itcl_SetCallFrameNamespace(interp, saveNsPtr);
#ifdef NOTDEF
result = Itcl_EvalMemberCode(interp, (ItclMemberFunc*)NULL,
opt->member, contextObj, 0, (Tcl_Obj**)NULL);
#endif
}
return result;
}
/*
* ------------------------------------------------------------------------
|
< > > > > > > > > > > > < > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > |
228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 |
//fprintf(stderr, "EXE!%s!\n", Tcl_GetString(mcode->bodyPtr));
Itcl_SetCallFrameResolver(interp, opt->iclsPtr->resolvePtr);
saveNsPtr = Tcl_GetCurrentNamespace(interp);
//fprintf(stderr, "MCNS!%s!\n", saveNsPtr->fullName);
Itcl_SetCallFrameNamespace(interp, opt->iclsPtr->nsPtr);
result = Tcl_EvalObjEx(interp, mcode->bodyPtr, 0);
Itcl_SetCallFrameNamespace(interp, saveNsPtr);
/*
* Here we engage in some ugly hackery workaround until
* someone has time to come back and implement this
* properly.
*
* In Itcl/Itk 3, the same machinery was used to implement
* method invocation and configbody invocation, and the
* code here looked like:
*
result = Itcl_EvalMemberCode(interp, (ItclMemberFunc*)NULL,
opt->member, contextObj, 0, (Tcl_Obj**)NULL);
*
* In Itcl 4, Itcl methods have become (a particular variant)
* of TclOO methods. It's not clear whether config bodies
* should also do that, or what?
*
* Instead the existing solution above has been to just "eval"
* the configbody body script in a suitable context, which
* works very nearly correctly. The trouble is that unlike
* method invocation, we've not pushed a proper frame, nor
* have we unwound a return level, so when the "eval" returns
* TCL_RETURN we've not been handling that right. You will
* find some configbody bodies out there that expect to be
* able to use [return] for early exit. Iwidgets test
* Extbutton-2.8 is an example.
*
* As a cheap workaround, we put in explicit special treatment
* for (result == TCL_RETURN) here. This is essentially a
* reproduction of the Tcl internal routine TclUpdateReturnInfo()
* but without the benefit of internals access.
*/
if (result == TCL_RETURN) {
Tcl_Obj *opts = Tcl_GetReturnOptions(interp, TCL_RETURN);
Tcl_Obj *levelKey = Tcl_NewStringObj("-level", -1);
Tcl_Obj *levelObj;
int level;
Tcl_DictObjGet(NULL, opts, levelKey, &levelObj);
Tcl_GetIntFromObj(NULL, levelObj, &level);
Tcl_DictObjPut(NULL, opts, levelKey, Tcl_NewIntObj(--level));
result = Tcl_SetReturnOptions(interp, opts);
Tcl_DecrRefCount(levelKey);
}
}
return result;
}
/*
* ------------------------------------------------------------------------
|
Changes to library/itk.tcl.
10 11 12 13 14 15 16 17 18 19 20 21 22 23 |
# http://www.tcltk.com/itcl
# ----------------------------------------------------------------------
# Copyright (c) 1993-1998 Lucent Technologies, Inc.
# ======================================================================
# See the file "license.terms" for information on usage and
# redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
# Provide transparent access to all [incr Tk] commands
#
if {$tcl_platform(os) == "MacOS"} {
source -rsrc itk:tclIndex
} else {
lappend auto_path ${itk::library}
|
> |
10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 |
# http://www.tcltk.com/itcl
# ----------------------------------------------------------------------
# Copyright (c) 1993-1998 Lucent Technologies, Inc.
# ======================================================================
# See the file "license.terms" for information on usage and
# redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
package require -exact Itk 4.0.3
#
# Provide transparent access to all [incr Tk] commands
#
if {$tcl_platform(os) == "MacOS"} {
source -rsrc itk:tclIndex
} else {
lappend auto_path ${itk::library}
|
Changes to pkgIndex.tcl.in.
1 2 3 4 5 6 |
# Tcl package index file, version 1.0
if {![package vsatisfies [package provide Tcl] 8.6]} return
if {[string length [package provide Itcl]] && ![package vsatisfies [package provide Itcl] 4]} return
package ifneeded itk @[email protected] [list load [file join $dir "@[email protected]"] Itk]
package ifneeded Itk @[email protected] [list load [file join $dir "@[email protected]"] Itk]
|
| |
1 2 3 4 5 6 |
# Tcl package index file, version 1.0
if {![package vsatisfies [package provide Tcl] 8.6]} return
if {[string length [package provide Itcl]] && (![package vsatisfies [package provide Itcl] 4] || [package vsatisfies [package provide Itcl] 4.1])} return
package ifneeded itk @[email protected] [list load [file join $dir "@[email protected]"] Itk]
package ifneeded Itk @[email protected] [list load [file join $dir "@[email protected]"] Itk]
|