Merge branch 'tcltk:master' into master

Make it work with Tcl 9.0

.fossil-settings/manifest

@@ -0,0 +1 @@
+u

ChangeLog

@@ -0,0 +1,27 @@
+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 <wiede@users.sf.net>
+	* generic/itkArchetype.c: Fix for SF bug #253.
+
+2013-02-03 Arnulf P. Wiedemann <wiede@users.sf.net>
+	* bumped version to 4.0.0 for release
+	* added tools directory
+	* Makefile.in: added genstubs tag for generating stubs entries
+	* generic/itkArchBase.c: fixed some param types to fit to itcl changes
+
+2011-04-29 Arnulf P. Wiedemann <wiede@users.sf.net>
+	* configure, configure.in, generic/itk.h: Bump version to 4.0b6
+
+2010-08-17  Jeff Hobbs  <jeffh@ActiveState.com>
+
+	* configure, configure.in, generic/itk.h: Bump version to 4.0b5
+	* tclconfig/tcl.m4: full update to TEA 3.9
+
+2007-09-08 Arnulf P. Wiedemann <wiede@users.sf.net>
+	* all new modules installed and added
+This is the ChangeLog file for itcl-ng/itk
+it is here as Itk and itcl-ng/itk will be different modules in the future
+

Makefile.in

@@ -7,11 +7,24 @@
 #	replaced in the actual Makefile.
 #
 # Copyright (c) 1999 Scriptics Corporation.
-# Copyright (c) 2002-2004 ActiveState Corporation.
+# Copyright (c) 2002-2005 ActiveState Corporation.
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
+#========================================================================
+# Add additional lines to handle any additional AC_SUBST cases that
+# have been added in a customized configure script.
+#========================================================================
+
+#SAMPLE_NEW_VAR	= @SAMPLE_NEW_VAR@
+
+#========================================================================
+# Nothing of the variables below this line should need to be changed.
+# Please check the TARGETS section below to make sure the make targets
+# are correct.
+#========================================================================
+
 #========================================================================
 # The names of the source files is defined in the configure script.
 # The object files are used for linking into the final library.
@@ -42,37 +55,13 @@ PKG_TCL_SOURCES = @PKG_TCL_SOURCES@
 PKG_HEADERS	= @PKG_HEADERS@
 
 #========================================================================
-# Nothing of the variables below this line should need to be changed.
-# Please check the TARGETS section below to make sure the make targets
-# are correct.
-#========================================================================
-
-itk_LIB_FILE	= @itk_LIB_FILE@
-itkstub_LIB_FILE = @itkstub_LIB_FILE@
-itclstub_LIB_FILE = @itclstub_LIB_FILE@
-
-#========================================================================
-# Add additional lines to handle any additional AC_SUBST cases that
-# have been added to the configure script.
-#========================================================================
-
-ITK_GENERIC_DIR_NATIVE	= @ITK_GENERIC_DIR_NATIVE@
-ITK_UNIX_DIR_NATIVE	= @ITK_UNIX_DIR_NATIVE@
-ITK_WIN_DIR_NATIVE	= @ITK_WIN_DIR_NATIVE@
-
-#========================================================================
-# Nothing of the variables below this line need to be changed.  Please
-# check the TARGETS section below to make sure the make targets are
-# correct.
-#========================================================================
-
-#========================================================================
-# Change the name of the variable "exampleA_LIB_FILE" to match the one
-# used in the configure script.  This is the parameterized name of the
-# library that we are building.
+# "PKG_LIB_FILE" refers to the library (dynamic or static as per
+# configuration options) composed of the named objects.
 #========================================================================
 
 PKG_LIB_FILE	= @PKG_LIB_FILE@
+PKG_LIB_FILE8	= @PKG_LIB_FILE8@
+PKG_LIB_FILE9	= @PKG_LIB_FILE9@
 PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@
 
 lib_BINARIES	= $(PKG_LIB_FILE)
@@ -86,9 +75,11 @@ exec_prefix	= @exec_prefix@
 
 bindir		= @bindir@
 libdir		= @libdir@
+includedir	= @includedir@
+datarootdir	= @datarootdir@
+runstatedir	= @runstatedir@
 datadir		= @datadir@
 mandir		= @mandir@
-includedir	= @includedir@
 
 DESTDIR		=
 
@@ -97,19 +88,21 @@ pkgdatadir	= $(datadir)/$(PKG_DIR)
 pkglibdir	= $(libdir)/$(PKG_DIR)
 pkgincludedir	= $(includedir)/$(PKG_DIR)
 
-top_builddir	= .
+top_builddir	= @abs_top_builddir@
 
-INSTALL		= @INSTALL@
-INSTALL_PROGRAM	= @INSTALL_PROGRAM@
+INSTALL_OPTIONS	=
+INSTALL		= @INSTALL@ $(INSTALL_OPTIONS)
+INSTALL_DATA_DIR = @INSTALL_DATA_DIR@
 INSTALL_DATA	= @INSTALL_DATA@
+INSTALL_PROGRAM	= @INSTALL_PROGRAM@
 INSTALL_SCRIPT	= @INSTALL_SCRIPT@
+INSTALL_LIBRARY	= @INSTALL_LIBRARY@
 
 PACKAGE_NAME	= @PACKAGE_NAME@
 PACKAGE_VERSION	= @PACKAGE_VERSION@
 CC		= @CC@
 CFLAGS_DEFAULT	= @CFLAGS_DEFAULT@
 CFLAGS_WARNING	= @CFLAGS_WARNING@
-CLEANFILES	= @CLEANFILES@
 EXEEXT		= @EXEEXT@
 LDFLAGS_DEFAULT	= @LDFLAGS_DEFAULT@
 MAKE_LIB	= @MAKE_LIB@
@@ -123,14 +116,15 @@ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
 SHLIB_LD	= @SHLIB_LD@
 SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
 STLIB_LD	= @STLIB_LD@
-TCL_DEFS	= @TCL_DEFS@
+#TCL_DEFS	= @TCL_DEFS@
 TCL_BIN_DIR	= @TCL_BIN_DIR@
 TCL_SRC_DIR	= @TCL_SRC_DIR@
 TK_SRC_DIR	= @TK_SRC_DIR@
 TK_BIN_DIR	= @TK_BIN_DIR@
+ITCL_TOOLS_DIR	= @itcl_SRC_DIR@/tools
 
 # Not used, but retained for reference of what libs Tcl required
-TCL_LIBS	= @TCL_LIBS@
+#TCL_LIBS	= @TCL_LIBS@
 
 #========================================================================
 # TCLLIBPATH seeds the auto_path in Tcl's init.tcl so we can test our
@@ -139,41 +133,61 @@ TCL_LIBS	= @TCL_LIBS@
 # require for testing here (like TCLX_LIBRARY).
 #========================================================================
 
+#EXTRA_PATH	= $(top_builddir):$(TCL_BIN_DIR)
 EXTRA_PATH	= $(top_builddir):$(TCL_BIN_DIR):$(TK_BIN_DIR)
-TCLSH_ENV	= TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \
-		  TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library` \
+TCLLIBPATH	= $(top_builddir) @itcl_BIN_DIR@
+TCLSH_ENV	= TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library`
+PKG_ENV		= @LD_LIBRARY_PATH_VAR@="$(EXTRA_PATH):$(@LD_LIBRARY_PATH_VAR@)" \
+		  PATH="$(EXTRA_PATH):$(PATH)" \
 		  ITCL_LIBRARY=`@CYGPATH@ @itcl_SRC_DIR@/library` \
 		  ITK_LIBRARY=`@CYGPATH@ $(srcdir)/library` \
-		  @LD_LIBRARY_PATH_VAR@="$(EXTRA_PATH):$(@LD_LIBRARY_PATH_VAR@)" \
-		  PATH="$(EXTRA_PATH):$(PATH)" \
-		  TCLLIBPATH="$(top_builddir) @itcl_BIN_DIR@"
-TCLSH_PROG	= @TCLSH_PROG@
-WISH_PROG	= @WISH_PROG@
-TCLSH		= $(TCLSH_ENV) $(TCLSH_PROG)
-WISH		= $(TCLSH_ENV) $(WISH_PROG)
+		  TCLLIBPATH="$(TCLLIBPATH)"
 
+TCLSH_PROG	= @TCLSH_PROG@
+TCLSH		= $(TCLSH_ENV) $(PKG_ENV) $(TCLSH_PROG)
+
+WISH_ENV	= TK_LIBRARY=`@CYGPATH@ $(TK_SRC_DIR)/library`
+WISH_PROG	= @WISH_PROG@
+WISH		= $(PKG_ENV) $(TCLSH_ENV) $(WISH_ENV) $(WISH_PROG)
+
+SHARED_BUILD	= @SHARED_BUILD@
+
+#INCLUDES	= @PKG_INCLUDES@ @TCL_INCLUDES@
 INCLUDES	= @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@
 
 PKG_CFLAGS	= @PKG_CFLAGS@
 
-DEFS		= @DEFS@ $(PKG_CFLAGS) \
-		  -DITK_LIBRARY=\"$(pkglibdir)\" -DUSE_NON_CONST
+# TCL_DEFS is not strictly need here, but if you remove it, then you
+# must make sure that configure.ac 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) @DEFS@ $(PKG_CFLAGS)
+DEFS		= @DEFS@ $(PKG_CFLAGS) -DITK_LIBRARY=\"$(pkglibdir)\"
 
 CONFIG_CLEAN_FILES = @CONFIG_CLEAN_FILES@ Makefile itkConfig.sh pkgIndex.tcl
+CLEANFILES	= @CLEANFILES@
 
 CPPFLAGS	= @CPPFLAGS@
 LIBS		= @PKG_LIBS@ @LIBS@
 AR		= @AR@
-CFLAGS		= @CFLAGS@
+CFLAGS		= @CFLAGS@ -DTCL_NO_DEPRECATED
 COMPILE		= $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 
+GDB		= gdb
+VALGRIND	= valgrind
+VALGRINDARGS	= --tool=memcheck --num-callers=8 --leak-resolution=high \
+		  --leak-check=yes --show-reachable=yes -v
+
+.SUFFIXES: .c .$(OBJEXT)
+
 #========================================================================
 # Start of user-definable TARGETS section
 #========================================================================
 
 #========================================================================
 # TEA TARGETS.  Please note that the "libraries:" target refers to platform
-# independent files, and the "binaries:" target inclues executable programs and
+# independent files, and the "binaries:" target includes executable programs and
 # platform-dependent libraries.  Modify these targets so that they install
 # the various pieces of your package.  The make and install rules
 # for the BINARIES that you specified above have already been done.
@@ -192,6 +206,12 @@ binaries: $(BINARIES)
 
 libraries:
 
+#========================================================================
+# Your doc target should differentiate from doc builds (by the developer)
+# and doc installs (see install-doc), which just install the docs on the
+# end user machine when building from source.
+#========================================================================
+
 doc:
 
 install: all install-binaries install-libraries install-doc
@@ -203,11 +223,11 @@ install-binaries: binaries install-lib-binaries install-bin-binaries
 #========================================================================
 
 install-libraries: libraries
-	@mkdir -p $(DESTDIR)$(includedir)
+	@$(INSTALL_DATA_DIR) "$(DESTDIR)$(includedir)"
 	@echo "Installing header files in $(DESTDIR)$(includedir)"
 	@list='$(PKG_HEADERS)'; for i in $$list; do \
 	    echo "Installing $(srcdir)/$$i" ; \
-	    $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir) ; \
+	    $(INSTALL_DATA) $(srcdir)/$$i "$(DESTDIR)$(includedir)" ; \
 	done;
 
 #========================================================================
@@ -216,27 +236,45 @@ install-libraries: libraries
 #========================================================================
 
 install-doc: doc
-	@mkdir -p $(DESTDIR)$(mandir)/mann
-	@echo "Installing man pages in $(DESTDIR)$(mandir)"
-	@cd $(srcdir)/doc; for i in *.n; do \
-	    echo "Installing $$i"; \
-	    rm -f $(DESTDIR)$(mandir)/mann/`basename $$i`; \
-	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
-		$$i > $(DESTDIR)$(mandir)/mann/$$i; \
-	    chmod 444 $(DESTDIR)$(mandir)/mann/$$i; \
+	@$(INSTALL_DATA_DIR) "$(DESTDIR)$(mandir)/mann"
+	@echo "Installing documentation in $(DESTDIR)$(mandir)"
+	@list='$(srcdir)/doc/*.n'; for i in $$list; do \
+	    if test X"$$i" = X'$(srcdir)/doc/*.n'; then break; fi; \
+	    bi=`basename $$i`; \
+	    echo "Installing $$bi"; \
+	    sed -e '/man\.macros/r $(srcdir)/doc/man.macros' -e '/man\.macros/d' $$i > $$bi.tmp \
+	    && $(INSTALL_DATA) $$bi.tmp "$(DESTDIR)$(mandir)/mann/$$bi" \
+	    && rm -f $$bi.tmp; \
 	done
 
 test: binaries libraries
-	$(WISH) `@CYGPATH@ $(srcdir)/tests/all.tcl` -load "package require Itk $(PACKAGE_VERSION)" $(TESTFLAGS) | cat
+	$(WISH) `@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS) -load "package require -exact itk $(PACKAGE_VERSION)"
 
 shell: binaries libraries
 	@$(WISH) $(SCRIPT)
 
 gdb:
-	$(TCLSH_ENV) gdb $(WISH_PROG) $(SCRIPT)
+	$(TCLSH_ENV) $(PKG_ENV) $(GDB) $(WISH_PROG) $(SCRIPT)
+
+gdb-test: binaries libraries
+	$(TCLSH_ENV) $(PKG_ENV) $(GDB) \
+	    --args $(WISH_PROG) `@CYGPATH@ $(srcdir)/tests/all.tcl` \
+	    $(TESTFLAGS) -singleproc 1 \
+	    -load "package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION) \
+		[list load `@CYGPATH@ $(PKG_LIB_FILE)` $(PACKAGE_NAME)]"
+
+valgrind: binaries libraries
+	$(TCLSH_ENV) $(PKG_ENV) $(VALGRIND) $(VALGRINDARGS) $(WISH_PROG) \
+	    `@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS)
+
+valgrindshell: binaries libraries
+	$(TCLSH_ENV) $(PKG_ENV) $(VALGRIND) $(VALGRINDARGS) $(WISH_PROG) $(SCRIPT)
 
 depend:
 
+genstubs: $(ITCL_TOOLS_DIR)/genStubs.tcl $(srcdir)/generic/itk.decls
+	$(TCLSH) $(ITCL_TOOLS_DIR)/genStubs.tcl $(srcdir)/generic $(srcdir)/generic/itk.decls
+
 #========================================================================
 # $(PKG_LIB_FILE) should be listed as part of the BINARIES variable
 # mentioned above.  That will ensure that this target is built when you
@@ -264,8 +302,8 @@ $(PKG_STUB_LIB_FILE): $(PKG_STUB_OBJECTS)
 # containing your extension.  If your sources are in a subdirectory,
 # you will have to modify the paths to reflect this:
 #
-# exampleA.$(OBJEXT): $(srcdir)/src/win/exampleA.c
-# 	$(COMPILE) -c `@CYGPATH@ $(srcdir)/src/win/exampleA.c` -o $@
+# sample.$(OBJEXT): $(srcdir)/generic/sample.c
+# 	$(COMPILE) -c `@CYGPATH@ $(srcdir)/generic/sample.c` -o $@
 #
 # Setting the VPATH variable to a list of paths will cause the makefile
 # to look into these paths when resolving .c to .obj dependencies.
@@ -274,53 +312,69 @@ $(PKG_STUB_LIB_FILE): $(PKG_STUB_OBJECTS)
 
 VPATH = $(srcdir)/unix:$(srcdir)/generic:$(srcdir)/win
 
-.c.$(OBJEXT):
-	$(COMPILE) -c `@CYGPATH@ $<` -o $@
+.c.@OBJEXT@:
+	$(COMPILE) -c `@CYGPATH@ $<` -I. -o $@
+
+itkBase.@OBJEXT@:	itkUuid.h
+
+$(srcdir)/manifest.uuid:
+	printf "git-" >$(srcdir)/manifest.uuid
+	(cd $(srcdir); git rev-parse HEAD >>$(srcdir)/manifest.uuid || \
+	    (printf "svn-r" >$(srcdir)/manifest.uuid ; \
+	    svn info --show-item last-changed-revision >>$(srcdir)/manifest.uuid) || \
+	    printf "unknown" >$(srcdir)/manifest.uuid)
+
+itkUuid.h:	$(srcdir)/manifest.uuid
+	echo "#define ITK_VERSION_UUID \\" >$@
+	cat $(srcdir)/manifest.uuid >>$@
+	echo "" >>$@
 
 #========================================================================
 # Distribution creation
 # You may need to tweak this target to make it work correctly.
 #========================================================================
 
-TAR		= tar
-#COMPRESS       = tar cvf $(PKG_DIR).tar $(PKG_DIR); compress $(PKG_DIR).tar
-COMPRESS        = $(TAR) zcvf $(PKG_DIR).tar.gz $(PKG_DIR)
-DIST_ROOT       = /tmp/dist
-DIST_DIR        = $(DIST_ROOT)/$(PKG_DIR)
+#COMPRESS	= tar cvf $(PKG_DIR).tar $(PKG_DIR); compress $(PKG_DIR).tar
+COMPRESS	= tar zcvf $(PKG_DIR).tar.gz $(PKG_DIR)
+DIST_ROOT	= /tmp/dist
+DIST_DIR	= $(DIST_ROOT)/$(PKG_DIR)
+
+DIST_INSTALL_DATA	= CPPROG='cp -p' $(INSTALL) -m 644
+DIST_INSTALL_SCRIPT	= CPPROG='cp -p' $(INSTALL) -m 755
 
 dist-clean:
 	rm -rf $(DIST_DIR) $(DIST_ROOT)/$(PKG_DIR).tar.*
 
-dist: dist-clean doc
-	mkdir -p $(DIST_DIR)
-	cp -p $(srcdir)/license* $(srcdir)/aclocal.m4 $(srcdir)/configure \
-		$(srcdir)/*.in  $(DIST_DIR)/
-	chmod 664 $(DIST_DIR)/Makefile.in $(DIST_DIR)/aclocal.m4
-	chmod 775 $(DIST_DIR)/configure $(DIST_DIR)/configure.in
+dist: dist-clean $(srcdir)/manifest.uuid
+	$(INSTALL_DATA_DIR) $(DIST_DIR)
 
-	mkdir $(DIST_DIR)/tclconfig
-	cp $(srcdir)/tclconfig/install-sh $(srcdir)/tclconfig/tcl.m4 \
-		$(DIST_DIR)/tclconfig/
-	chmod 664 $(DIST_DIR)/tclconfig/tcl.m4
-	chmod +x $(DIST_DIR)/tclconfig/install-sh
+	# TEA files
+	$(DIST_INSTALL_DATA) $(srcdir)/Makefile.in \
+	    $(srcdir)/manifest.uuid $(DISTDIR) \
+	    $(srcdir)/aclocal.m4 $(srcdir)/configure.ac \
+	    $(DIST_DIR)/
+	$(DIST_INSTALL_SCRIPT) $(srcdir)/configure $(DIST_DIR)/
+
+	$(INSTALL_DATA_DIR) $(DIST_DIR)/tclconfig
+	$(DIST_INSTALL_DATA) $(srcdir)/tclconfig/README.txt \
+	    $(srcdir)/tclconfig/tcl.m4 $(srcdir)/tclconfig/install-sh \
+	    $(DIST_DIR)/tclconfig/
+
+	# Extension files
+	$(DIST_INSTALL_DATA) \
+	    $(srcdir)/ChangeLog \
+	    $(srcdir)/license.terms \
+	    $(srcdir)/pkgIndex.tcl.in \
+	    $(srcdir)/itkConfig.sh.in \
+	    $(DIST_DIR)/
 
 	list='demos doc examples generic library tests win win/rc'; \
 	for p in $$list; do \
-	    if test -d $(srcdir)/$$p ; then \
-		mkdir $(DIST_DIR)/$$p; \
-		for q in $(srcdir)/$$p/*; do \
-		    if test -f $$q ; then \
-			cp -p $$q $(DIST_DIR)/$$p/; \
-		    fi; \
-		done; \
-	    fi; \
-	done
-
-	list='CHANGES ChangeLog INCOMPATIBLE README TODO'; \
-	for p in $$list; do \
-	    if test -f $(srcdir)/../$$p ; then \
-		cp -p $(srcdir)/../$$p $(DIST_DIR)/; \
-	    fi; \
+	    $(INSTALL_DATA_DIR) $(DIST_DIR)/$$p; \
+	    for f in $(srcdir)/$$p/*; do \
+		if ! test -f $$f; then continue; fi; \
+		$(DIST_INSTALL_DATA) $$f $(DIST_DIR)/$$p/; \
+	    done; \
 	done
 
 	(cd $(DIST_ROOT); $(COMPRESS);)
@@ -331,13 +385,12 @@ dist: dist-clean doc
 
 #========================================================================
 # Don't modify the file to clean here.  Instead, set the "CLEANFILES"
-# variable in configure.in
+# variable in configure.ac
 #========================================================================
 
-clean:  
+clean:
 	-test -z "$(BINARIES)" || rm -f $(BINARIES)
-	-rm -f *.o core *.core
-	-rm -f *.$(OBJEXT)
+	-rm -f *.$(OBJEXT) core *.core
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean: clean
@@ -349,34 +402,25 @@ distclean: clean
 # Install binary object libraries.  On Windows this includes both .dll and
 # .lib files.  Because the .lib files are not explicitly listed anywhere,
 # we need to deduce their existence from the .dll file of the same name.
-# Additionally, the .dll files go into the bin directory, but the .lib
-# files go into the lib directory.  On Unix platforms, all library files
-# go into the lib directory.  In addition, this will generate the pkgIndex.tcl
-# file in the install location (assuming it can find a usable tclsh8.2 shell)
+# Library files go into the lib directory.
+# In addition, this will generate the pkgIndex.tcl
+# file in the install location (assuming it can find a usable tclsh shell)
 #
 # You should not have to modify this target.
 #========================================================================
 
-install-lib-binaries:
-	@mkdir -p $(DESTDIR)$(pkglibdir)
+install-lib-binaries: binaries
+	@$(INSTALL_DATA_DIR) "$(DESTDIR)$(pkglibdir)"
 	@list='$(lib_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
-	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-	    stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
-	    if test "x$$stub" = "xstub"; then \
-		echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
-		$(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \
-	    else \
-		echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
-		$(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
-	    fi; \
+	    echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
+	    $(INSTALL_LIBRARY) $$p "$(DESTDIR)$(pkglibdir)/$$p"; \
 	    ext=`echo $$p|sed -e "s/.*\.//"`; \
 	    if test "x$$ext" = "xdll"; then \
 		lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
 		if test -f $$lib; then \
 		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \
-	            $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \
+	            $(INSTALL_DATA) $$lib "$(DESTDIR)$(pkglibdir)/$$lib"; \
 		fi; \
 	    fi; \
 	  fi; \
@@ -385,46 +429,52 @@ install-lib-binaries:
 	  if test -f $(srcdir)/$$p; then \
 	    destp=`basename $$p`; \
 	    echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \
+	    $(INSTALL_DATA) $(srcdir)/$$p "$(DESTDIR)$(pkglibdir)/$$destp"; \
 	  fi; \
 	done
-	$(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir)
-	: $(INSTALL_DATA) itkConfig.sh $(DESTDIR)$(libdir)
+	@if test "x$(SHARED_BUILD)" = "x1"; then \
+	    echo " Install pkgIndex.tcl $(DESTDIR)$(pkglibdir)"; \
+	    $(INSTALL_DATA) pkgIndex.tcl "$(DESTDIR)$(pkglibdir)"; \
+	fi
+	$(INSTALL_DATA) itkConfig.sh "$(DESTDIR)$(pkglibdir)"
 
 #========================================================================
-# Install binary executables (e.g. .exe files)
+# Install binary executables (e.g. .exe files and dependent .dll files)
+# This is for files that must go in the bin directory (located next to
+# wish and tclsh), like dependent .dll files on Windows.
 #
-# You should not have to modify this target.
+# You should not have to modify this target, except to define bin_BINARIES
+# above if necessary.
 #========================================================================
 
-install-bin-binaries:
-	@mkdir -p $(DESTDIR)$(bindir)
+install-bin-binaries: binaries
+	@$(INSTALL_DATA_DIR) "$(DESTDIR)$(bindir)"
 	@list='$(bin_BINARIES)'; for p in $$list; do \
 	  if test -f $$p; then \
 	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$p"; \
-	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$p; \
+	    $(INSTALL_PROGRAM) $$p "$(DESTDIR)$(bindir)/$$p"; \
 	  fi; \
 	done
 
-.SUFFIXES: .c .$(OBJEXT)
-
-#Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-#	cd $(top_builddir) \
-#	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 uninstall-binaries:
 	list='$(lib_BINARIES)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(pkglibdir)/$$p; \
+	  rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
 	done
 	list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
 	  p=`basename $$p`; \
-	  rm -f $(DESTDIR)$(pkglibdir)/$$p; \
+	  rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
 	done
 	list='$(bin_BINARIES)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(bindir)/$$p; \
+	  rm -f "$(DESTDIR)$(bindir)/$$p"; \
 	done
 
 .PHONY: all binaries clean depend distclean doc install libraries test
+.PHONY: gdb gdb-test valgrind valgrindshell
+.PHONY: genstubs
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

aclocal.m4

@@ -1 +1,9 @@
+#
+# Include the TEA standard macro set
+#
+
 builtin(include,tclconfig/tcl.m4)
+
+#
+# Add here whatever m4 macros you want to define for your package
+#

configure.ac

@@ -1,16 +1,25 @@
 #!/bin/bash -norc
-#--------------------------------------------------------------------
-# Sample configure.in for Tcl Extensions.  The only places you should
-# need to modify this file are marked by the string __CHANGE__
-#--------------------------------------------------------------------
+dnl	This file is an input file used by the GNU "autoconf" program to
+dnl	generate the file "configure", which is run during Tcl installation
+dnl	to configure the system for the local environment.
 
 #-----------------------------------------------------------------------
+# Sample configure.ac for Tcl Extensions.  The only places you should
+# need to modify this file are marked by the string __CHANGE__
+#-----------------------------------------------------------------------
+
+#-----------------------------------------------------------------------
+# __CHANGE__
+# Set your package name and version numbers here.
+#
 # 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.
+# This will also define a special symbol for Windows (BUILD_<PACKAGE_NAME>
+# so that we create the export library with the dll.
 #-----------------------------------------------------------------------
 
-AC_INIT([itk], [3.4])
+AC_INIT([itk], [4.2.3])
 
 #--------------------------------------------------------------------
 # Call TEA_INIT as the first TEA_ macro to set up initial vars.
@@ -18,18 +27,29 @@ AC_INIT([itk], [3.4])
 # as well as PKG_LIB_FILE and PKG_STUB_LIB_FILE.
 #--------------------------------------------------------------------
 
-TEA_INIT([3.9])
+TEA_INIT()
+
+#--------------------------------------------------------------------
+# Try to ensure the existence of a tclconfig directory in either
+# $srcdir or the current dir, if one can't be found in $srcdir.
+# If this package is being built as part of a bundle then a tclconfig
+# directory might exist in $srcdir's parent directory.
+#--------------------------------------------------------------------
 
 AC_PROG_LN_S
 CONFIG_CLEAN_FILES=
 if test ! -d $srcdir/tclconfig ; then
     if test -d $srcdir/../tclconfig ; then
-        $LN_S $srcdir/../tclconfig tclconfig
+	$LN_S $srcdir/../tclconfig tclconfig
 	CONFIG_CLEAN_FILES=tclconfig
     fi
 fi
 AC_SUBST(CONFIG_CLEAN_FILES)
 
+#--------------------------------------------------------------------
+# Tell autoconf where to find tcl.m4 and install.sh.
+#--------------------------------------------------------------------
+
 AC_CONFIG_AUX_DIR(tclconfig)
 
 #--------------------------------------------------------------------
@@ -40,30 +60,34 @@ TEA_PATH_TCLCONFIG
 TEA_LOAD_TCLCONFIG
 
 #--------------------------------------------------------------------
-# Load the tkConfig.sh file
+# Load the tkConfig.sh file if necessary (Tk extension)
 #--------------------------------------------------------------------
 
 TEA_PATH_TKCONFIG
 TEA_LOAD_TKCONFIG
 
+#--------------------------------------------------------------------
+# Load the itclConfig.sh file
+#--------------------------------------------------------------------
+
 TEA_PATH_CONFIG(itcl)
 TEA_LOAD_CONFIG(itcl)
 
 ITCL_INCLUDES="-I\"`${CYGPATH} ${itcl_SRC_DIR}/generic`\""
 
-#--------------------------------------------------------------------
+#-----------------------------------------------------------------------
 # Handle the --prefix=... option by defaulting to what Tcl gave.
-# Must be called after TEA_LOAD_TCLCONFIG and before $prefix is used.
-#--------------------------------------------------------------------
+# Must be called after TEA_LOAD_TCLCONFIG and before TEA_SETUP_COMPILER.
+#-----------------------------------------------------------------------
 
 TEA_PREFIX
 
-#------------------------------------------------------------------------
+#-----------------------------------------------------------------------
 # Standard compiler checks.
 # This sets up CC by using the CC env var, or looks for gcc otherwise.
-# This also calls AC_PROG_CC, AC_PROG_INSTALL and a few others to create
-# the basic setup necessary to compile executables.
-#------------------------------------------------------------------------
+# This also calls AC_PROG_CC and a few others to create the basic setup
+# necessary to compile executables.
+#-----------------------------------------------------------------------
 
 TEA_SETUP_COMPILER
 
@@ -77,35 +101,52 @@ TEA_SETUP_COMPILER
 # and PKG_TCL_SOURCES.
 #-----------------------------------------------------------------------
 
-TEA_ADD_SOURCES([itk_cmds.c
-		itk_option.c
-		itk_archetype.c
-		itk_util.c
-		itkStubInit.c])
-TEA_ADD_HEADERS([generic/itk.h generic/itkDecls.h])
+TEA_ADD_SOURCES([
+                itkArchBase.c
+	        itkArchetype.c
+	        itkBase.c
+                itkCmd.c
+                itkHelpers.c
+                itkOption.c
+	        itkUtil.c
+                itkStubInit.c
+                ])
+TEA_ADD_HEADERS([generic/itk.h generic/itkInt.h])
 TEA_ADD_INCLUDES([${ITCL_INCLUDES} -I\"`${CYGPATH} ${srcdir}/generic`\"])
 TEA_ADD_LIBS([])
 TEA_ADD_CFLAGS([])
 #TEA_ADD_STUB_SOURCES([itkStubLib.c])
 TEA_ADD_TCL_SOURCES([library/Archetype.itk
-		library/Toplevel.itk
-		library/Widget.itk
-		library/itk.tcl
-		library/tclIndex])
+                library/Toplevel.itk
+                library/Widget.itk
+                library/itk.tcl
+                library/tclIndex])
 
 #--------------------------------------------------------------------
 # __CHANGE__
-# A few miscellaneous platform-specific items:
 #
-# Windows creates a few extra files that need to be cleaned up.
 # You can add more files to clean if your extension creates any extra
 # files by extending CLEANFILES.
+# Add pkgIndex.tcl if it is generated in the Makefile instead of ./configure
+# and change Makefile.in to move it from CONFIG_CLEAN_FILES to BINARIES var.
+#
+# A few miscellaneous platform-specific items:
+# TEA_ADD_* any platform specific compiler/build info here.
 #--------------------------------------------------------------------
 
+#CLEANFILES="$CLEANFILES pkgIndex.tcl"
 if test "${TEA_PLATFORM}" = "windows" ; then
+    # Ensure no empty if clauses
+    :
+    #TEA_ADD_SOURCES([win/winFile.c])
+    #TEA_ADD_INCLUDES([-I\"$(${CYGPATH} ${srcdir}/win)\"])
     TEA_ADD_SOURCES([dllEntryPoint.c])
+else
+    # Ensure no empty else clauses
+    :
+    #TEA_ADD_SOURCES([unix/unixFile.c])
+    #TEA_ADD_LIBS([-lsuperfly])
 fi
-#CLEANFILES="$CLEANFILES *.ext"
 
 #--------------------------------------------------------------------
 # __CHANGE__
@@ -113,21 +154,14 @@ fi
 # hard to only rely on the Tcl public header files.  Internal headers
 # contain private data structures and are subject to change without
 # notice.
-# This must be done AFTER calling TEA_PATH_TCLCONFIG/TEA_LOAD_TCLCONFIG
-# so that we can extract TCL_SRC_DIR from the config file (in the case
-# of private headers
+# This MUST be called after TEA_LOAD_TCLCONFIG / TEA_LOAD_TKCONFIG
 #--------------------------------------------------------------------
 
 #TEA_PUBLIC_TCL_HEADERS
 TEA_PRIVATE_TCL_HEADERS
 
-#TEA_PUBLIC_TK_HEADERS
-TEA_PRIVATE_TK_HEADERS
-
-#--------------------------------------------------------------------
-# For Unix/Tk builds, make sure that the X libraries/headers are found.
-#--------------------------------------------------------------------
-
+TEA_PUBLIC_TK_HEADERS
+#TEA_PRIVATE_TK_HEADERS
 TEA_PATH_X
 
 #--------------------------------------------------------------------
@@ -138,6 +172,7 @@ TEA_PATH_X
 #--------------------------------------------------------------------
 
 AC_DEFINE(TCL_THREADS)
+
 #--------------------------------------------------------------------
 # Check whether --enable-threads or --disable-threads was given.
 # This auto-enables if Tcl was compiled threaded.
@@ -161,22 +196,16 @@ TEA_ENABLE_SHARED
 TEA_CONFIG_CFLAGS
 
 #--------------------------------------------------------------------
-# Set the default compiler switches based on the --enable-symbols 
-# option.
+# Set the default compiler switches based on the --enable-symbols option.
 #--------------------------------------------------------------------
 
 TEA_ENABLE_SYMBOLS
 
 #--------------------------------------------------------------------
-# Everyone should be linking against the Tcl stub library.  If you
-# can't for some reason, remove this definition.  If you aren't using
-# stubs, you also need to modify the SHLIB_LD_LIBS setting below to
-# link against the non-stubbed Tcl library.
+# Itcl stubs
 #--------------------------------------------------------------------
 
 if test "${SHARED_BUILD}" = "1" ; then
-    AC_DEFINE(USE_TCL_STUBS)
-    AC_DEFINE(USE_TK_STUBS)
     AC_DEFINE(USE_ITCL_STUBS)
 fi
 
@@ -189,28 +218,45 @@ fi
 TEA_MAKE_LIB
 
 #--------------------------------------------------------------------
-# __CHANGE__
-# Change the name from exampeA_LIB_FILE to match your package name.
-# Use the stub_LIB_FILE substitution if your package creates a stub
-# library.
-#--------------------------------------------------------------------
-
-AC_SUBST(itkstub_LIB_FILE)
-AC_SUBST(itk_LIB_FILE)
-
-#--------------------------------------------------------------------
-# Find tclsh so that we can run pkg_mkIndex to generate the pkgIndex.tcl
-# file during the install process.  Don't run the TCLSH_PROG through
-# ${CYGPATH} because it's being used directly by make.
-# Require that we use a tclsh shell version 8.2 or later since earlier
-# versions have bugs in the pkg_mkIndex routine.
+# Determine the name of the tclsh and/or wish executables in the
+# Tcl and Tk build directories or the location they were installed
+# into. These paths are used to support running test cases only,
+# the Makefile should not be making use of these paths to generate
+# a pkgIndex.tcl file or anything else at extension build time.
 #--------------------------------------------------------------------
 
 TEA_PROG_TCLSH
 TEA_PROG_WISH
 
 #--------------------------------------------------------------------
-# Finally, substitute all of the various values into the Makefile.
+# Setup a *Config.sh.in configuration file.
 #--------------------------------------------------------------------
 
-AC_OUTPUT([Makefile pkgIndex.tcl itkConfig.sh])
+# itk_SRC_DIR must be a fully qualified path
+eval itk_SRC_DIR="$srcdir"
+itk_SRC_DIR="`(cd "${itk_SRC_DIR}"; pwd)`"
+
+itk_LIB_FILE="${PKG_LIB_FILE}"
+itk_STUB_LIB_FILE="${PKG_STUB_LIB_FILE}"
+
+TEA_EXPORT_CONFIG([itk])
+AC_SUBST(ITCL_VERSION)
+AC_SUBST(itk_SRC_DIR)
+AC_SUBST(itk_LIB_FILE)
+AC_SUBST(itk_STUB_LIB_FILE)
+
+#--------------------------------------------------------------------
+# Specify files to substitute AC variables in. You may alternatively
+# have a special pkgIndex.tcl.in or other files which require
+# substituting the AC variables in. Include these here.
+#--------------------------------------------------------------------
+
+AC_CONFIG_FILES([Makefile pkgIndex.tcl])
+AC_CONFIG_FILES([itkConfig.sh])
+
+#--------------------------------------------------------------------
+# Finally, substitute all of the various values into the files
+# specified with AC_CONFIG_FILES.
+#--------------------------------------------------------------------
+
+AC_OUTPUT()

doc/man.macros

@@ -1,80 +1,86 @@
-'\" The definitions below are for supplemental macros used in Tcl/Tk
-'\" manual entries.
-'\"
-'\" .AP type name in/out ?indent?
-'\"	Start paragraph describing an argument to a library procedure.
-'\"	type is type of argument (int, etc.), in/out is either "in", "out",
-'\"	or "in/out" to describe whether procedure reads or modifies arg,
-'\"	and indent is equivalent to second arg of .IP (shouldn't ever be
-'\"	needed;  use .AS below instead)
-'\"
-'\" .AS ?type? ?name?
-'\"	Give maximum sizes of arguments for setting tab stops.  Type and
-'\"	name are examples of largest possible arguments that will be passed
-'\"	to .AP later.  If args are omitted, default tab stops are used.
-'\"
-'\" .BS
-'\"	Start box enclosure.  From here until next .BE, everything will be
-'\"	enclosed in one large box.
-'\"
-'\" .BE
-'\"	End of box enclosure.
-'\"
-'\" .CS
-'\"	Begin code excerpt.
-'\"
-'\" .CE
-'\"	End code excerpt.
-'\"
-'\" .VS ?version? ?br?
-'\"	Begin vertical sidebar, for use in marking newly-changed parts
-'\"	of man pages.  The first argument is ignored and used for recording
-'\"	the version when the .VS was added, so that the sidebars can be
-'\"	found and removed when they reach a certain age.  If another argument
-'\"	is present, then a line break is forced before starting the sidebar.
-'\"
-'\" .VE
-'\"	End of vertical sidebar.
-'\"
-'\" .DS
-'\"	Begin an indented unfilled display.
-'\"
-'\" .DE
-'\"	End of indented unfilled display.
-'\"
-'\" .SO
-'\"	Start of list of standard options for a Tk widget.  The
-'\"	options follow on successive lines, in four columns separated
-'\"	by tabs.
-'\"
-'\" .SE
-'\"	End of list of standard options for a Tk widget.
-'\"
-'\" .OP cmdName dbName dbClass
-'\"	Start of description of a specific option.  cmdName gives the
-'\"	option's name as specified in the class command, dbName gives
-'\"	the option's name in the option database, and dbClass gives
-'\"	the option's class in the option database.
-'\"
-'\" .UL arg1 arg2
-'\"	Print arg1 underlined, then print arg2 normally.
-'\"
-'\" SCCS: @(#) man.macros 1.9 97/08/22 18:50:59
-'\"
-'\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
+.\" The -*- nroff -*- definitions below are for supplemental macros used
+.\" in Tcl/Tk manual entries.
+.\"
+.\" .AP type name in/out ?indent?
+.\"	Start paragraph describing an argument to a library procedure.
+.\"	type is type of argument (int, etc.), in/out is either "in", "out",
+.\"	or "in/out" to describe whether procedure reads or modifies arg,
+.\"	and indent is equivalent to second arg of .IP (shouldn't ever be
+.\"	needed;  use .AS below instead)
+.\"
+.\" .AS ?type? ?name?
+.\"	Give maximum sizes of arguments for setting tab stops.  Type and
+.\"	name are examples of largest possible arguments that will be passed
+.\"	to .AP later.  If args are omitted, default tab stops are used.
+.\"
+.\" .BS
+.\"	Start box enclosure.  From here until next .BE, everything will be
+.\"	enclosed in one large box.
+.\"
+.\" .BE
+.\"	End of box enclosure.
+.\"
+.\" .CS
+.\"	Begin code excerpt.
+.\"
+.\" .CE
+.\"	End code excerpt.
+.\"
+.\" .VS ?version? ?br?
+.\"	Begin vertical sidebar, for use in marking newly-changed parts
+.\"	of man pages.  The first argument is ignored and used for recording
+.\"	the version when the .VS was added, so that the sidebars can be
+.\"	found and removed when they reach a certain age.  If another argument
+.\"	is present, then a line break is forced before starting the sidebar.
+.\"
+.\" .VE
+.\"	End of vertical sidebar.
+.\"
+.\" .DS
+.\"	Begin an indented unfilled display.
+.\"
+.\" .DE
+.\"	End of indented unfilled display.
+.\"
+.\" .SO ?manpage?
+.\"	Start of list of standard options for a Tk widget. The manpage
+.\"	argument defines where to look up the standard options; if
+.\"	omitted, defaults to "options". The options follow on successive
+.\"	lines, in three columns separated by tabs.
+.\"
+.\" .SE
+.\"	End of list of standard options for a Tk widget.
+.\"
+.\" .OP cmdName dbName dbClass
+.\"	Start of description of a specific option.  cmdName gives the
+.\"	option's name as specified in the class command, dbName gives
+.\"	the option's name in the option database, and dbClass gives
+.\"	the option's class in the option database.
+.\"
+.\" .UL arg1 arg2
+.\"	Print arg1 underlined, then print arg2 normally.
+.\"
+.\" .QW arg1 ?arg2?
+.\"	Print arg1 in quotes, then arg2 normally (for trailing punctuation).
+.\"
+.\" .PQ arg1 ?arg2?
+.\"	Print an open parenthesis, arg1 in quotes, then arg2 normally
+.\"	(for trailing punctuation) and then a closing parenthesis.
+.\"
+.\"	# Set up traps and other miscellaneous stuff for Tcl/Tk man pages.
 .if t .wh -1.3i ^B
 .nr ^l \n(.l
 .ad b
-'\"	# Start an argument description
+.\"	# Start an argument description
 .de AP
 .ie !"\\$4"" .TP \\$4
 .el \{\
 .   ie !"\\$2"" .TP \\n()Cu
 .   el          .TP 15
 .\}
-.ie !"\\$3"" \{\
 .ta \\n()Au \\n()Bu
-\&\\$1	\\fI\\$2\\fP	(\\$3)
+.ie !"\\$3"" \{\
+\&\\$1 \\fI\\$2\\fP (\\$3)
 .\".b
 .\}
 .el \{\
@@ -87,7 +93,7 @@
 .\}
 .\}
 ..
-'\"	# define tabbing values for .AP
+.\"	# define tabbing values for .AP
 .de AS
 .nr )A 10n
 .if !"\\$1"" .nr )A \\w'\\$1'u+3n
@@ -97,9 +103,9 @@
 .nr )C \\n()Bu+\\w'(in/out)'u+2n
 ..
 .AS Tcl_Interp Tcl_CreateInterp in/out
-'\"	# BS - start boxed text
-'\"	# ^y = starting y location
-'\"	# ^b = 1
+.\"	# BS - start boxed text
+.\"	# ^y = starting y location
+.\"	# ^b = 1
 .de BS
 .br
 .mk ^y
@@ -109,7 +115,7 @@
 .if n \l'\\n(.lu\(ul'
 .if n .fi
 ..
-'\"	# BE - end boxed text (draw box now)
+.\"	# BE - end boxed text (draw box now)
 .de BE
 .nf
 .ti 0
@@ -129,16 +135,16 @@
 .br
 .nr ^b 0
 ..
-'\"	# VS - start vertical sidebar
-'\"	# ^Y = starting y location
-'\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
+.\"	# VS - start vertical sidebar
+.\"	# ^Y = starting y location
+.\"	# ^v = 1 (for troff;  for nroff this doesn't matter)
 .de VS
 .if !"\\$2"" .br
 .mk ^Y
 .ie n 'mc \s12\(br\s0
 .el .nr ^v 1u
 ..
-'\"	# VE - end of vertical sidebar
+.\"	# VE - end of vertical sidebar
 .de VE
 .ie n 'mc
 .el \{\
@@ -153,9 +159,9 @@
 .\}
 .nr ^v 0
 ..
-'\"	# Special macro to handle page bottom:  finish off current
-'\"	# box/sidebar if in box/sidebar mode, then invoked standard
-'\"	# page bottom macro.
+.\"	# Special macro to handle page bottom:  finish off current
+.\"	# box/sidebar if in box/sidebar mode, then invoked standard
+.\"	# page bottom macro.
 .de ^B
 .ev 2
 'ti 0
@@ -182,34 +188,36 @@
 .mk ^Y
 .\}
 ..
-'\"	# DS - begin display
+.\"	# DS - begin display
 .de DS
 .RS
 .nf
 .sp
 ..
-'\"	# DE - end display
+.\"	# DE - end display
 .de DE
 .fi
 .RE
 .sp
 ..
-'\"	# SO - start of list of standard options
+.\"	# SO - start of list of standard options
 .de SO
+'ie '\\$1'' .ds So \\fBoptions\\fR
+'el .ds So \\fB\\$1\\fR
 .SH "STANDARD OPTIONS"
 .LP
 .nf
-.ta 4c 8c 12c
+.ta 5.5c 11c
 .ft B
 ..
-'\"	# SE - end of list of standard options
+.\"	# SE - end of list of standard options
 .de SE
 .fi
 .ft R
 .LP
-See the \\fBoptions\\fR manual entry for details on the standard options.
+See the \\*(So manual entry for details on the standard options.
 ..
-'\"	# OP - start of full description for a single option
+.\"	# OP - start of full description for a single option
 .de OP
 .LP
 .nf
@@ -220,17 +228,40 @@ Database Class:	\\fB\\$3\\fR
 .fi
 .IP
 ..
-'\"	# CS - begin code excerpt
+.\"	# CS - begin code excerpt
 .de CS
 .RS
 .nf
 .ta .25i .5i .75i 1i
 ..
-'\"	# CE - end code excerpt
+.\"	# CE - end code excerpt
 .de CE
 .fi
 .RE
 ..
+.\"	# UL - underline word
 .de UL
 \\$1\l'|0\(ul'\\$2
 ..
+.\"	# QW - apply quotation marks to word
+.de QW
+.ie '\\*(lq'"' ``\\$1''\\$2
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\$2
+..
+.\"	# PQ - apply parens and quotation marks to word
+.de PQ
+.ie '\\*(lq'"' (``\\$1''\\$2)\\$3
+.\"" fix emacs highlighting
+.el (\\*(lq\\$1\\*(rq\\$2)\\$3
+..
+.\"	# QR - quoted range
+.de QR
+.ie '\\*(lq'"' ``\\$1''\\-``\\$2''\\$3
+.\"" fix emacs highlighting
+.el \\*(lq\\$1\\*(rq\\-\\*(lq\\$2\\*(rq\\$3
+..
+.\"	# MT - "empty" string
+.de MT
+.QW ""
+..

generic/itk.decls

@@ -1,14 +1,20 @@
+# -*- tcl -*-
+
 # itk.decls --
 #
 #	This file contains the declarations for all supported public
 #	functions that are exported by the Itk library via the stubs table.
 #	This file is used to generate the itkDecls.h file.
-#	
+#
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
+# public API
 library itk
 interface itk
+hooks {itkInt}
+epoch 0
+scspec ITKAPI
 
 # Declare each of the functions in the public Itk interface.  Note that
 # the an index should never be reused for a different function in order
@@ -19,89 +25,97 @@ interface itk
 #  Exported functions:
 #
 
-declare 0 generic {
+declare 0 {
     int Itk_Init (Tcl_Interp *interp)
 }
-declare 1 generic {
+declare 1 {
     int Itk_SafeInit (Tcl_Interp *interp)
 }
 
 
-#
-#  Functions used internally by this package:
-#
-
-declare 2 generic {
-    int Itk_ConfigBodyCmd (ClientData cdata, Tcl_Interp *interp, \
-        int objc, Tcl_Obj *CONST objv[])
-}
-declare 3 generic {
-    int Itk_UsualCmd (ClientData cdata, Tcl_Interp *interp, int objc, \
-        Tcl_Obj *CONST objv[])
-}
-
-
-#
-#  Functions for managing options included in class definitions:
-#
-
-declare 4 generic {
-    int Itk_ClassOptionDefineCmd (ClientData cdata, Tcl_Interp *interp, \
-        int objc, Tcl_Obj *CONST objv[])
-}
-declare 5 generic {
-    int Itk_ClassOptionIllegalCmd (ClientData cdata, Tcl_Interp *interp, \
-        int objc, Tcl_Obj *CONST objv[])
-}
-declare 6 generic {
-    int Itk_ConfigClassOption (Tcl_Interp *interp, ItclObject *contextObj, \
-        ClientData cdata, CONST char* newVal)
-}
-declare 7 generic {
-    ItkClassOptTable* Itk_CreateClassOptTable( Tcl_Interp *interp, \
-        ItclClass *cdefn)
-}
-declare 8 generic {
-    ItkClassOptTable* Itk_FindClassOptTable (ItclClass *cdefn)
-}
-#declare 9 generic {
-#    void Itk_DeleteClassOptTable (Tcl_Interp *interp, ItclClass *cdefn)
-#}
-declare 10 generic {
-    int Itk_CreateClassOption (Tcl_Interp *interp, ItclClass *cdefn, \
-        char *switchName, char *resName, char *resClass, char *defVal, \
-        char *config, ItkClassOption **optPtr)
-}
-declare 11 generic {
-    ItkClassOption* Itk_FindClassOption (ItclClass *cdefn, char *switchName)
-}
-declare 12 generic {
-    void Itk_DelClassOption (ItkClassOption *opt)
-}
-
-
 #
 #  Functions needed for the Archetype base class:
 #
 
-declare 13 generic {
+declare 13 {
     int Itk_ArchetypeInit (Tcl_Interp* interp)
 }
 
 
+
+# private API
+interface itkInt
+
+#
+# Functions used within the package, but not considered "public"
+#
+
+#
+#  Functions used internally by this package:
+#
+
+declare 2 {
+    int Itk_ConfigBodyCmd (ClientData cdata, Tcl_Interp *interp, \
+        int objc, Tcl_Obj *const objv[])
+}
+declare 3 {
+    int Itk_UsualCmd (ClientData cdata, Tcl_Interp *interp, int objc, \
+        Tcl_Obj *const objv[])
+}
+
+#
+#  Functions for managing options included in class definitions:
+#
+
+declare 4 {
+    int Itk_ClassOptionDefineCmd (ClientData cdata, Tcl_Interp *interp, \
+        int objc, Tcl_Obj *const objv[])
+}
+declare 5 {
+    int Itk_ClassOptionIllegalCmd (ClientData cdata, Tcl_Interp *interp, \
+        int objc, Tcl_Obj *const objv[])
+}
+declare 6 {
+    int Itk_ConfigClassOption (Tcl_Interp *interp, ItclObject *contextObj, \
+        ClientData cdata, const char* newVal)
+}
+declare 7 {
+    ItkClassOptTable* Itk_CreateClassOptTable( Tcl_Interp *interp, \
+        ItclClass *cdefn)
+}
+declare 8 {
+    ItkClassOptTable* Itk_FindClassOptTable (ItclClass *cdefn)
+}
+#declare 9 {
+#    void Itk_DeleteClassOptTable (Tcl_Interp *interp, ItclClass *cdefn)
+#}
+declare 10 {
+    int Itk_CreateClassOption (Tcl_Interp *interp, ItclClass *cdefn, \
+        char *switchName, char *resName, char *resClass, char *defVal, \
+        char *config, ItkClassOption **optPtr)
+}
+declare 11 {
+    ItkClassOption* Itk_FindClassOption (ItclClass *cdefn, const char *switchName)
+}
+declare 12 {
+    void Itk_DelClassOption (ItkClassOption *opt)
+}
+
 #
 #  Functions for maintaining the ordered option list:
 #
 
-declare 14 generic {
+declare 14 {
     void Itk_OptListInit (ItkOptList* olist, Tcl_HashTable *options)
 }
-declare 15 generic {
+declare 15 {
     void Itk_OptListFree (ItkOptList* olist)
 }
-declare 16 generic {
+declare 16 {
     void Itk_OptListAdd (ItkOptList* olist, Tcl_HashEntry *entry)
 }
-declare 17 generic {
+declare 17 {
     void Itk_OptListRemove (ItkOptList* olist, Tcl_HashEntry *entry)
 }
+
+

generic/itk.h

@@ -46,6 +46,14 @@
 #ifndef ITK_H
 #define ITK_H
 
+#if defined(BUILD_itk)
+#       define ITKAPI DLLEXPORT
+#       undef USE_ITK_STUBS
+#       undef USE_ITCL_STUBS
+#else
+#       define ITKAPI DLLIMPORT
+#endif
+
 #ifndef TCL_ALPHA_RELEASE
 #   define TCL_ALPHA_RELEASE	0
 #endif
@@ -57,13 +65,13 @@
 #endif
 
 
-#define ITK_MAJOR_VERSION	3
-#define ITK_MINOR_VERSION	4
+#define ITK_MAJOR_VERSION	4
+#define ITK_MINOR_VERSION	2
 #define ITK_RELEASE_LEVEL	TCL_FINAL_RELEASE
-#define ITK_RELEASE_SERIAL	2
+#define ITK_RELEASE_SERIAL	3
 
-#define ITK_VERSION		"3.4"
-#define ITK_PATCH_LEVEL		"3.4.2"
+#define ITK_VERSION		"4.2"
+#define ITK_PATCH_LEVEL		"4.2.3"
 
 
 /*
@@ -75,8 +83,7 @@
 
 #ifndef RC_INVOKED
 
-#include "tk.h"
-#include "itclInt.h"
+#include <tk.h>
 
 #undef TCL_STORAGE_CLASS
 #ifdef BUILD_itk
@@ -89,49 +96,21 @@
 #   endif
 #endif
 
-/*
- *  List of options in alphabetical order:
- */
-typedef struct ItkOptList {
-    Tcl_HashTable *options;     /* list containing the real options */
-    Tcl_HashEntry **list;       /* gives ordering of options */
-    int len;                    /* number of entries in order list */
-    int max;                    /* maximum size of order list */
-} ItkOptList;
-
-/*
- *  List of options created in the class definition:
- */
-typedef struct ItkClassOptTable {
-    Tcl_HashTable options;        /* option storage with fast lookup */
-    ItkOptList order;             /* gives ordering of options */
-} ItkClassOptTable;
-
-/*
- *  Each option created in the class definition:
- */
-typedef struct ItkClassOption {
-    ItclMember *member;           /* info about this option */
-    char *resName;                /* resource name in X11 database */
-    char *resClass;               /* resource class name in X11 database */
-    char *init;                   /* initial value for option */
-} ItkClassOption;
-
-#include "itkDecls.h"
-
 /*
  *  This function is contained in the itkstub static library
  */
 
 #ifdef USE_ITK_STUBS
-TCL_EXTERNC CONST char *
-	Itk_InitStubs _ANSI_ARGS_((Tcl_Interp *interp,
-			    CONST char *version, int exact));
+EXTERN const char *
+	Itk_InitStubs(Tcl_Interp *interp,
+			    const char *version, int exact);
 #else
 #define Itk_InitStubs(interp, version, exact) \
       Tcl_PkgRequire(interp, "Itk", version, exact)
 #endif
 
+#include "itkDecls.h"
+
 /*
  * Public functions that are not accessible via the stubs table.
  */

generic/itkBase.c

@@ -21,12 +21,14 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
-#include "itk.h"
+#include "itkInt.h"
+#include "itkUuid.h"
 
-/*  
+MODULE_SCOPE const ItkStubs itkStubs;
+/*
  * The following script is used to initialize Itcl in a safe interpreter.
  */
- 
+
 static char safeInitScript[] =
 "proc ::itcl::local {class name args} {\n\
     set ptr [uplevel [list $class $name] $args]\n\
@@ -34,12 +36,12 @@ static char safeInitScript[] =
     set cmd [uplevel namespace which -command $ptr]\n\
     uplevel [list trace variable itcl-local-$ptr u \"::itcl::delete object $cmd; list\"]\n\
     return $ptr\n\
-}";  
+}";
 
 /*
  *  FORWARD DECLARATIONS
  */
-static int Initialize _ANSI_ARGS_((Tcl_Interp *interp));
+static int Initialize (Tcl_Interp *interp);
 /*
  * The following string is the startup script executed in new
  * interpreters.  It looks on disk in several different directories
@@ -53,21 +55,18 @@ namespace eval ::itk {\n\
     proc _find_init {} {\n\
         global env tcl_library\n\
         variable library\n\
-        variable version\n\
+        variable patchLevel\n\
         rename _find_init {}\n\
         if {[info exists library]} {\n\
             lappend dirs $library\n\
         } else {\n\
-            if {[catch {uplevel #0 source -rsrc itk}] == 0} {\n\
-                return\n\
-            }\n\
             set dirs {}\n\
             if {[info exists env(ITK_LIBRARY)]} {\n\
                 lappend dirs $env(ITK_LIBRARY)\n\
             }\n\
-            lappend dirs [file join [file dirname $tcl_library] itk$version]\n\
+            lappend dirs [file join [file dirname $tcl_library] itk$patchLevel]\n\
             set bindir [file dirname [info nameofexecutable]]\n\
-            lappend dirs [file join $bindir .. lib itk$version]\n\
+            lappend dirs [file join $bindir .. lib itk$patchLevel]\n\
             lappend dirs [file join $bindir .. library]\n\
             lappend dirs [file join $bindir .. .. library]\n\
             lappend dirs [file join $bindir .. .. itk library]\n\
@@ -75,7 +74,7 @@ namespace eval ::itk {\n\
             if {[string equal $::tcl_platform(platform) \"unix\"] && \
                     [string equal $::tcl_platform(os) \"Darwin\"]} {\n\
                 foreach d $::tcl_pkgPath {\n\
-                    lappend dirs [file join $d itk$version]\n\
+                    lappend dirs [file join $d itk$patchLevel]\n\
                 }\n\
             }\n\
         }\n\
@@ -110,35 +109,29 @@ namespace eval ::itk {\n\
  *  message in the interpreter) if anything goes wrong.
  * ------------------------------------------------------------------------
  */
+
+#ifndef STRINGIFY
+#  define STRINGIFY(x) STRINGIFY1(x)
+#  define STRINGIFY1(x) #x
+#endif
+
 static int
-Initialize(interp)
-    Tcl_Interp *interp;  /* interpreter to be updated */
+Initialize(
+    Tcl_Interp *interp)  /* interpreter to be updated */
 {
     Tcl_Namespace *itkNs, *parserNs;
     ClientData parserInfo;
+    Tcl_CmdInfo info;
 
-#ifndef USE_TCL_STUBS
-    if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, 0) == NULL) {
+    if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) {
       return TCL_ERROR;
     }
-    if (Tcl_PkgRequire(interp, "Tk", TK_VERSION, 0) == NULL) {
-      return TCL_ERROR;
-    }
-    if (Tcl_PkgRequire(interp, "Itcl", ITCL_VERSION, 0) == NULL) {
-      return TCL_ERROR;
-    }
-#else
-    if (Tcl_InitStubs(interp, "8.1", 0) == NULL) {
-      return TCL_ERROR;
-    }
-    if (Tk_InitStubs(interp, "8.1", 0) == NULL) {
+    if (Tk_InitStubs(interp, TK_VERSION, 0) == NULL) {
 	return TCL_ERROR;
     };
-    if (Itcl_InitStubs(interp, ITCL_VERSION, 1) == NULL) {
+    if (Itcl_InitStubs(interp, "4.1", 0) == NULL) {
 	return TCL_ERROR;
     }
-#endif
-
 
     /*
      *  Add the "itk_option" ensemble to the itcl class definition parser.
@@ -147,7 +140,7 @@ Initialize(interp)
         (Tcl_Namespace*)NULL, /* flags */ 0);
 
     if (!parserNs) {
-        Tcl_AppendResult(interp,
+        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
             "cannot initialize [incr Tk]: [incr Tcl] has not been installed\n",
             "Make sure that Itcl_Init() is called before Itk_Init()",
             (char*)NULL);
@@ -215,8 +208,9 @@ Initialize(interp)
     Tcl_CreateObjCommand(interp, "::itcl::configbody", Itk_ConfigBodyCmd,
         (ClientData)NULL, (Tcl_CmdDeleteProc*)NULL);
 
-    Tcl_SetVar(interp, "::itk::version", ITK_VERSION, 0);
-    Tcl_SetVar(interp, "::itk::patchLevel", ITK_PATCH_LEVEL, 0);
+    Tcl_SetVar(interp, "::itk::version", ITK_VERSION, TCL_NAMESPACE_ONLY);
+    Tcl_SetVar(interp, "::itk::patchLevel", ITK_PATCH_LEVEL,
+            TCL_NAMESPACE_ONLY);
 
     /*
      *  Signal that the package has been loaded and provide the Itk Stubs table
@@ -225,27 +219,71 @@ Initialize(interp)
      *  end-of-the-line?
      */
 
-#if TCL_DOES_STUBS
-    {
-	extern ItkStubs itkStubs;
-	if (Tcl_PkgProvideEx(interp, "Itk", ITK_VERSION,
-		(ClientData) &itkStubs) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-    }
-#else
-    if (Tcl_PkgProvide(interp, "Itk", ITK_VERSION) != TCL_OK) {
-	return TCL_ERROR;
-    }
+    if (Tcl_GetCommandInfo(interp, "::tcl::build-info", &info)) {
+	Tcl_CreateObjCommand(interp, "::itk::build-info",
+		info.objProc, (void *)(PACKAGE_VERSION "+" STRINGIFY(ITK_VERSION_UUID)
+#if defined(__clang__) && defined(__clang_major__)
+	    ".clang-" STRINGIFY(__clang_major__)
+#if __clang_minor__ < 10
+	    "0"
 #endif
-    return TCL_OK;
+	    STRINGIFY(__clang_minor__)
+#endif
+#if defined(__cplusplus) && !defined(__OBJC__)
+	    ".cplusplus"
+#endif
+#ifndef NDEBUG
+	    ".debug"
+#endif
+#if !defined(__clang__) && !defined(__INTEL_COMPILER) && defined(__GNUC__)
+	    ".gcc-" STRINGIFY(__GNUC__)
+#if __GNUC_MINOR__ < 10
+	    "0"
+#endif
+	    STRINGIFY(__GNUC_MINOR__)
+#endif
+#ifdef __INTEL_COMPILER
+	    ".icc-" STRINGIFY(__INTEL_COMPILER)
+#endif
+#ifdef TCL_MEM_DEBUG
+	    ".memdebug"
+#endif
+#if defined(_MSC_VER)
+	    ".msvc-" STRINGIFY(_MSC_VER)
+#endif
+#ifdef USE_NMAKE
+	    ".nmake"
+#endif
+#ifndef TCL_CFG_OPTIMIZED
+	    ".no-optimize"
+#endif
+#ifdef __OBJC__
+	    ".objective-c"
+#if defined(__cplusplus)
+	    "plusplus"
+#endif
+#endif
+#ifdef TCL_CFG_PROFILED
+	    ".profile"
+#endif
+#ifdef PURIFY
+	    ".purify"
+#endif
+#ifdef STATIC_BUILD
+	    ".static"
+#endif
+		), NULL);
+    }
+    Tcl_PkgProvideEx(interp, "Itk", ITK_PATCH_LEVEL, (ClientData) &itkStubs);
+    return Tcl_PkgProvideEx(interp, "itk", ITK_PATCH_LEVEL,
+            (ClientData) &itkStubs);
 }
 
 /*
  * ------------------------------------------------------------------------
  *  Itk_Init()
  *
- *  Invoked whenever a new interpeter is created to install the
+ *  Invoked whenever a new interpreter is created to install the
  *  [incr Tcl] package.  Usually invoked within Tcl_AppInit() at
  *  the start of execution.
  *
@@ -256,159 +294,36 @@ Initialize(interp)
  * ------------------------------------------------------------------------
  */
 int
-Itk_Init(interp)
-    Tcl_Interp *interp;  /* interpreter to be updated */
+Itk_Init(
+    Tcl_Interp *interp)  /* interpreter to be updated */
 {
     if (Initialize(interp) != TCL_OK) {
 	return TCL_ERROR;
     }
-    return Tcl_Eval(interp, initScript);
-    return TCL_OK;
+    return Tcl_EvalEx(interp, initScript, -1, 0);
 }
 
 
 /*
  * ------------------------------------------------------------------------
  *  Itk_SafeInit()
- *   
+ *
  *  Invoked whenever a new SAFE INTERPRETER is created to install
  *  the [incr Tcl] package.
- *      
+ *
  *  Creates the "::itk" namespace and installs access commands for
  *  creating classes and querying info.
- *  
- *  Returns TCL_OK on success, or TCL_ERROR (along with an error 
+ *
+ *  Returns TCL_OK on success, or TCL_ERROR (along with an error
  *  message in the interpreter) if anything goes wrong.
  * ------------------------------------------------------------------------
- */  
-int 
-Itk_SafeInit(interp)
-    Tcl_Interp *interp;  /* interpreter to be updated */ 
-{   
+ */
+int
+Itk_SafeInit(
+    Tcl_Interp *interp)  /* interpreter to be updated */
+{
     if (Initialize(interp) != TCL_OK) {
         return TCL_ERROR;
     }
-    return Tcl_Eval(interp, safeInitScript);
-}
-
-
-/*
- * ------------------------------------------------------------------------
- *  Itk_ConfigBodyCmd()
- *
- *  Replacement for the usual "itcl::configbody" command.  Recognizes
- *  mega-widget options included in a class definition.  Options are
- *  identified by their "switch" name, but without the "-" prefix:
- *
- *    itcl::configbody <class>::<itkOption> <body>
- *
- *  Handles bodies for public variables as well:
- *
- *    itcl::configbody <class>::<publicVar> <body>
- *
- *  If an <itkOption> is found, it has priority over public variables.
- *  If <body> has the form "@name" then it is treated as a reference
- *  to a C handling procedure; otherwise, it is taken as a body of
- *  Tcl statements.
- *
- *  Returns TCL_OK/TCL_ERROR to indicate success/failure.
- * ------------------------------------------------------------------------
- */
-/* ARGSUSED */
-int
-Itk_ConfigBodyCmd(dummy, interp, objc, objv)
-    ClientData dummy;        /* unused */
-    Tcl_Interp *interp;      /* current interpreter */
-    int objc;                /* number of arguments */
-    Tcl_Obj *CONST objv[];   /* argument objects */
-{
-    int result = TCL_OK;
-
-    char *token, *head, *tail;
-    ItclClass *cdefn;
-    ItclMemberCode *mcode;
-    ItkClassOptTable *optTable;
-    Tcl_HashEntry *entry;
-    ItkClassOption *opt;
-    Tcl_DString buffer;
-
-    if (objc != 3) {
-        Tcl_WrongNumArgs(interp, 1, objv, "class::option body");
-        return TCL_ERROR;
-    }
-
-    /*
-     *  Parse the member name "namesp::namesp::class::option".
-     *  Make sure that a class name was specified, and that the
-     *  class exists.
-     */
-    token = Tcl_GetStringFromObj(objv[1], (int*)NULL);
-    Itcl_ParseNamespPath(token, &buffer, &head, &tail);
-
-    if (!head || *head == '\0') {
-        Tcl_AppendResult(interp,
-            "missing class specifier for body declaration \"", token, "\"",
-            (char*)NULL);
-        result = TCL_ERROR;
-        goto configBodyCmdDone;
-    }
-
-    cdefn = Itcl_FindClass(interp, head, /* autoload */ 1);
-    if (cdefn == NULL) {
-        result = TCL_ERROR;
-        goto configBodyCmdDone;
-    }
-
-    /*
-     *  Look first for a configuration option with that name.
-     *  If it is not found, assume the reference is for a public
-     *  variable, and use the usual "configbody" implementation
-     *  to handle it.
-     */
-    optTable = Itk_FindClassOptTable(cdefn);
-    opt = NULL;
-
-    if (optTable) {
-        Tcl_DString optName;
-
-        Tcl_DStringInit(&optName);
-        Tcl_DStringAppend(&optName, "-", -1);
-        Tcl_DStringAppend(&optName, tail, -1);
-        entry = Tcl_FindHashEntry(&optTable->options,
-            Tcl_DStringValue(&optName));
-
-        if (entry) {
-            opt = (ItkClassOption*)Tcl_GetHashValue(entry);
-        }
-        Tcl_DStringFree(&optName);
-    }
-
-    if (opt == NULL) {
-        result = Itcl_ConfigBodyCmd(dummy, interp, objc, objv);
-        goto configBodyCmdDone;
-    }
-
-    /*
-     *  Otherwise, change the implementation for this option.
-     */
-    token = Tcl_GetStringFromObj(objv[2], (int*)NULL);
-
-    if (Itcl_CreateMemberCode(interp, cdefn, (char*)NULL, token,
-        &mcode) != TCL_OK) {
-
-        result = TCL_ERROR;
-        goto configBodyCmdDone;
-    }
-
-    Itcl_PreserveData((ClientData)mcode);
-    Itcl_EventuallyFree((ClientData)mcode, Itcl_DeleteMemberCode);
-
-    if (opt->member->code) {
-        Itcl_ReleaseData((ClientData)opt->member->code);
-    }
-    opt->member->code = mcode;
-
-configBodyCmdDone:
-    Tcl_DStringFree(&buffer);
-    return result;
+    return Tcl_EvalEx(interp, safeInitScript, -1, 0);
 }

generic/itkCmd.c

@@ -0,0 +1,149 @@
+/*
+ * ------------------------------------------------------------------------
+ *      PACKAGE:  [incr Tk]
+ *  DESCRIPTION:  Building mega-widgets with [incr Tcl]
+ *
+ *  [incr Tk] provides a framework for building composite "mega-widgets"
+ *  using [incr Tcl] classes.  It defines a set of base classes that are
+ *  specialized to create all other widgets.
+ *
+ *  This file defines the initialization and facilities common to all
+ *  mega-widgets.
+ *
+ * ========================================================================
+ *  AUTHOR:  Michael J. McLennan
+ *           Bell Labs Innovations for Lucent Technologies
+ *           mmclennan@lucent.com
+ *           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.
+ */
+#include "itkInt.h"
+
+/*
+ * ------------------------------------------------------------------------
+ *  Itk_ConfigBodyCmd()
+ *
+ *  Replacement for the usual "itcl::configbody" command.  Recognizes
+ *  mega-widget options included in a class definition.  Options are
+ *  identified by their "switch" name, but without the "-" prefix:
+ *
+ *    itcl::configbody <class>::<itkOption> <body>
+ *
+ *  Handles bodies for public variables as well:
+ *
+ *    itcl::configbody <class>::<publicVar> <body>
+ *
+ *  If an <itkOption> is found, it has priority over public variables.
+ *  If <body> has the form "@name" then it is treated as a reference
+ *  to a C handling procedure; otherwise, it is taken as a body of
+ *  Tcl statements.
+ *
+ *  Returns TCL_OK/TCL_ERROR to indicate success/failure.
+ * ------------------------------------------------------------------------
+ */
+/* ARGSUSED */
+int
+Itk_ConfigBodyCmd(
+    ClientData dummy,        /* unused */
+    Tcl_Interp *interp,      /* current interpreter */
+    int objc,                /* number of arguments */
+    Tcl_Obj *const objv[])   /* argument objects */
+{
+    int result = TCL_OK;
+
+    char *token;
+    const char *head;
+    const char *tail;
+    ItclClass *iclsPtr;
+    ItclMemberCode *mcode;
+    ItkClassOptTable *optTable;
+    Tcl_HashEntry *entry;
+    ItkClassOption *opt;
+    Tcl_DString buffer;
+
+    if (objc != 3) {
+        Tcl_WrongNumArgs(interp, 1, objv, "class::option body");
+        return TCL_ERROR;
+    }
+
+    /*
+     *  Parse the member name "namesp::namesp::class::option".
+     *  Make sure that a class name was specified, and that the
+     *  class exists.
+     */
+    token = Tcl_GetString(objv[1]);
+    Itcl_ParseNamespPath(token, &buffer, &head, &tail);
+
+    if (!head || *head == '\0') {
+        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
+                "missing class specifier for body declaration \"", token, "\"",
+                (char*)NULL);
+        result = TCL_ERROR;
+        goto configBodyCmdDone;
+    }
+
+    iclsPtr = Itcl_FindClass(interp, head, /* autoload */ 1);
+    if (iclsPtr == NULL) {
+        result = TCL_ERROR;
+        goto configBodyCmdDone;
+    }
+
+    /*
+     *  Look first for a configuration option with that name.
+     *  If it is not found, assume the reference is for a public
+     *  variable, and use the usual "configbody" implementation
+     *  to handle it.
+     */
+    optTable = Itk_FindClassOptTable(iclsPtr);
+    opt = NULL;
+
+    if (optTable) {
+        Tcl_DString optName;
+
+        Tcl_DStringInit(&optName);
+        Tcl_DStringAppend(&optName, "-", -1);
+        Tcl_DStringAppend(&optName, tail, -1);
+        entry = Tcl_FindHashEntry(&optTable->options,
+            Tcl_DStringValue(&optName));
+
+        if (entry) {
+            opt = (ItkClassOption*)Tcl_GetHashValue(entry);
+        }
+        Tcl_DStringFree(&optName);
+    }
+
+    if (opt == NULL) {
+        result = Itcl_ConfigBodyCmd(dummy, interp, objc, objv);
+        goto configBodyCmdDone;
+    }
+
+    /*
+     *  Otherwise, change the implementation for this option.
+     */
+    token = Tcl_GetString(objv[2]);
+
+    if (Itcl_CreateMemberCode(interp, iclsPtr, (char*)NULL, token,
+        &mcode) != TCL_OK) {
+
+        result = TCL_ERROR;
+        goto configBodyCmdDone;
+    }
+
+    Itcl_PreserveData((ClientData)mcode);
+#ifdef NOTDEF
+    Itcl_EventuallyFree((ClientData)mcode, (Tcl_FreeProc *)Itcl_DeleteMemberCode);
+#endif
+
+    if (opt->codePtr) {
+        Itcl_ReleaseData((ClientData)opt->codePtr);
+    }
+    opt->codePtr = mcode;
+
+configBodyCmdDone:
+    Tcl_DStringFree(&buffer);
+    return result;
+}

generic/itkDecls.h

@@ -1,247 +1,91 @@
-/*
- * itkDecls.h --
- *
- *	Declarations of functions in the platform independent public Itk API.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- */
-
-#ifndef _ITKDECLS
-#define _ITKDECLS
-
-#ifdef BUILD_itk
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLEXPORT
-#endif
-
-/*
- * WARNING: This file is automatically generated by the tools/genStubs.tcl
- * script.  Any modifications to the function declarations below should be made
- * in the generic/tk.decls script.
- */
 
 /* !BEGIN!: Do not edit below this line. */
 
+#define ITK_STUBS_EPOCH 0
+#define ITK_STUBS_REVISION 17
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * Exported function declarations:
  */
 
-#ifndef Itk_Init_TCL_DECLARED
-#define Itk_Init_TCL_DECLARED
 /* 0 */
-TCL_EXTERN(int)		Itk_Init _ANSI_ARGS_((Tcl_Interp * interp));
-#endif
-#ifndef Itk_SafeInit_TCL_DECLARED
-#define Itk_SafeInit_TCL_DECLARED
+ITKAPI int		Itk_Init(Tcl_Interp *interp);
 /* 1 */
-TCL_EXTERN(int)		Itk_SafeInit _ANSI_ARGS_((Tcl_Interp * interp));
-#endif
-#ifndef Itk_ConfigBodyCmd_TCL_DECLARED
-#define Itk_ConfigBodyCmd_TCL_DECLARED
-/* 2 */
-TCL_EXTERN(int)		Itk_ConfigBodyCmd _ANSI_ARGS_((ClientData cdata, 
-				Tcl_Interp * interp, int objc, 
-				Tcl_Obj *CONST objv[]));
-#endif
-#ifndef Itk_UsualCmd_TCL_DECLARED
-#define Itk_UsualCmd_TCL_DECLARED
-/* 3 */
-TCL_EXTERN(int)		Itk_UsualCmd _ANSI_ARGS_((ClientData cdata, 
-				Tcl_Interp * interp, int objc, 
-				Tcl_Obj *CONST objv[]));
-#endif
-#ifndef Itk_ClassOptionDefineCmd_TCL_DECLARED
-#define Itk_ClassOptionDefineCmd_TCL_DECLARED
-/* 4 */
-TCL_EXTERN(int)		Itk_ClassOptionDefineCmd _ANSI_ARGS_((
-				ClientData cdata, Tcl_Interp * interp, 
-				int objc, Tcl_Obj *CONST objv[]));
-#endif
-#ifndef Itk_ClassOptionIllegalCmd_TCL_DECLARED
-#define Itk_ClassOptionIllegalCmd_TCL_DECLARED
-/* 5 */
-TCL_EXTERN(int)		Itk_ClassOptionIllegalCmd _ANSI_ARGS_((
-				ClientData cdata, Tcl_Interp * interp, 
-				int objc, Tcl_Obj *CONST objv[]));
-#endif
-#ifndef Itk_ConfigClassOption_TCL_DECLARED
-#define Itk_ConfigClassOption_TCL_DECLARED
-/* 6 */
-TCL_EXTERN(int)		Itk_ConfigClassOption _ANSI_ARGS_((
-				Tcl_Interp * interp, ItclObject * contextObj, 
-				ClientData cdata, CONST char* newVal));
-#endif
-#ifndef Itk_CreateClassOptTable_TCL_DECLARED
-#define Itk_CreateClassOptTable_TCL_DECLARED
-/* 7 */
-TCL_EXTERN(ItkClassOptTable*) Itk_CreateClassOptTable _ANSI_ARGS_((
-				Tcl_Interp * interp, ItclClass * cdefn));
-#endif
-#ifndef Itk_FindClassOptTable_TCL_DECLARED
-#define Itk_FindClassOptTable_TCL_DECLARED
-/* 8 */
-TCL_EXTERN(ItkClassOptTable*) Itk_FindClassOptTable _ANSI_ARGS_((
-				ItclClass * cdefn));
-#endif
+ITKAPI int		Itk_SafeInit(Tcl_Interp *interp);
+/* Slot 2 is reserved */
+/* Slot 3 is reserved */
+/* Slot 4 is reserved */
+/* Slot 5 is reserved */
+/* Slot 6 is reserved */
+/* Slot 7 is reserved */
+/* Slot 8 is reserved */
 /* Slot 9 is reserved */
-#ifndef Itk_CreateClassOption_TCL_DECLARED
-#define Itk_CreateClassOption_TCL_DECLARED
-/* 10 */
-TCL_EXTERN(int)		Itk_CreateClassOption _ANSI_ARGS_((
-				Tcl_Interp * interp, ItclClass * cdefn, 
-				char * switchName, char * resName, 
-				char * resClass, char * defVal, 
-				char * config, ItkClassOption ** optPtr));
-#endif
-#ifndef Itk_FindClassOption_TCL_DECLARED
-#define Itk_FindClassOption_TCL_DECLARED
-/* 11 */
-TCL_EXTERN(ItkClassOption*) Itk_FindClassOption _ANSI_ARGS_((
-				ItclClass * cdefn, char * switchName));
-#endif
-#ifndef Itk_DelClassOption_TCL_DECLARED
-#define Itk_DelClassOption_TCL_DECLARED
-/* 12 */
-TCL_EXTERN(void)	Itk_DelClassOption _ANSI_ARGS_((ItkClassOption * opt));
-#endif
-#ifndef Itk_ArchetypeInit_TCL_DECLARED
-#define Itk_ArchetypeInit_TCL_DECLARED
+/* Slot 10 is reserved */
+/* Slot 11 is reserved */
+/* Slot 12 is reserved */
 /* 13 */
-TCL_EXTERN(int)		Itk_ArchetypeInit _ANSI_ARGS_((Tcl_Interp* interp));
-#endif
-#ifndef Itk_OptListInit_TCL_DECLARED
-#define Itk_OptListInit_TCL_DECLARED
-/* 14 */
-TCL_EXTERN(void)	Itk_OptListInit _ANSI_ARGS_((ItkOptList* olist, 
-				Tcl_HashTable * options));
-#endif
-#ifndef Itk_OptListFree_TCL_DECLARED
-#define Itk_OptListFree_TCL_DECLARED
-/* 15 */
-TCL_EXTERN(void)	Itk_OptListFree _ANSI_ARGS_((ItkOptList* olist));
-#endif
-#ifndef Itk_OptListAdd_TCL_DECLARED
-#define Itk_OptListAdd_TCL_DECLARED
-/* 16 */
-TCL_EXTERN(void)	Itk_OptListAdd _ANSI_ARGS_((ItkOptList* olist, 
-				Tcl_HashEntry * entry));
-#endif
-#ifndef Itk_OptListRemove_TCL_DECLARED
-#define Itk_OptListRemove_TCL_DECLARED
-/* 17 */
-TCL_EXTERN(void)	Itk_OptListRemove _ANSI_ARGS_((ItkOptList* olist, 
-				Tcl_HashEntry * entry));
-#endif
+ITKAPI int		Itk_ArchetypeInit(Tcl_Interp*interp);
+
+typedef struct {
+    const struct ItkIntStubs *itkIntStubs;
+} ItkStubHooks;
 
 typedef struct ItkStubs {
     int magic;
-    struct ItkStubHooks *hooks;
+    int epoch;
+    int revision;
+    const ItkStubHooks *hooks;
 
-    int (*itk_Init) _ANSI_ARGS_((Tcl_Interp * interp)); /* 0 */
-    int (*itk_SafeInit) _ANSI_ARGS_((Tcl_Interp * interp)); /* 1 */
-    int (*itk_ConfigBodyCmd) _ANSI_ARGS_((ClientData cdata, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[])); /* 2 */
-    int (*itk_UsualCmd) _ANSI_ARGS_((ClientData cdata, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[])); /* 3 */
-    int (*itk_ClassOptionDefineCmd) _ANSI_ARGS_((ClientData cdata, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[])); /* 4 */
-    int (*itk_ClassOptionIllegalCmd) _ANSI_ARGS_((ClientData cdata, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[])); /* 5 */
-    int (*itk_ConfigClassOption) _ANSI_ARGS_((Tcl_Interp * interp, ItclObject * contextObj, ClientData cdata, CONST char* newVal)); /* 6 */
-    ItkClassOptTable* (*itk_CreateClassOptTable) _ANSI_ARGS_((Tcl_Interp * interp, ItclClass * cdefn)); /* 7 */
-    ItkClassOptTable* (*itk_FindClassOptTable) _ANSI_ARGS_((ItclClass * cdefn)); /* 8 */
-    void *reserved9;
-    int (*itk_CreateClassOption) _ANSI_ARGS_((Tcl_Interp * interp, ItclClass * cdefn, char * switchName, char * resName, char * resClass, char * defVal, char * config, ItkClassOption ** optPtr)); /* 10 */
-    ItkClassOption* (*itk_FindClassOption) _ANSI_ARGS_((ItclClass * cdefn, char * switchName)); /* 11 */
-    void (*itk_DelClassOption) _ANSI_ARGS_((ItkClassOption * opt)); /* 12 */
-    int (*itk_ArchetypeInit) _ANSI_ARGS_((Tcl_Interp* interp)); /* 13 */
-    void (*itk_OptListInit) _ANSI_ARGS_((ItkOptList* olist, Tcl_HashTable * options)); /* 14 */
-    void (*itk_OptListFree) _ANSI_ARGS_((ItkOptList* olist)); /* 15 */
-    void (*itk_OptListAdd) _ANSI_ARGS_((ItkOptList* olist, Tcl_HashEntry * entry)); /* 16 */
-    void (*itk_OptListRemove) _ANSI_ARGS_((ItkOptList* olist, Tcl_HashEntry * entry)); /* 17 */
+    int (*itk_Init) (Tcl_Interp *interp); /* 0 */
+    int (*itk_SafeInit) (Tcl_Interp *interp); /* 1 */
+    void (*reserved2)(void);
+    void (*reserved3)(void);
+    void (*reserved4)(void);
+    void (*reserved5)(void);
+    void (*reserved6)(void);
+    void (*reserved7)(void);
+    void (*reserved8)(void);
+    void (*reserved9)(void);
+    void (*reserved10)(void);
+    void (*reserved11)(void);
+    void (*reserved12)(void);
+    int (*itk_ArchetypeInit) (Tcl_Interp*interp); /* 13 */
 } ItkStubs;
 
-TCL_EXTERNC ItkStubs *itkStubsPtr;
+extern const ItkStubs *itkStubsPtr;
 
-#if defined(USE_ITK_STUBS) && !defined(USE_ITK_STUB_PROCS)
+#ifdef __cplusplus
+}
+#endif
+
+#if defined(USE_ITK_STUBS)
 
 /*
  * Inline function declarations:
  */
 
-#ifndef Itk_Init
 #define Itk_Init \
 	(itkStubsPtr->itk_Init) /* 0 */
-#endif
-#ifndef Itk_SafeInit
 #define Itk_SafeInit \
 	(itkStubsPtr->itk_SafeInit) /* 1 */
-#endif
-#ifndef Itk_ConfigBodyCmd
-#define Itk_ConfigBodyCmd \
-	(itkStubsPtr->itk_ConfigBodyCmd) /* 2 */
-#endif
-#ifndef Itk_UsualCmd
-#define Itk_UsualCmd \
-	(itkStubsPtr->itk_UsualCmd) /* 3 */
-#endif
-#ifndef Itk_ClassOptionDefineCmd
-#define Itk_ClassOptionDefineCmd \
-	(itkStubsPtr->itk_ClassOptionDefineCmd) /* 4 */
-#endif
-#ifndef Itk_ClassOptionIllegalCmd
-#define Itk_ClassOptionIllegalCmd \
-	(itkStubsPtr->itk_ClassOptionIllegalCmd) /* 5 */
-#endif
-#ifndef Itk_ConfigClassOption
-#define Itk_ConfigClassOption \
-	(itkStubsPtr->itk_ConfigClassOption) /* 6 */
-#endif
-#ifndef Itk_CreateClassOptTable
-#define Itk_CreateClassOptTable \
-	(itkStubsPtr->itk_CreateClassOptTable) /* 7 */
-#endif
-#ifndef Itk_FindClassOptTable
-#define Itk_FindClassOptTable \
-	(itkStubsPtr->itk_FindClassOptTable) /* 8 */
-#endif
+/* Slot 2 is reserved */
+/* Slot 3 is reserved */
+/* Slot 4 is reserved */
+/* Slot 5 is reserved */
+/* Slot 6 is reserved */
+/* Slot 7 is reserved */
+/* Slot 8 is reserved */
 /* Slot 9 is reserved */
-#ifndef Itk_CreateClassOption
-#define Itk_CreateClassOption \
-	(itkStubsPtr->itk_CreateClassOption) /* 10 */
-#endif
-#ifndef Itk_FindClassOption
-#define Itk_FindClassOption \
-	(itkStubsPtr->itk_FindClassOption) /* 11 */
-#endif
-#ifndef Itk_DelClassOption
-#define Itk_DelClassOption \
-	(itkStubsPtr->itk_DelClassOption) /* 12 */
-#endif
-#ifndef Itk_ArchetypeInit
+/* Slot 10 is reserved */
+/* Slot 11 is reserved */
+/* Slot 12 is reserved */
 #define Itk_ArchetypeInit \
 	(itkStubsPtr->itk_ArchetypeInit) /* 13 */
-#endif
-#ifndef Itk_OptListInit
-#define Itk_OptListInit \
-	(itkStubsPtr->itk_OptListInit) /* 14 */
-#endif
-#ifndef Itk_OptListFree
-#define Itk_OptListFree \
-	(itkStubsPtr->itk_OptListFree) /* 15 */
-#endif
-#ifndef Itk_OptListAdd
-#define Itk_OptListAdd \
-	(itkStubsPtr->itk_OptListAdd) /* 16 */
-#endif
-#ifndef Itk_OptListRemove
-#define Itk_OptListRemove \
-	(itkStubsPtr->itk_OptListRemove) /* 17 */
-#endif
 
-#endif /* defined(USE_ITK_STUBS) && !defined(USE_ITK_STUB_PROCS) */
+#endif /* defined(USE_ITK_STUBS) */
 
 /* !END!: Do not edit above this line. */
-
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLIMPORT
-
-#endif /* _ITKDECLS */
-

generic/itkHelpers.c

@@ -0,0 +1,195 @@
+/*
+ * ------------------------------------------------------------------------
+ *      PACKAGE:  [incr Tk]
+ *  DESCRIPTION:  Building mega-widgets with [incr Tcl]
+ *
+ *  [incr Tk] provides a framework for building composite "mega-widgets"
+ *  using [incr Tcl] classes.  It defines a set of base classes that are
+ *  specialized to create all other widgets.
+ *
+ *  This part adds C implementations for some helxeper methods in the
+ *  base class itk::Archetype.
+ *
+ * ========================================================================
+ *  AUTHOR:  Michael J. McLennan
+ *           Bell Labs Innovations for Lucent Technologies
+ *           mmclennan@lucent.com
+ *           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.
+ */
+#include <assert.h>
+#include "itkInt.h"
+
+
+/*
+ * ------------------------------------------------------------------------
+ *  Itk_ArchOptConfigError()
+ *
+ *  Simply utility which adds error information after a option
+ *  configuration fails.  Adds traceback information to the given
+ *  interpreter.
+ * ------------------------------------------------------------------------
+ */
+void
+Itk_ArchOptConfigError(
+    Tcl_Interp *interp,            /* interpreter handling this object */
+    ArchInfo *info,                /* info associated with mega-widget */
+    ArchOption *archOpt)           /* configuration option that failed */
+{
+    Tcl_Obj *objPtr;
+
+    objPtr = Tcl_NewStringObj((char*)NULL, 0);
+    Tcl_IncrRefCount(objPtr);
+
+    Tcl_AppendToObj(objPtr, "\n    (while configuring option \"", -1);
+    Tcl_AppendToObj(objPtr, archOpt->switchName, -1);
+    Tcl_AppendToObj(objPtr, "\"", -1);
+
+    if (info->itclObj && info->itclObj->accessCmd) {
+        Tcl_AppendToObj(objPtr, " for widget \"", -1);
+        Tcl_GetCommandFullName(interp, info->itclObj->accessCmd, objPtr);
+        Tcl_AppendToObj(objPtr, "\")", -1);
+    }
+    Tcl_AddErrorInfo(interp, Tcl_GetStringFromObj(objPtr, (int*)NULL));
+    Tcl_DecrRefCount(objPtr);
+}
+
+
+/*
+ * ------------------------------------------------------------------------
+ *  Itk_ArchOptAccessError()
+ *
+ *  Simply utility which adds error information after an option
+ *  value access fails.  Adds traceback information to the given
+ *  interpreter.
+ * ------------------------------------------------------------------------
+ */
+void
+Itk_ArchOptAccessError(
+    Tcl_Interp *interp,            /* interpreter handling this object */
+    ArchInfo *info,                /* info associated with mega-widget */
+    ArchOption *archOpt)           /* option that couldn't be accessed */
+{
+    Tcl_ResetResult(interp);
+
+    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
+        "internal error: cannot access itk_option(", archOpt->switchName, ")",
+        (char*)NULL);
+
+    if (info->itclObj->accessCmd) {
+        Tcl_Obj *resultPtr = Tcl_GetObjResult(interp);
+        Tcl_AppendToObj(resultPtr, " in widget \"", -1);
+        Tcl_GetCommandFullName(interp, info->itclObj->accessCmd, resultPtr);
+        Tcl_AppendToObj(resultPtr, "\"", -1);
+    }
+}
+
+
+/*
+ * ------------------------------------------------------------------------
+ *  Itk_GetArchInfo()
+ *
+ *  Finds the extra Archetype info associated with the given object.
+ *  Returns TCL_OK and a pointer to the info if found.  Returns
+ *  TCL_ERROR along with an error message in interp->result if not.
+ * ------------------------------------------------------------------------
+ */
+int
+Itk_GetArchInfo(
+    Tcl_Interp *interp,            /* interpreter handling this object */
+    ItclObject *contextObj,        /* object with desired data */
+    ArchInfo **infoPtr)            /* returns:  pointer to extra info */
+{
+    Tcl_HashTable *objsWithArchInfo;
+    Tcl_HashEntry *entry;
+
+
+    /*
+     *  If there is any problem finding the info, return an error.
+     */
+    objsWithArchInfo = ItkGetObjsWithArchInfo(interp);
+    entry = Tcl_FindHashEntry(objsWithArchInfo, (char*)contextObj);
+
+    if (!entry) {
+        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
+            "internal error: no Archetype information for widget",
+            (char*)NULL);
+
+        if (contextObj->accessCmd) {
+            Tcl_Obj *resultPtr = Tcl_GetObjResult(interp);
+            Tcl_AppendToObj(resultPtr, " \"", -1);
+            Tcl_GetCommandFullName(interp, contextObj->accessCmd, resultPtr);
+            Tcl_AppendToObj(resultPtr, "\"", -1);
+        }
+        return TCL_ERROR;
+    }
+
+    /*
+     *  Otherwise, return the requested info.
+     */
+    *infoPtr = (ArchInfo*)Tcl_GetHashValue(entry);
+    return TCL_OK;
+}
+
+
+/*
+ * ------------------------------------------------------------------------
+ *  ItkGetObjsWithArchInfo()
+ *
+ *  Returns a pointer to a hash table containing the list of registered
+ *  objects in the specified interpreter.  If the hash table does not
+ *  already exist, it is created.
+ * ------------------------------------------------------------------------
+ */
+Tcl_HashTable*
+ItkGetObjsWithArchInfo(
+    Tcl_Interp *interp)  /* interpreter handling this registration */
+{
+    Tcl_HashTable* objTable;
+
+    /*
+     *  If the registration table does not yet exist, then create it.
+     */
+    objTable = (Tcl_HashTable*)Tcl_GetAssocData(interp,
+        "itk_objsWithArchInfo", (Tcl_InterpDeleteProc**)NULL);
+
+    if (!objTable) {
+        objTable = (Tcl_HashTable*)ckalloc(sizeof(Tcl_HashTable));
+        Tcl_InitHashTable(objTable, TCL_ONE_WORD_KEYS);
+        Tcl_SetAssocData(interp, "itk_objsWithArchInfo",
+            ItkFreeObjsWithArchInfo, (ClientData)objTable);
+    }
+    return objTable;
+}
+
+/*
+ * ------------------------------------------------------------------------
+ *  ItkFreeObjsWithArchInfo()
+ *
+ *  When an interpreter is deleted, this procedure is called to
+ *  free up the associated data created by ItkGetObjsWithArchInfo.
+ * ------------------------------------------------------------------------
+ */
+void
+ItkFreeObjsWithArchInfo(
+    ClientData clientData,       /* associated data */
+    Tcl_Interp *interp)          /* interpreter being freed */
+{
+    Tcl_HashTable *tablePtr = (Tcl_HashTable*)clientData;
+    Tcl_HashSearch place;
+    Tcl_HashEntry *entry;
+
+    entry = Tcl_FirstHashEntry(tablePtr, &place);
+    while (entry) {
+        Itk_DelArchInfo( Tcl_GetHashValue(entry) );
+        entry = Tcl_NextHashEntry(&place);
+    }
+
+    Tcl_DeleteHashTable(tablePtr);
+    ckfree((char*)tablePtr);
+}
+

generic/itkInt.h

@@ -0,0 +1,221 @@
+/*
+ * ------------------------------------------------------------------------
+ *      PACKAGE:  [incr Tk]
+ *  DESCRIPTION:  Building mega-widgets with [incr Tcl]
+ *
+ *  [incr Tk] provides a framework for building composite "mega-widgets"
+ *  using [incr Tcl] classes.  It defines a set of base classes that are
+ *  specialized to create all other widgets.
+ *
+ *
+ * ========================================================================
+ *  AUTHOR:  Michael J. McLennan
+ *           Bell Labs Innovations for Lucent Technologies
+ *           mmclennan@lucent.com
+ *           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.
+ */
+
+#include <itclInt.h>
+#include "itk.h"
+
+/*
+ *  List of options in alphabetical order:
+ */
+typedef struct ItkOptList {
+    Tcl_HashTable *options;     /* list containing the real options */
+    Tcl_HashEntry **list;       /* gives ordering of options */
+    int len;                    /* number of entries in order list */
+    int max;                    /* maximum size of order list */
+} ItkOptList;
+
+/*
+ *  List of options created in the class definition:
+ */
+typedef struct ItkClassOptTable {
+    Tcl_HashTable options;        /* option storage with fast lookup */
+    ItkOptList order;             /* gives ordering of options */
+} ItkClassOptTable;
+
+/*
+ *  Each option created in the class definition:
+ */
+typedef struct ItkClassOption {
+    Tcl_Obj* namePtr;           /* member name */
+    Tcl_Obj* fullNamePtr;       /* member name with "class::" qualifier */
+    ItclClass* iclsPtr;         /* class containing this member */
+    int protection;             /* protection level */
+    int flags;                  /* flags describing member (see above) */
+    ItclMemberCode *codePtr;    /* code associated with member */
+    char *resName;                /* resource name in X11 database */
+    char *resClass;               /* resource class name in X11 database */
+    char *init;                   /* initial value for option */
+} ItkClassOption;
+
+
+/*
+ *  Info associated with each Archetype mega-widget:
+ */
+typedef struct ArchInfo {
+    ItclObject *itclObj;        /* object containing this info */
+    Tk_Window tkwin;            /* window representing this mega-widget */
+    Tcl_HashTable components;   /* list of all mega-widget components */
+    Tcl_HashTable options;      /* list of all mega-widget options */
+    ItkOptList order;           /* gives ordering of options */
+} ArchInfo;
+
+/*
+ *  Each component widget in an Archetype mega-widget:
+ */
+typedef struct ArchComponent {
+    Tcl_Obj* namePtr;           /* member name */
+    Tcl_Obj* fullNamePtr;       /* member name with "class::" qualifier */
+    ItclClass* iclsPtr;         /* class containing this member */
+    int protection;             /* protection level */
+    int flags;                  /* flags describing member (see above) */
+    ItclMemberCode *codePtr;    /* code associated with member */
+    Tcl_Command accessCmd;      /* access command for component widget */
+    Tk_Window tkwin;            /* Tk window for this component widget */
+    char *pathName;             /* Tk path name for this component widget.
+                                   We can't use the tkwin pointer after
+                                   the window has been destroyed so we
+                                   need to save a copy for use in
+                                   Itk_ArchCompDeleteCmd() */
+} ArchComponent;
+
+/*
+ *  Each option in an Archetype mega-widget:
+ */
+typedef struct ArchOption {
+    char *switchName;           /* command-line switch for this option */
+    char *resName;              /* resource name in X11 database */
+    char *resClass;             /* resource class name in X11 database */
+    char *init;                 /* initial value for option */
+    int flags;                  /* flags representing option state */
+    Itcl_List parts;            /* parts relating to this option */
+} ArchOption;
+
+/*
+ *  Flag bits for ArchOption state:
+ */
+#define ITK_ARCHOPT_INIT  0x01  /* option has been initialized */
+
+/*
+ *  Various parts of a composite option in an Archetype mega-widget:
+ */
+typedef int (Itk_ConfigOptionPartProc) (Tcl_Interp *interp,
+    ItclObject *contextObj, ClientData cdata, const char* newVal);
+
+typedef struct ArchOptionPart {
+    ClientData clientData;                 /* data associated with this part */
+    Itk_ConfigOptionPartProc *configProc;  /* update when new vals arrive */
+    Tcl_CmdDeleteProc *deleteProc;         /* clean up after clientData */
+
+    ClientData from;                       /* token that indicates who
+                                            * contributed this option part */
+} ArchOptionPart;
+
+
+/*
+ *  Info kept by the itk::option-parser namespace and shared by
+ *  all option processing commands:
+ */
+typedef struct ArchMergeInfo {
+    Tcl_HashTable usualCode;      /* usual option handling code for the
+                                   * various widget classes */
+
+    ArchInfo *archInfo;           /* internal option info for mega-widget */
+    ArchComponent *archComp;      /* component being merged into mega-widget */
+    Tcl_HashTable *optionTable;   /* table of valid configuration options
+                                   * for component being merged */
+} ArchMergeInfo;
+
+/*
+ *  Used to capture component widget configuration options when a
+ *  new component is being merged into a mega-widget:
+ */
+typedef struct GenericConfigOpt {
+    char *switchName;             /* command-line switch for this option */
+    char *resName;                /* resource name in X11 database */
+    char *resClass;               /* resource class name in X11 database */
+    char *init;                   /* initial value for this option */
+    char *value;                  /* current value for this option */
+    char **storage;               /* storage for above strings */
+
+    ArchOption *integrated;       /* integrated into this mega-widget option */
+    ArchOptionPart *optPart;      /* integrated as this option part */
+} GenericConfigOpt;
+
+/*
+ *  Options that are propagated by a "configure" method:
+ */
+typedef struct ConfigCmdline {
+    Tcl_Obj *objv[4];           /* objects representing "configure" command */
+} ConfigCmdline;
+
+MODULE_SCOPE int Itk_ArchInitOptsCmd (ClientData cdata,
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE int Itk_ArchDeleteOptsCmd (ClientData cdata,
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE int Itk_ArchComponentCmd (ClientData cdata,
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE int Itk_ArchInitCmd (ClientData cdata,
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE int Itk_ArchOptionCmd (ClientData cdata,
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE int Itk_ArchCompAccessCmd (ClientData cdata,
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE int Itk_ArchConfigureCmd (ClientData cdata,
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE int Itk_ArchCgetCmd (ClientData cdata,
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+
+MODULE_SCOPE int Itk_ArchCompAddCmd (ClientData cdata,
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE int Itk_ArchCompDeleteCmd (ClientData cdata,
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE int Itk_ArchConfigOption (Tcl_Interp *interp,
+    ArchInfo *info, char *name, char *value);
+MODULE_SCOPE int Itk_ArchOptionAddCmd (ClientData cdata,
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE int Itk_ArchOptionRemoveCmd (ClientData cdata,
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE int Itk_PropagatePublicVar (Tcl_Interp *interp,
+    ItclObject *contextObj, ClientData cdata, const char *newval);
+MODULE_SCOPE int Itk_GetArchInfo (Tcl_Interp *interp,
+    ItclObject* contextObj, ArchInfo **infoPtr);
+MODULE_SCOPE void Itk_ArchOptConfigError (Tcl_Interp *interp,
+    ArchInfo *info, ArchOption *archOpt);
+MODULE_SCOPE void Itk_ArchOptAccessError (Tcl_Interp *interp,
+    ArchInfo *info, ArchOption *archOpt);
+MODULE_SCOPE ArchOptionPart* Itk_CreateOptionPart (
+    Tcl_Interp *interp, ClientData cdata, Itk_ConfigOptionPartProc* cproc,
+    Tcl_CmdDeleteProc *dproc, ClientData from);
+MODULE_SCOPE int Itk_AddOptionPart (Tcl_Interp *interp,
+    ArchInfo *info, char *switchName, char *resName, char *resClass,
+    const char *defVal, char *currVal, ArchOptionPart *optPart,
+    ArchOption **raOpt);
+MODULE_SCOPE ArchOptionPart* Itk_FindArchOptionPart (
+    ArchInfo *info, char *switchName, ClientData from);
+MODULE_SCOPE void Itk_DelOptionPart (ArchOptionPart *optPart);
+MODULE_SCOPE void Itk_DelArchInfo (ClientData cdata);
+MODULE_SCOPE Tcl_HashTable* ItkGetObjsWithArchInfo
+    (Tcl_Interp *interp);
+MODULE_SCOPE void ItkFreeObjsWithArchInfo (ClientData cdata,
+    Tcl_Interp *interp);
+MODULE_SCOPE void Itk_DelMergeInfo (void* cdata);
+MODULE_SCOPE int Itk_ArchOptKeepCmd (ClientData cdata,
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE int Itk_ArchOptIgnoreCmd (ClientData cdata,
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE int Itk_ArchOptRenameCmd (ClientData cdata,
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+MODULE_SCOPE int Itk_ArchOptUsualCmd (ClientData cdata,
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+
+
+#include "itkIntDecls.h"

generic/itkIntDecls.h

@@ -0,0 +1,144 @@
+
+/* !BEGIN!: Do not edit below this line. */
+
+#define ITKINT_STUBS_EPOCH 0
+#define ITKINT_STUBS_REVISION 17
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Exported function declarations:
+ */
+
+/* Slot 0 is reserved */
+/* Slot 1 is reserved */
+/* 2 */
+ITKAPI int		Itk_ConfigBodyCmd(ClientData cdata,
+				Tcl_Interp *interp, int objc,
+				Tcl_Obj *const objv[]);
+/* 3 */
+ITKAPI int		Itk_UsualCmd(ClientData cdata, Tcl_Interp *interp,
+				int objc, Tcl_Obj *const objv[]);
+/* 4 */
+ITKAPI int		Itk_ClassOptionDefineCmd(ClientData cdata,
+				Tcl_Interp *interp, int objc,
+				Tcl_Obj *const objv[]);
+/* 5 */
+ITKAPI int		Itk_ClassOptionIllegalCmd(ClientData cdata,
+				Tcl_Interp *interp, int objc,
+				Tcl_Obj *const objv[]);
+/* 6 */
+ITKAPI int		Itk_ConfigClassOption(Tcl_Interp *interp,
+				ItclObject *contextObj, ClientData cdata,
+				const char*newVal);
+/* 7 */
+ITKAPI ItkClassOptTable* Itk_CreateClassOptTable(Tcl_Interp *interp,
+				ItclClass *cdefn);
+/* 8 */
+ITKAPI ItkClassOptTable* Itk_FindClassOptTable(ItclClass *cdefn);
+/* Slot 9 is reserved */
+/* 10 */
+ITKAPI int		Itk_CreateClassOption(Tcl_Interp *interp,
+				ItclClass *cdefn, char *switchName,
+				char *resName, char *resClass, char *defVal,
+				char *config, ItkClassOption **optPtr);
+/* 11 */
+ITKAPI ItkClassOption*	Itk_FindClassOption(ItclClass *cdefn,
+				const char *switchName);
+/* 12 */
+ITKAPI void		Itk_DelClassOption(ItkClassOption *opt);
+/* Slot 13 is reserved */
+/* 14 */
+ITKAPI void		Itk_OptListInit(ItkOptList*olist,
+				Tcl_HashTable *options);
+/* 15 */
+ITKAPI void		Itk_OptListFree(ItkOptList*olist);
+/* 16 */
+ITKAPI void		Itk_OptListAdd(ItkOptList*olist,
+				Tcl_HashEntry *entry);
+/* 17 */
+ITKAPI void		Itk_OptListRemove(ItkOptList*olist,
+				Tcl_HashEntry *entry);
+
+typedef struct ItkIntStubs {
+    int magic;
+    int epoch;
+    int revision;
+    void *hooks;
+
+    void (*reserved0)(void);
+    void (*reserved1)(void);
+    int (*itk_ConfigBodyCmd) (ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); /* 2 */
+    int (*itk_UsualCmd) (ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); /* 3 */
+    int (*itk_ClassOptionDefineCmd) (ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); /* 4 */
+    int (*itk_ClassOptionIllegalCmd) (ClientData cdata, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); /* 5 */
+    int (*itk_ConfigClassOption) (Tcl_Interp *interp, ItclObject *contextObj, ClientData cdata, const char*newVal); /* 6 */
+    ItkClassOptTable* (*itk_CreateClassOptTable) (Tcl_Interp *interp, ItclClass *cdefn); /* 7 */
+    ItkClassOptTable* (*itk_FindClassOptTable) (ItclClass *cdefn); /* 8 */
+    void (*reserved9)(void);
+    int (*itk_CreateClassOption) (Tcl_Interp *interp, ItclClass *cdefn, char *switchName, char *resName, char *resClass, char *defVal, char *config, ItkClassOption **optPtr); /* 10 */
+    ItkClassOption* (*itk_FindClassOption) (ItclClass *cdefn, const char *switchName); /* 11 */
+    void (*itk_DelClassOption) (ItkClassOption *opt); /* 12 */
+    void (*reserved13)(void);
+    void (*itk_OptListInit) (ItkOptList*olist, Tcl_HashTable *options); /* 14 */
+    void (*itk_OptListFree) (ItkOptList*olist); /* 15 */
+    void (*itk_OptListAdd) (ItkOptList*olist, Tcl_HashEntry *entry); /* 16 */
+    void (*itk_OptListRemove) (ItkOptList*olist, Tcl_HashEntry *entry); /* 17 */
+} ItkIntStubs;
+
+extern const ItkIntStubs *itkIntStubsPtr;
+
+#ifdef __cplusplus
+}
+#endif
+
+#if defined(USE_ITK_STUBS)
+
+/*
+ * Inline function declarations:
+ */
+
+/* Slot 0 is reserved */
+/* Slot 1 is reserved */
+#define Itk_ConfigBodyCmd \
+	(itkIntStubsPtr->itk_ConfigBodyCmd) /* 2 */
+#define Itk_UsualCmd \
+	(itkIntStubsPtr->itk_UsualCmd) /* 3 */
+#define Itk_ClassOptionDefineCmd \
+	(itkIntStubsPtr->itk_ClassOptionDefineCmd) /* 4 */
+#define Itk_ClassOptionIllegalCmd \
+	(itkIntStubsPtr->itk_ClassOptionIllegalCmd) /* 5 */
+#define Itk_ConfigClassOption \
+	(itkIntStubsPtr->itk_ConfigClassOption) /* 6 */
+#define Itk_CreateClassOptTable \
+	(itkIntStubsPtr->itk_CreateClassOptTable) /* 7 */
+#define Itk_FindClassOptTable \
+	(itkIntStubsPtr->itk_FindClassOptTable) /* 8 */
+/* Slot 9 is reserved */
+#define Itk_CreateClassOption \
+	(itkIntStubsPtr->itk_CreateClassOption) /* 10 */
+#define Itk_FindClassOption \
+	(itkIntStubsPtr->itk_FindClassOption) /* 11 */
+#define Itk_DelClassOption \
+	(itkIntStubsPtr->itk_DelClassOption) /* 12 */
+/* Slot 13 is reserved */
+#define Itk_OptListInit \
+	(itkIntStubsPtr->itk_OptListInit) /* 14 */
+#define Itk_OptListFree \
+	(itkIntStubsPtr->itk_OptListFree) /* 15 */
+#define Itk_OptListAdd \
+	(itkIntStubsPtr->itk_OptListAdd) /* 16 */
+#define Itk_OptListRemove \
+	(itkIntStubsPtr->itk_OptListRemove) /* 17 */
+
+#endif /* defined(USE_ITK_STUBS) */
+
+/* !END!: Do not edit above this line. */
+
+struct ItkStubAPI {
+    ItkStubs *stubsPtr;
+    ItkIntStubs *intStubsPtr;
+};
+

generic/itkOption.c

@@ -21,17 +21,17 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
-#include "itk.h"
+#include "itkInt.h"
 
 /*
  *  FORWARD DECLARATIONS
  */
-static char* ItkTraceClassDestroy _ANSI_ARGS_((ClientData cdata,
-    Tcl_Interp *interp, CONST char *name1, CONST char *name2, int flags));
-static Tcl_HashTable* ItkGetClassesWithOptInfo _ANSI_ARGS_((
-    Tcl_Interp *interp));
-static void ItkFreeClassesWithOptInfo _ANSI_ARGS_((ClientData cdata,
-    Tcl_Interp *interp));
+static char* ItkTraceClassDestroy (ClientData cdata,
+    Tcl_Interp *interp, const char *name1, const char *name2, int flags);
+static Tcl_HashTable* ItkGetClassesWithOptInfo (
+    Tcl_Interp *interp);
+static void ItkFreeClassesWithOptInfo (ClientData cdata,
+    Tcl_Interp *interp);
 
 
 /*
@@ -55,63 +55,73 @@ static void ItkFreeClassesWithOptInfo _ANSI_ARGS_((ClientData cdata,
  */
 /* ARGSUSED */
 int
-Itk_ClassOptionDefineCmd(clientData, interp, objc, objv)
-    ClientData clientData;   /* class parser info */
-    Tcl_Interp *interp;      /* current interpreter */
-    int objc;                /* number of arguments */
-    Tcl_Obj *CONST objv[];   /* argument objects */
+Itk_ClassOptionDefineCmd(
+    ClientData clientData,   /* class parser info */
+    Tcl_Interp *interp,      /* current interpreter */
+    int objc,                /* number of arguments */
+    Tcl_Obj *const objv[])   /* argument objects */
 {
     ItclObjectInfo *info = (ItclObjectInfo*)clientData;
-    ItclClass *cdefn = (ItclClass*)Itcl_PeekStack(&info->cdefnStack);
+    ItclClass *iclsPtr = (ItclClass*)Itcl_PeekStack(&info->clsStack);
 
     int newEntry;
-    char *switchName, *resName, *resClass, *init, *config;
+    char *switchName;
+    char *resName;
+    char *resClass;
+    char *init;
+    char *config;
     ItkClassOptTable *optTable;
     Tcl_HashEntry *entry;
     ItkClassOption *opt;
 
+    ItclShowArgs(1, "Itk_ClassOptionDefineCmd", objc, objv);
     /*
      *  Make sure that the arguments look right.  The option switch
      *  name must start with a '-'.
      */
     if (objc < 5 || objc > 6) {
         Tcl_WrongNumArgs(interp, 1, objv,
-            "-switch resourceName resourceClass init ?config?");
+                "-switch resourceName resourceClass init ?config?");
         return TCL_ERROR;
     }
 
-    switchName = Tcl_GetStringFromObj(objv[1], (int*)NULL);
+    switchName = Tcl_GetString(objv[1]);
     if (*switchName != '-') {
-        Tcl_AppendResult(interp,
-            "bad option name \"", switchName, "\": should be -", switchName,
-            (char*)NULL);
+        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
+                "bad option name \"", switchName, "\": should be -",
+		switchName, (char*)NULL);
         return TCL_ERROR;
     }
     if (strstr(switchName, ".")) {
-        Tcl_AppendResult(interp,
-            "bad option name \"", switchName, "\": illegal character \".\"",
-            (char*)NULL);
+        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
+                "bad option name \"", switchName,
+		"\": illegal character \".\"", (char*)NULL);
         return TCL_ERROR;
     }
 
-    resName = Tcl_GetStringFromObj(objv[2], (int*)NULL);
+    resName = Tcl_GetString(objv[2]);
     if (!islower((int)*resName)) {
-        Tcl_AppendResult(interp,
-            "bad resource name \"", resName,
-            "\": should start with a lower case letter",
-            (char*)NULL);
+        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
+                "bad resource name \"", resName,
+                "\": should start with a lower case letter",
+                (char*)NULL);
         return TCL_ERROR;
     }
 
-    resClass = Tcl_GetStringFromObj(objv[3], (int*)NULL);
+    resClass = Tcl_GetString(objv[3]);
     if (!isupper((int)*resClass)) {
-        Tcl_AppendResult(interp,
-            "bad resource class \"", resClass,
-            "\": should start with an upper case letter",
-            (char*)NULL);
+        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
+               "bad resource class \"", resClass,
+               "\": should start with an upper case letter",
+               (char*)NULL);
         return TCL_ERROR;
     }
 
+    if (iclsPtr == NULL) {
+        Tcl_AppendResult(interp, "can only handle options on class level",
+	        NULL);
+	return TCL_ERROR;
+    }
     /*
      *  Make sure that this option has not already been defined in
      *  the context of this class.  Options can be redefined in
@@ -120,14 +130,14 @@ Itk_ClassOptionDefineCmd(clientData, interp, objc, objv)
      *  which option is being referenced if the configuration code
      *  is redefined by a subsequent "body" command.
      */
-    optTable = Itk_CreateClassOptTable(interp, cdefn);
+    optTable = Itk_CreateClassOptTable(interp, iclsPtr);
     entry = Tcl_CreateHashEntry(&optTable->options, switchName, &newEntry);
 
     if (!newEntry) {
-        Tcl_AppendResult(interp,
-            "option \"", switchName, "\" already defined in class \"",
-            cdefn->fullname, "\"",
-            (char*)NULL);
+        Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
+                "option \"", switchName, "\" already defined in class \"",
+                Tcl_GetString(iclsPtr->fullNamePtr), "\"",
+                (char*)NULL);
         return TCL_ERROR;
     }
 
@@ -135,16 +145,16 @@ Itk_ClassOptionDefineCmd(clientData, interp, objc, objv)
      *  Create a new option record and add it to the table for this
      *  class.
      */
-    init = Tcl_GetStringFromObj(objv[4], (int*)NULL);
+    init = Tcl_GetString(objv[4]);
 
     if (objc == 6) {
-        config = Tcl_GetStringFromObj(objv[5], (int*)NULL);
+        config = Tcl_GetString(objv[5]);
     } else {
         config = NULL;
     }
 
-    if (Itk_CreateClassOption(interp, cdefn, switchName, resName, resClass,
-        init, config, &opt) != TCL_OK) {
+    if (Itk_CreateClassOption(interp, iclsPtr, switchName, resName, resClass,
+            init, config, &opt) != TCL_OK) {
         return TCL_ERROR;
     }
 
@@ -166,18 +176,18 @@ Itk_ClassOptionDefineCmd(clientData, interp, objc, objv)
  */
 /* ARGSUSED */
 int
-Itk_ClassOptionIllegalCmd(clientData, interp, objc, objv)
-    ClientData clientData;   /* class parser info */
-    Tcl_Interp *interp;      /* current interpreter */
-    int objc;                /* number of arguments */
-    Tcl_Obj *CONST objv[];   /* argument objects */
+Itk_ClassOptionIllegalCmd(
+    ClientData clientData,   /* class parser info */
+    Tcl_Interp *interp,      /* current interpreter */
+    int objc,                /* number of arguments */
+    Tcl_Obj *const objv[])   /* argument objects */
 {
-    char *op = Tcl_GetStringFromObj(objv[0], (int*)NULL);
+    char *op = Tcl_GetString(objv[0]);
 
-    Tcl_AppendResult(interp,
-        "can only ", op, " options for a specific widget\n",
-        "(move this command into the constructor)",
-        (char*)NULL);
+    Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
+            "can only ", op, " options for a specific widget\n",
+            "(move this command into the constructor)",
+            (char*)NULL);
 
     return TCL_ERROR;
 }
@@ -198,24 +208,80 @@ Itk_ClassOptionIllegalCmd(clientData, interp, objc, objv)
  */
 /* ARGSUSED */
 int
-Itk_ConfigClassOption(interp, contextObj, cdata, newval)
-    Tcl_Interp *interp;        /* interpreter managing the class */
-    ItclObject *contextObj;    /* object being configured */
-    ClientData cdata;          /* class option */
-    CONST char *newval;        /* new value for this option */
+Itk_ConfigClassOption(
+    Tcl_Interp *interp,        /* interpreter managing the class */
+    ItclObject *contextObj,    /* object being configured */
+    ClientData cdata,          /* class option */
+    const char *newval)        /* new value for this option */
 {
     ItkClassOption *opt = (ItkClassOption*)cdata;
     int result = TCL_OK;
     ItclMemberCode *mcode;
+    Tcl_CallFrame frame;
 
     /*
      *  If the option has any config code, execute it now.
      *  Make sure that the namespace context is set up correctly.
      */
-    mcode = opt->member->code;
-    if (mcode && mcode->procPtr->bodyPtr) {
+    mcode = opt->codePtr;
+    if (mcode && mcode->bodyPtr) {
+
+	Itcl_PushCallFrame(interp, &frame, opt->iclsPtr->nsPtr, 1);
+	Itcl_SetContext(interp, contextObj);
+
+        result = Tcl_EvalObjEx(interp, mcode->bodyPtr, 0);
+
+	Itcl_UnsetContext(interp);
+	Itcl_PopCallFrame(interp);
+
+	/*
+	 * 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;
 }
@@ -240,15 +306,15 @@ Itk_ConfigClassOption(interp, contextObj, cdata, newval)
  * ------------------------------------------------------------------------
  */
 ItkClassOptTable*
-Itk_CreateClassOptTable(interp, cdefn)
-    Tcl_Interp *interp;        /* interpreter managing the class */
-    ItclClass *cdefn;          /* class definition */
+Itk_CreateClassOptTable(
+    Tcl_Interp *interp,        /* interpreter managing the class */
+    ItclClass *iclsPtr)        /* class definition */
 {
     int newEntry, result;
     Tcl_HashTable *itkClasses;
     Tcl_HashEntry *entry;
     ItkClassOptTable *optTable;
-    Itcl_CallFrame frame;
+    Tcl_CallFrame frame;
 
     /*
      *  Look for the specified class definition in the table.
@@ -261,7 +327,7 @@ Itk_CreateClassOptTable(interp, cdefn)
      */
     itkClasses = ItkGetClassesWithOptInfo(interp);
 
-    entry = Tcl_CreateHashEntry(itkClasses, (char*)cdefn, &newEntry);
+    entry = Tcl_CreateHashEntry(itkClasses, (char*)iclsPtr, &newEntry);
     if (newEntry) {
         optTable = (ItkClassOptTable*)ckalloc(sizeof(ItkClassOptTable));
         Tcl_InitHashTable(&optTable->options, TCL_STRING_KEYS);
@@ -269,17 +335,16 @@ Itk_CreateClassOptTable(interp, cdefn)
 
         Tcl_SetHashValue(entry, (ClientData)optTable);
 
-        result = Tcl_PushCallFrame(interp, (Tcl_CallFrame *) &frame,
-             cdefn->namesp, /* isProcCallFrame */ 0);
+        result = Itcl_PushCallFrame(interp, &frame,
+             iclsPtr->nsPtr, /* isProcCallFrame */ 0);
 
         if (result == TCL_OK) {
             Tcl_TraceVar(interp, "_itk_option_data",
-                (TCL_TRACE_UNSETS | TCL_NAMESPACE_ONLY),
-                (Tcl_VarTraceProc*) ItkTraceClassDestroy, (ClientData)cdefn);
-            Tcl_PopCallFrame(interp);
+                    (TCL_TRACE_UNSETS | TCL_NAMESPACE_ONLY),
+                    ItkTraceClassDestroy, (ClientData)iclsPtr);
+            Itcl_PopCallFrame(interp);
         }
-    }
-    else {
+    } else {
         optTable = (ItkClassOptTable*)Tcl_GetHashValue(entry);
     }
     return optTable;
@@ -301,8 +366,8 @@ Itk_CreateClassOptTable(interp, cdefn)
  * ------------------------------------------------------------------------
  */
 ItkClassOptTable*
-Itk_FindClassOptTable(cdefn)
-    ItclClass *cdefn;          /* class definition */
+Itk_FindClassOptTable(
+    ItclClass *iclsPtr)          /* class definition */
 {
     Tcl_HashTable *itkClasses;
     Tcl_HashEntry *entry;
@@ -310,8 +375,8 @@ Itk_FindClassOptTable(cdefn)
     /*
      *  Look for the specified class definition in the table.
      */
-    itkClasses = ItkGetClassesWithOptInfo(cdefn->interp);
-    entry = Tcl_FindHashEntry(itkClasses, (char*)cdefn);
+    itkClasses = ItkGetClassesWithOptInfo(iclsPtr->interp);
+    entry = Tcl_FindHashEntry(itkClasses, (char*)iclsPtr);
     if (entry) {
         return (ItkClassOptTable*)Tcl_GetHashValue(entry);
     }
@@ -335,14 +400,14 @@ Itk_FindClassOptTable(cdefn)
  */
 /* ARGSUSED */
 static char*
-ItkTraceClassDestroy(cdata, interp, name1, name2, flags)
-    ClientData cdata;          /* class definition data */
-    Tcl_Interp *interp;        /* interpreter managing the class */
-    CONST char *name1;               /* name of variable involved in trace */
-    CONST char *name2;         /* name of array element within variable */
-    int flags;                 /* flags describing trace */
+ItkTraceClassDestroy(
+    ClientData cdata,          /* class definition data */
+    Tcl_Interp *interp,        /* interpreter managing the class */
+    const char *name1,       /* name of variable involved in trace */
+    const char *name2,       /* name of array element within variable */
+    int flags)                 /* flags describing trace */
 {
-    ItclClass *cdefn = (ItclClass*)cdata;
+    ItclClass *iclsPtr = (ItclClass*)cdata;
 
     Tcl_HashTable *itkClasses;
     Tcl_HashEntry *entry;
@@ -355,8 +420,8 @@ ItkTraceClassDestroy(cdata, interp, name1, name2, flags)
      *  If it is found, delete all the option records and tear
      *  down the table.
      */
-    itkClasses = ItkGetClassesWithOptInfo(cdefn->interp);
-    entry = Tcl_FindHashEntry(itkClasses, (char*)cdefn);
+    itkClasses = ItkGetClassesWithOptInfo(interp);
+    entry = Tcl_FindHashEntry(itkClasses, (char*)iclsPtr);
     if (entry) {
         optTable = (ItkClassOptTable*)Tcl_GetHashValue(entry);
         Tcl_DeleteHashEntry(entry);
@@ -390,17 +455,15 @@ ItkTraceClassDestroy(cdata, interp, name1, name2, flags)
  * ------------------------------------------------------------------------
  */
 int
-Itk_CreateClassOption(interp, cdefn, switchName, resName, resClass,
-    defVal, config, optPtr)
-
-    Tcl_Interp *interp;            /* interpreter managing the class */
-    ItclClass *cdefn;              /* class containing this option */
-    char *switchName;              /* name of command-line switch */
-    char *resName;                 /* resource name in X11 database */
-    char *resClass;                /* resource class name in X11 database */
-    char *defVal;                  /* last-resort default value */
-    char *config;                  /* configuration code */
-    ItkClassOption **optPtr;       /* returns: option record */
+Itk_CreateClassOption(
+    Tcl_Interp *interp,            /* interpreter managing the class */
+    ItclClass *iclsPtr,            /* class containing this option */
+    char *switchName,              /* name of command-line switch */
+    char *resName,                 /* resource name in X11 database */
+    char *resClass,                /* resource class name in X11 database */
+    char *defVal,                  /* last-resort default value */
+    char *config,                  /* configuration code */
+    ItkClassOption **optPtr)       /* returns: option record */
 {
     ItkClassOption *opt;
     ItclMemberCode *mcode;
@@ -410,16 +473,16 @@ Itk_CreateClassOption(interp, cdefn, switchName, resName, resClass,
      *  an implementation for it.
      */
     if (config) {
-        if (Itcl_CreateMemberCode(interp, cdefn, (char*)NULL, config,
+        if (Itcl_CreateMemberCode(interp, iclsPtr, (char*)NULL, config,
             &mcode) != TCL_OK) {
 
             return TCL_ERROR;
         }
         Itcl_PreserveData((ClientData)mcode);
-        Itcl_EventuallyFree((ClientData)mcode,
-		(Tcl_FreeProc*) Itcl_DeleteMemberCode);
-    }
-    else {
+#ifdef NOTDEF
+        Itcl_EventuallyFree((ClientData)mcode, (Tcl_FreeProc *)Itcl_DeleteMemberCode);
+#endif
+    } else {
         mcode = NULL;
     }
 
@@ -427,8 +490,17 @@ Itk_CreateClassOption(interp, cdefn, switchName, resName, resClass,
      *  Create the record to represent this option.
      */
     opt = (ItkClassOption*)ckalloc(sizeof(ItkClassOption));
-    opt->member = Itcl_CreateMember(interp, cdefn, switchName);
-    opt->member->code = mcode;
+    memset(opt, 0, sizeof(ItkClassOption));
+    opt->iclsPtr      = iclsPtr;
+    opt->flags        = 0;
+    opt->protection   = Itcl_Protection(interp, 0);
+    opt->namePtr      = Tcl_NewStringObj(switchName, -1);
+    Tcl_IncrRefCount(opt->namePtr);
+    opt->fullNamePtr = Tcl_NewStringObj(Tcl_GetString(iclsPtr->fullNamePtr), -1);
+    Tcl_AppendToObj(opt->fullNamePtr, "::", 2);
+    Tcl_AppendToObj(opt->fullNamePtr, switchName, -1);
+    Tcl_IncrRefCount(opt->fullNamePtr);
+    opt->codePtr = mcode;
 
     opt->resName = (char*)ckalloc((unsigned)(strlen(resName)+1));
     strcpy(opt->resName, resName);
@@ -458,9 +530,9 @@ Itk_CreateClassOption(interp, cdefn, switchName, resName, resClass,
  * ------------------------------------------------------------------------
  */
 ItkClassOption*
-Itk_FindClassOption(cdefn, switchName)
-    ItclClass *cdefn;              /* class containing this option */
-    char *switchName;              /* name of command-line switch */
+Itk_FindClassOption(
+    ItclClass *iclsPtr,            /* class containing this option */
+    const char *switchName)        /* name of command-line switch */
 {
     ItkClassOption *opt = NULL;
 
@@ -482,7 +554,7 @@ Itk_FindClassOption(cdefn, switchName)
      *  Look for the option table for the specified class, and check
      *  for the requested switch.
      */
-    optTable = Itk_FindClassOptTable(cdefn);
+    optTable = Itk_FindClassOptTable(iclsPtr);
     if (optTable) {
         entry = Tcl_FindHashEntry(&optTable->options, switchName);
         if (entry) {
@@ -502,10 +574,12 @@ Itk_FindClassOption(cdefn, switchName)
  * ------------------------------------------------------------------------
  */
 void
-Itk_DelClassOption(opt)
-    ItkClassOption *opt;  /* pointer to option data */
+Itk_DelClassOption(
+    ItkClassOption *opt)  /* pointer to option data */
 {
+#ifdef NOTDEF
     Itcl_DeleteMember(opt->member);
+#endif
     ckfree(opt->resName);
     ckfree(opt->resClass);
     ckfree(opt->init);
@@ -524,8 +598,8 @@ Itk_DelClassOption(opt)
  * ------------------------------------------------------------------------
  */
 static Tcl_HashTable*
-ItkGetClassesWithOptInfo(interp)
-    Tcl_Interp *interp;  /* interpreter handling this registration */
+ItkGetClassesWithOptInfo(
+    Tcl_Interp *interp)  /* interpreter handling this registration */
 {
     Tcl_HashTable* classesTable;
 
@@ -553,13 +627,15 @@ ItkGetClassesWithOptInfo(interp)
  * ------------------------------------------------------------------------
  */
 static void
-ItkFreeClassesWithOptInfo(clientData, interp)
-    ClientData clientData;       /* associated data */
-    Tcl_Interp *interp;          /* interpreter being freed */
+ItkFreeClassesWithOptInfo(
+    ClientData clientData,       /* associated data */
+    Tcl_Interp *interp)          /* interpreter being freed */
 {
     Tcl_HashTable *tablePtr = (Tcl_HashTable*)clientData;
-    Tcl_HashSearch place, place2;
-    Tcl_HashEntry *entry, *entry2;
+    Tcl_HashSearch place;
+    Tcl_HashSearch place2;
+    Tcl_HashEntry *entry;
+    Tcl_HashEntry *entry2;
     ItkClassOptTable *optTable;
     ItkClassOption *opt;
 

generic/itkStubInit.c

@@ -1,4 +1,4 @@
-/* 
+/*
  * tkStubInit.c --
  *
  *	This file contains the initializers for the Itk stub vectors.
@@ -9,7 +9,7 @@
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
-#include "itk.h"
+#include "itkInt.h"
 
 /*
  * Remove macros that will interfere with the definitions below.
@@ -21,13 +21,17 @@
  * below should be made in the generic/itk.decls script.
  */
 
+MODULE_SCOPE const ItkStubs itkStubs;
+
 /* !BEGIN!: Do not edit below this line. */
 
-ItkStubs itkStubs = {
+static const ItkIntStubs itkIntStubs = {
     TCL_STUB_MAGIC,
-    NULL,
-    Itk_Init, /* 0 */
-    Itk_SafeInit, /* 1 */
+    ITKINT_STUBS_EPOCH,
+    ITKINT_STUBS_REVISION,
+    0,
+    0, /* 0 */
+    0, /* 1 */
     Itk_ConfigBodyCmd, /* 2 */
     Itk_UsualCmd, /* 3 */
     Itk_ClassOptionDefineCmd, /* 4 */
@@ -35,15 +39,40 @@ ItkStubs itkStubs = {
     Itk_ConfigClassOption, /* 6 */
     Itk_CreateClassOptTable, /* 7 */
     Itk_FindClassOptTable, /* 8 */
-    NULL, /* 9 */
+    0, /* 9 */
     Itk_CreateClassOption, /* 10 */
     Itk_FindClassOption, /* 11 */
     Itk_DelClassOption, /* 12 */
-    Itk_ArchetypeInit, /* 13 */
+    0, /* 13 */
     Itk_OptListInit, /* 14 */
     Itk_OptListFree, /* 15 */
     Itk_OptListAdd, /* 16 */
     Itk_OptListRemove, /* 17 */
 };
 
+static const ItkStubHooks itkStubHooks = {
+    &itkIntStubs
+};
+
+const ItkStubs itkStubs = {
+    TCL_STUB_MAGIC,
+    ITK_STUBS_EPOCH,
+    ITK_STUBS_REVISION,
+    &itkStubHooks,
+    Itk_Init, /* 0 */
+    Itk_SafeInit, /* 1 */
+    0, /* 2 */
+    0, /* 3 */
+    0, /* 4 */
+    0, /* 5 */
+    0, /* 6 */
+    0, /* 7 */
+    0, /* 8 */
+    0, /* 9 */
+    0, /* 10 */
+    0, /* 11 */
+    0, /* 12 */
+    Itk_ArchetypeInit, /* 13 */
+};
+
 /* !END!: Do not edit above this line. */

generic/itkStubLib.c

@@ -1,4 +1,4 @@
-/* 
+/*
  * itkStubLib.c --
  *
  *	Stub object that will be statically linked into extensions that wish
@@ -24,14 +24,13 @@
 #undef USE_TCL_STUB_PROCS
 
 #ifndef USE_ITK_STUBS
-#define USE_ITK_STUBS
+#define USE_ITK_STUBS 1
 #endif
 #undef USE_ITK_STUB_PROCS
+#undef BUILD_itk
 
 #include "itk.h"
 
-ItkStubs *itkStubsPtr;
-
 
 /*
  *----------------------------------------------------------------------
@@ -51,21 +50,20 @@ ItkStubs *itkStubsPtr;
  *----------------------------------------------------------------------
  */
 
-CONST char *
-Itk_InitStubs (interp, version, exact)
-    Tcl_Interp *interp;
-    CONST char *version;
-    int exact;
+const char *
+Itk_InitStubs (
+    Tcl_Interp *interp,
+    const char *version,
+    int exact)
 {
-    CONST char *actualVersion;
-    
-    actualVersion = Tcl_PkgRequireEx(interp, "Itk", (CONST84 char *)version, exact,
-        (ClientData *) &itkStubsPtr);
+    const char *actualVersion;
 
+    actualVersion = Tcl_PkgRequireEx(interp, "itk", (const char *)version,
+            exact, (ClientData *) &itkStubsPtr);
     if (actualVersion == NULL) {
 	itkStubsPtr = NULL;
 	return NULL;
     }
-    
+
     return actualVersion;
 }

generic/itkUtil.c

@@ -21,7 +21,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
-#include "itk.h"
+#include "itkInt.h"
 
 
 /*
@@ -33,9 +33,9 @@
  * ------------------------------------------------------------------------
  */
 void
-Itk_OptListInit(olist, options)
-    ItkOptList *olist;       /* list to be initialized */
-    Tcl_HashTable *options;  /* table containing the real option entries */
+Itk_OptListInit(
+    ItkOptList *olist,       /* list to be initialized */
+    Tcl_HashTable *options)  /* table containing the real option entries */
 {
     olist->options = options;
     olist->len = 0;
@@ -56,8 +56,8 @@ Itk_OptListInit(olist, options)
  * ------------------------------------------------------------------------
  */
 void
-Itk_OptListFree(olist)
-    ItkOptList *olist;     /* list to be freed */
+Itk_OptListFree(
+    ItkOptList *olist)     /* list to be freed */
 {
     ckfree((char*)olist->list);
     olist->len = olist->max = 0;
@@ -74,13 +74,19 @@ Itk_OptListFree(olist)
  * ------------------------------------------------------------------------
  */
 void
-Itk_OptListAdd(olist, entry)
-    ItkOptList *olist;     /* ordered list */
-    Tcl_HashEntry *entry;  /* entry to be added to the list */
+Itk_OptListAdd(
+    ItkOptList *olist,     /* ordered list */
+    Tcl_HashEntry *entry)  /* entry to be added to the list */
 {
-    int i, first, last, cmp, pos, size;
+    int i;
+    int first;
+    int last;
+    int cmp;
+    int pos;
+    int size;
     Tcl_HashEntry** newOrder;
-    char *swname, *optname;
+    char *swname;
+    char *optname;
 
     /*
      *  Make sure that the option list is big enough.  Resize
@@ -89,7 +95,7 @@ Itk_OptListAdd(olist, entry)
     if (olist->len >= olist->max) {
         size = olist->max*sizeof(Tcl_HashEntry*);
         newOrder = (Tcl_HashEntry**)ckalloc((unsigned)2*size);
-        memcpy((VOID*)newOrder, (VOID*)olist->list, (size_t)size);
+        memcpy((void*)newOrder, (void*)olist->list, (size_t)size);
         ckfree((char*)olist->list);
 
         olist->list = newOrder;
@@ -153,13 +159,17 @@ Itk_OptListAdd(olist, entry)
  * ------------------------------------------------------------------------
  */
 void
-Itk_OptListRemove(olist, entry)
-    ItkOptList *olist;     /* ordered list */
-    Tcl_HashEntry *entry;  /* entry to be removed from the list */
+Itk_OptListRemove(
+    ItkOptList *olist,     /* ordered list */
+    Tcl_HashEntry *entry)  /* entry to be removed from the list */
 {
     int pos = 0;
-    int i, first, last, cmp;
-    char *swname, *optname;
+    int i;
+    int first;
+    int last;
+    int cmp;
+    char *swname;
+    char *optname;
 
     first = 0;
     last  = olist->len-1;

itkConfig.sh.in

@@ -1,5 +1,5 @@
 # itkConfig.sh --
-# 
+#
 # This shell script (for sh) is generated automatically by Itk's
 # configure script.  It will create shell variables for most of
 # the configuration options discovered by the configure script.
@@ -15,26 +15,26 @@
 ITCL_VERSION='@ITCL_VERSION@'
 
 # The name of the Itk library (may be either a .a file or a shared library):
-ITK_LIB_FILE=@ITK_LIB_FILE@
+ITK_LIB_FILE=@itk_LIB_FILE@
 
 # String to pass to linker to pick up the Itk library from its
 # build directory.
-ITK_BUILD_LIB_SPEC='@ITK_BUILD_LIB_SPEC@'
+ITK_BUILD_LIB_SPEC='@itk_BUILD_LIB_SPEC@'
 
 # String to pass to linker to pick up the Itk library from its
 # installed directory.
-ITK_LIB_SPEC='@ITK_LIB_SPEC@'
+ITK_LIB_SPEC='@itk_LIB_SPEC@'
 
 # The name of the Itk stub library (a .a file):
-ITK_STUB_LIB_FILE=@ITK_STUB_LIB_FILE@
+ITK_STUB_LIB_FILE=@itk_STUB_LIB_FILE@
 
 # String to pass to linker to pick up the Itk stub library from its
 # build directory.
-ITK_BUILD_STUB_LIB_SPEC='@ITK_BUILD_STUB_LIB_SPEC@'
+ITK_BUILD_STUB_LIB_SPEC='@itk_BUILD_STUB_LIB_SPEC@'
 
 # String to pass to linker to pick up the Itk stub library from its
 # installed directory.
-ITK_STUB_LIB_SPEC='@ITK_STUB_LIB_SPEC@'
+ITK_STUB_LIB_SPEC='@itk_STUB_LIB_SPEC@'
 
 # Location of the top-level source directories from which [incr Tk]
 # was built.  This is the directory that contains a README file as well
@@ -42,4 +42,4 @@ ITK_STUB_LIB_SPEC='@ITK_STUB_LIB_SPEC@'
 # compiled in a different place than the directory containing the source
 # files, this points to the location of the sources, not the location
 # where [incr Tk] was compiled.
-ITK_SRC_DIR='@ITK_SRC_DIR@'
+ITK_SRC_DIR='@itk_SRC_DIR@'

library/Archetype.itk

@@ -54,32 +54,27 @@
 itcl::class itk::Archetype {
 
     constructor {args} {
-        _initOptionInfo
+        ::itcl::builtin::Archetype init
         eval itk_initialize $args
     }
 
     destructor {
-        _deleteOptionInfo
+        ::itcl::builtin::Archetype delete
     }
 
     method cget {option} @Archetype-cget
-    method configure {{option ""} args} \
-        @Archetype-configure
-    method config {{option ""} args} {
-        eval configure $option $args
-    }
 
-    method component {{name ""} args} \
-        @Archetype-component
+    method configure {{option ""} args} @Archetype-configure
 
-    protected method itk_component {option args} \
-        @Archetype-itk_component
+    method config {{option ""} args} @Archetype-configure
 
-    protected method itk_option {option args} \
-        @Archetype-itk_option
+    method component {{name ""} args} @Archetype-component
 
-    protected method itk_initialize {args} \
-        @Archetype-itk_initialize
+    protected method itk_component {option args} @Archetype-itk_component
+
+    protected method itk_option {option args} @Archetype-itk_option
+
+    protected method itk_initialize {args} @Archetype-itk_initialize
 
     protected variable itk_option
     protected variable itk_component

library/itk.tcl

@@ -14,14 +14,11 @@
 # 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.2.3
 #
 # Provide transparent access to all [incr Tk] commands
 #
-if {$tcl_platform(os) == "MacOS"} {
-    source -rsrc itk:tclIndex
-} else {
-    lappend auto_path ${itk::library}
-}
+lappend auto_path ${itk::library}
 
 # ----------------------------------------------------------------------
 #  USAGE:  itk::remove_destroy_hook <widget>

license.terms

@@ -27,7 +27,7 @@ MODIFICATIONS.
 
 GOVERNMENT USE: If you are acquiring this software on behalf of the
 U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal 
+in the software and related documentation as defined in the Federal
 Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
 are acquiring the software on behalf of the Department of Defense, the
 software shall be classified as "Commercial Computer Software" and the
@@ -35,4 +35,4 @@ Government shall have only "Restricted Rights" as defined in Clause
 252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
 authors grant the U.S. Government and others acting in its behalf
 permission to use and distribute the software in accordance with the
-terms specified in this license. 
+terms specified in this license.

pkgIndex.tcl.in

@@ -1,3 +1,15 @@
-# Tcl package index file, version 1.0
+# -*- tcl -*-
+# Tcl package index file, version 1.1
+#
 
-package ifneeded Itk @PACKAGE_VERSION@ [list load [file join $dir "@PKG_LIB_FILE@"] Itk]
+if {![package vsatisfies [package provide Tcl] 8.6-]} {return}
+if {[string length [package provide Itcl]] && ![package vsatisfies [package provide Itcl] 4.1]} return
+if {[package vsatisfies [package provide Tcl] 9.0-]} {
+    package ifneeded itk @PACKAGE_VERSION@ \
+	    [list load [file join $dir @PKG_LIB_FILE9@] Itk]
+} else {
+    package ifneeded itk @PACKAGE_VERSION@ \
+	    [list load [file join $dir @PKG_LIB_FILE8@] Itk]
+}
+
+package ifneeded Itk @PACKAGE_VERSION@ [list package require -exact itk @PACKAGE_VERSION@]

tests/all

@@ -1,19 +0,0 @@
-# This file contains a top-level script to run all of the Tcl
-# tests.  Execute it by invoking "source all" when running tclTest
-# in this directory.
-# ------------------------------------------------------------------
-# THIS SCRIPT IS NOW DEPRECATED!  It is kept for older Tcl
-# installations that don't have the "tcltest" package.
-# Instead, use the "all.tcl" script to run the test suite.
-# ------------------------------------------------------------------
-
-foreach i [lsort [glob *.test]] {
-    if [string match l.*.test $i] {
-	# This is an SCCS lock file;  ignore it.
-	continue
-    }
-    puts stdout $i
-    if [catch {source $i} msg] {
-	puts $msg
-    }	
-}

tests/all.tcl

@@ -7,9 +7,12 @@
 # Copyright (c) 1998-2000 by Ajuba Solutions
 # All rights reserved.
 
-package require tcltest 2.1
+package prefer latest
 
-tcltest::testsDirectory [file dir [info script]]
+package require Tcl 8.6-
+package require tcltest 2.2
+
+tcltest::configure {*}$argv -testdir [file dir [info script]]
 tcltest::runAllTests
 
 return

tests/defs

@@ -1,348 +0,0 @@
-# This file contains support code for the Tcl test suite.  It is
-# normally sourced by the individual files in the test suite before
-# they run their tests.  This improved approach to testing was designed
-# and initially implemented by Mary Ann May-Pumphrey of Sun Microsystems.
-#
-# Copyright (c) 1990-1994 The Regents of the University of California.
-# Copyright (c) 1994-1996 Sun Microsystems, Inc.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# ------------------------------------------------------------------
-# THIS SCRIPT IS NOW DEPRECATED!  It is kept for older Tcl
-# installations that don't have the "tcltest" package.
-# Instead, use "package require tcltest" in the test suite.
-# ------------------------------------------------------------------
-
-if ![info exists VERBOSE] {
-    set VERBOSE 0
-}
-if ![info exists TESTS] {
-    set TESTS {}
-}
-
-# If tests are being run as root, issue a warning message and set a
-# variable to prevent some tests from running at all.
-
-set user {}
-if {$tcl_platform(platform) == "unix"} {
-    catch {set user [exec whoami]}
-    if {$user == ""} {
-        catch {regexp {^[^(]*\(([^)]*)\)} [exec id] dummy user}
-    }
-    if {$user == ""} {set user root}
-    if {$user == "root"} {
-        puts stdout "Warning: you're executing as root.  I'll have to"
-        puts stdout "skip some of the tests, since they'll fail as root."
-    }
-}
-
-# Some of the tests don't work on some system configurations due to
-# differences in word length, file system configuration, etc.  In order
-# to prevent false alarms, these tests are generally only run in the
-# master development directory for Tcl.  The presence of a file
-# "doAllTests" in this directory is used to indicate that the non-portable
-# tests should be run.
-
-set doNonPortableTests [file exists doAllTests]
-
-# If there is no "memory" command (because memory debugging isn't
-# enabled), generate a dummy command that does nothing.
-
-if {[info commands memory] == ""} {
-    proc memory args {}
-}
-
-# Check configuration information that will determine which tests
-# to run.  To do this, create an array testConfig.  Each element
-# has a 0 or 1 value, and the following elements are defined:
-#	unixOnly -	1 means this is a UNIX platform, so it's OK
-#			to run tests that only work under UNIX.
-#	macOnly -	1 means this is a Mac platform, so it's OK
-#			to run tests that only work on Macs.
-#	pcOnly -	1 means this is a PC platform, so it's OK to
-#			run tests that only work on PCs.
-#	unixOrPc -	1 means this is a UNIX or PC platform.
-#	macOrPc -	1 means this is a Mac or PC platform.
-#	macOrUnix -	1 means this is a Mac or UNIX platform.
-#	nonPortable -	1 means this the tests are being running in
-#			the master Tcl/Tk development environment;
-#			Some tests are inherently non-portable because
-#			they depend on things like word length, file system
-#			configuration, window manager, etc.  These tests
-#			are only run in the main Tcl development directory
-#			where the configuration is well known.  The presence
-#			of the file "doAllTests" in this directory indicates
-#			that it is safe to run non-portable tests.
-#	tempNotPc -	The inverse of pcOnly.  This flag is used to
-#			temporarily disable a test.
-#	nonBlockFiles - 1 means this platform supports setting files into
-#			nonblocking mode.
-#	asyncPipeClose- 1 means this platform supports async flush and
-#			async close on a pipe.
-#	unixExecs     - 1 means this machine has commands such as 'cat',
-#			'echo' etc available.
-
-package require Itk
-
-catch {unset testConfig}
-if {$tcl_platform(platform) == "unix"} {
-    set testConfig(unixOnly) 1
-    set testConfig(tempNotPc) 1
-} else {
-    set testConfig(unixOnly) 0
-} 
-if {$tcl_platform(platform) == "macintosh"} {
-    set testConfig(tempNotPc) 1
-    set testConfig(macOnly) 1
-} else {
-    set testConfig(macOnly) 0
-} 
-if {$tcl_platform(platform) == "windows"} {
-    set testConfig(pcOnly) 1
-} else {
-    set testConfig(pcOnly) 0
-}
-set testConfig(unixOrPc) [expr $testConfig(unixOnly) || $testConfig(pcOnly)]
-set testConfig(macOrPc) [expr $testConfig(macOnly) || $testConfig(pcOnly)]
-set testConfig(macOrUnix) [expr $testConfig(macOnly) || $testConfig(unixOnly)]
-set testConfig(nonPortable) [file exists doAllTests]
-
-set f [open defs r]
-if {[expr [catch {fconfigure $f -blocking off}]] == 0} {
-    set testConfig(nonBlockFiles) 1
-} else {
-    set testConfig(nonBlockFiles) 0
-}
-close $f
-
-# Test for SCO Unix - cannot run async flushing tests because a potential
-# problem with select is apparently interfering. (Mark Diekhans).
-
-if {$tcl_platform(platform) == "unix"} {
-    if {[catch {exec uname -X | fgrep {Release = 3.2v}}] == 0} {
-	set testConfig(asyncPipeClose) 0
-    } else {
-	set testConfig(asyncPipeClose) 1
-    }
-} else {
-    set testConfig(asyncPipeClose) 1
-}
-
-# Test to see if execed commands such as cat, echo, rm and so forth are
-# present on this machine.
-
-set testConfig(unixExecs) 1
-if {$tcl_platform(platform) == "macintosh"} {
-    set testConfig(unixExecs) 0
-}
-if {($testConfig(unixExecs) == 1) && ($tcl_platform(platform) == "windows")} {
-    if {[catch {exec cat defs}] == 1} {
-	set testConfig(unixExecs) 0
-    }
-    if {($testConfig(unixExecs) == 1) && ([catch {exec echo hello}] == 1)} {
-	set testConfig(unixExecs) 0
-    }
-    if {($testConfig(unixExecs) == 1) && \
-		([catch {exec sh -c echo hello}] == 1)} {
-	set testConfig(unixExecs) 0
-    }
-    if {($testConfig(unixExecs) == 1) && ([catch {exec wc defs}] == 1)} {
-	set testConfig(unixExecs) 0
-    }
-    if {$testConfig(unixExecs) == 1} {
-	exec echo hello > removeMe
-        if {[catch {exec rm removeMe}] == 1} {
-	    set testConfig(unixExecs) 0
-	}
-    }
-    if {($testConfig(unixExecs) == 1) && ([catch {exec sleep 1}] == 1)} {
-	set testConfig(unixExecs) 0
-    }
-    if {($testConfig(unixExecs) == 1) && \
-		([catch {exec fgrep unixExecs defs}] == 1)} {
-	set testConfig(unixExecs) 0
-    }
-    if {($testConfig(unixExecs) == 1) && ([catch {exec ps}] == 1)} {
-	set testConfig(unixExecs) 0
-    }
-    if {($testConfig(unixExecs) == 1) && \
-		([catch {exec echo abc > removeMe}] == 0) && \
-		([catch {exec chmod 644 removeMe}] == 1) && \
-		([catch {exec rm removeMe}] == 0)} {
-	set testConfig(unixExecs) 0
-    } else {
-	catch {exec rm -f removeMe}
-    }
-    if {($testConfig(unixExecs) == 1) && \
-		([catch {exec mkdir removeMe}] == 1)} {
-	set testConfig(unixExecs) 0
-    } else {
-	catch {exec rm -r removeMe}
-    }
-    if {$testConfig(unixExecs) == 0} {
-	puts stdout "Warning: Unix-style executables are not available, so"
-	puts stdout "some tests will be skipped."
-    }
-}    
-
-proc print_verbose {name description script code answer} {
-    puts stdout "\n"
-    puts stdout "==== $name $description"
-    puts stdout "==== Contents of test case:"
-    puts stdout "$script"
-    if {$code != 0} {
-	if {$code == 1} {
-	    puts stdout "==== Test generated error:"
-	    puts stdout $answer
-	} elseif {$code == 2} {
-	    puts stdout "==== Test generated return exception;  result was:"
-	    puts stdout $answer
-	} elseif {$code == 3} {
-	    puts stdout "==== Test generated break exception"
-	} elseif {$code == 4} {
-	    puts stdout "==== Test generated continue exception"
-	} else {
-	    puts stdout "==== Test generated exception $code;  message was:"
-	    puts stdout $answer
-	}
-    } else {
-	puts stdout "==== Result was:"
-	puts stdout "$answer"
-    }
-}
-
-# test --
-# This procedure runs a test and prints an error message if the
-# test fails.  If VERBOSE has been set, it also prints a message
-# even if the test succeeds.  The test will be skipped if it
-# doesn't match the TESTS variable, or if one of the elements
-# of "constraints" turns out not to be true.
-#
-# Arguments:
-# name -		Name of test, in the form foo-1.2.
-# description -		Short textual description of the test, to
-#			help humans understand what it does.
-# constraints -		A list of one or more keywords, each of
-#			which must be the name of an element in
-#			the array "testConfig".  If any of these
-#			elements is zero, the test is skipped.
-#			This argument may be omitted.
-# script -		Script to run to carry out the test.  It must
-#			return a result that can be checked for
-#			correctness.
-# answer -		Expected result from script.
-
-proc test {name description script answer args} {
-    global VERBOSE TESTS testConfig
-    if {[string compare $TESTS ""] != 0} then {
-	set ok 0
-	foreach test $TESTS {
-	    if [string match $test $name] then {
-		set ok 1
-		break
-	    }
-        }
-	if !$ok then return
-    }
-    set i [llength $args]
-    if {$i == 0} {
-	# Empty body
-    } elseif {$i == 1} {
-	# "constraints" argument exists;  shuffle arguments down, then
-	# make sure that the constraints are satisfied.
-
-	set constraints $script
-	set script $answer
-	set answer [lindex $args 0]
-	foreach constraint $constraints {
-	    if {![info exists testConfig($constraint)]
-		    || !$testConfig($constraint)} {
-		return
-	    }
-	}
-    } else {
-	error "wrong # args: must be \"test name description ?constraints? script answer\""
-    }
-    memory tag $name
-    set code [catch {uplevel $script} result]
-    if {$code != 0} {
-	print_verbose $name $description $script \
-		$code $result
-    } elseif {[string compare $result $answer] == 0} then { 
-	if $VERBOSE then {
-	    if {$VERBOSE > 0} {
-		print_verbose $name $description $script \
-		    $code $result
-	    }
-	    puts stdout "++++ $name PASSED"
-	}
-    } else { 
-	print_verbose $name $description $script \
-		$code $result
-	puts stdout "---- Result should have been:"
-	puts stdout "$answer"
-	puts stdout "---- $name FAILED" 
-    }
-}
-
-proc dotests {file args} {
-    global TESTS
-    set savedTests $TESTS
-    set TESTS $args
-    source $file
-    set TESTS $savedTests
-}
-
-proc normalizeMsg {msg} {
-    regsub "\n$" [string tolower $msg] "" msg
-    regsub -all "\n\n" $msg "\n" msg
-    regsub -all "\n\}" $msg "\}" msg
-    return $msg
-}
-
-proc makeFile {contents name} {
-    set fd [open $name w]
-    fconfigure $fd -translation lf
-    if {[string index $contents [expr [string length $contents] - 1]] == "\n"} {
-	puts -nonewline $fd $contents
-    } else {
-	puts $fd $contents
-    }
-    close $fd
-}
-
-proc removeFile {name} {
-    file delete $name
-}
-
-proc makeDirectory {name} {
-    file mkdir $name
-}
-
-proc removeDirectory {name} {
-    file delete -force $name
-}
-
-proc viewFile {name} {
-    global tcl_platform testConfig
-    if {($tcl_platform(platform) == "macintosh") || \
-		($testConfig(unixExecs) == 0)} {
-	set f [open $name]
-	set data [read -nonewline $f]
-	close $f
-	return $data
-    } else {
-	exec cat $name
-    }
-}
-
-# Locate tcltest executable
-
-set tcltest [list [info nameofexecutable]]
-if {$tcltest == "{}"} {
-    set tcltest {}
-    puts "Unable to find tcltest executable, multiple process tests will fail."
-}
-
-

tests/widget.test

@@ -260,7 +260,7 @@ test widget-1.26 {when an internal component is deleted (but not destroyed) it i
          [bindtags $comp] \
          [bind itk-destroy-$comp <Destroy>] \
          [.testWidget configure]
-} {{itk-destroy-.testWidget.t2 .testWidget.t2 Button . all} {namespace inscope ::itk::Archetype {::.testWidget itk_component delete test2}} 0 {.testWidget.t2 Button . all} {} {{-background background Background linen linen} {-clientdata clientData ClientData {} {}} {-cursor cursor Cursor {} {}} {-status status Status {} {}}}}
+} {{itk-destroy-.testWidget.t2 .testWidget.t2 Button . all} {namespace inscope ::TestWidget {::.testWidget itk_component delete test2}} 0 {.testWidget.t2 Button . all} {} {{-background background Background linen linen} {-clientdata clientData ClientData {} {}} {-cursor cursor Cursor {} {}} {-status status Status {} {}}}}
 
 test widget-1.27 {when a mega-widget object is deleted, its window and any
         components are destroyed (even if in another window) } {

win/dllEntryPoint.c

@@ -1,4 +1,4 @@
-/* 
+/*
  * dllEntryPoint.c --
  *
  *	This file implements the Dll entry point as needed by Windows.

win/gitmanifest.in

@@ -0,0 +1 @@
+git-

win/itkUuid.h.in

@@ -0,0 +1 @@
+#define ITK_VERSION_UUID \

win/makefile.vc

@@ -1,24 +1,27 @@
 #------------------------------------------------------------------------------
-# Visual C++ 5.0+ makefile for [Incr Tk]
+# Visual C++ 6.0+ makefile for [Incr Tk]
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# 
+#
 # Copyright (c) 1993-1998 Lucent Technologies, Inc.
 #------------------------------------------------------------------------------
-#  Do not modify this file!
-#------------------------------------------------------------------------------
+# To build (after setting up Visual C++ command line environment),
+#   nmake -f makefile.vc TCLDIR=path_to_tcl_sources TKDIR=path_to_tk_sources
+# To install
+#   nmake -f makefile.vc TCLDIR=path_to_tcl_sources TKDIR=path_to_tk_sources INSTALLDIR=path_to_install_dir install
 
 !if !exist("makefile.vc")
 MSG = ^
 You must run this makefile only from the directory it is in.^
 Please `cd` to its location first.
-!error $(MSG) 
+!error $(MSG)
 !endif
 
 PROJECT	= itk
-!include "rules.vc"
-
+PROJECT_REQUIRES_TK = 1
+ITCLDIR		= ..\..\itcl
+!include "$(ITCLDIR)\win\rules.vc"
 
 !if $(TCLINSTALL)
 !message *** Warning: [Incr Tk] requires the source distribution of Tcl to build from,
@@ -26,35 +29,30 @@ PROJECT	= itk
 !message ***    to the sources.
 !endif
 
-ITCLDIR		= ..\..\itcl
-
-
-!if [nmakehlp -g $(ITCLDIR)\generic\itcl.h ITCL_VERSION] == 33
-ITCL_DOTVERSION	= 3.3
-!elseif [nmakehlp -g $(ITCLDIR)\generic\itcl.h ITCL_VERSION] == 34
-ITCL_DOTVERSION	= 3.4
-!elseif [nmakehlp -g $(ITCLDIR)\generic\itcl.h ITCL_VERSION] == 35
-ITCL_DOTVERSION	= 3.5
-!elseif [nmakehlp -g $(ITCLDIR)\generic\itcl.h ITCL_VERSION] == 0
-MSG =^
-Can't get version string from ..\generic\itcl.h
-!error $(MSG)
+!if [echo REM = This file is generated from makefile.vc > versions.vc]
 !endif
-ITCL_VERSION	= $(ITCL_DOTVERSION:.=)
-
-!if [nmakehlp -g ..\generic\itk.h ITK_VERSION] == 33
-ITK_DOTVERSION	= 3.3
-!elseif [nmakehlp -g ..\generic\itk.h ITK_VERSION] == 34
-ITK_DOTVERSION	= 3.4
-!elseif [nmakehlp -g ..\generic\itk.h ITK_VERSION] == 35
-ITK_DOTVERSION	= 3.5
-!elseif [nmakehlp -g ..\generic\itk.h ITK_VERSION] == 0
-MSG =^
-Can't get version string from ..\generic\itk.h
-!error $(MSG)
+!if [echo ITCL_MAJOR_VERSION = \>> versions.vc] \
+   && [nmakehlp -V $(ITCLDIR)\generic\itcl.h ITCL_MAJOR_VERSION >> versions.vc]
 !endif
-ITK_VERSION	= $(ITK_DOTVERSION:.=)
-
+!if [echo ITCL_MINOR_VERSION = \>> versions.vc] \
+   && [nmakehlp -V $(ITCLDIR)\generic\itcl.h ITCL_MINOR_VERSION >> versions.vc]
+!endif
+!if [echo ITCL_PATCH_LEVEL = \>> versions.vc] \
+   && [nmakehlp -V $(ITCLDIR)\generic\itcl.h ITCL_PATCH_LEVEL >> versions.vc]
+!endif
+!if [echo ITK_MAJOR_VERSION = \>> versions.vc] \
+   && [nmakehlp -V ..\generic\itk.h ITK_MAJOR_VERSION >> versions.vc]
+!endif
+!if [echo ITK_MINOR_VERSION = \>> versions.vc] \
+   && [nmakehlp -V ..\generic\itk.h ITK_MINOR_VERSION >> versions.vc]
+!endif
+!if [echo ITK_PATCH_LEVEL = \>> versions.vc] \
+   && [nmakehlp -V ..\generic\itk.h ITK_PATCH_LEVEL >> versions.vc]
+!endif
+!include "versions.vc"
+ITCL_VERSION   = $(ITCL_MAJOR_VERSION)$(ITCL_MINOR_VERSION)
+ITK_VERSION    = $(ITK_MAJOR_VERSION)$(ITK_MINOR_VERSION)
+DOTVERSION = $(ITK_PATCH_LEVEL)
 
 BINROOT		= .
 ROOT		= ..
@@ -68,69 +66,45 @@ ITKIMPLIB	= "$(OUT_DIR)\$(PROJECT)$(ITK_VERSION)$(SUFX).lib"
 ITKSTUBLIBNAME	= $(STUBPREFIX)$(ITK_VERSION).lib
 ITKSTUBLIB	= "$(OUT_DIR)\$(ITKSTUBLIBNAME)"
 
-!if $(TCL_DOES_STUBS)
 ITKLIBNAME	= $(PROJECT)$(ITK_VERSION)$(SUFX).$(EXT)
 ITCLIMPLIBNAME	= itcl$(ITCL_VERSION)$(SUFX).$(EXT)
-!else
-ITKLIBNAME	= $(PROJECT)$(ITK_VERSION)80$(SUFX).$(EXT)
-ITCLIMPLIBNAME	= itcl$(ITCL_VERSION)80$(SUFX).lib
-!endif
 ITKLIB		= "$(OUT_DIR)\$(ITKLIBNAME)"
 ITCLIMPLIB	= "$(ITCLDIR)\win\$(BUILDDIRTOP)\$(ITCLIMPLIBNAME)"
 
 
-!if $(TCLINSTALL)
-TKSTUBLIB	= "$(TCLDIR)\lib\tkstub$(TCL_VERSION).lib"
-TKIMPLIB	= "$(TCLDIR)\lib\tk$(TCL_VERSION)$(DBGX).lib"
-TKLIB		= "$(TCLDIR)\bin\tk$(TCL_VERSION)$(DBGX).dll"
-WISH		= "$(TCLDIR)\bin\wish$(TCL_VERSION)$(DBGX).exe"
-TCL_LIBRARY	= 
-TK_LIBRARY	= 
-!else
-TKSTUBLIB	= "$(TKDIR)\win\$(BUILDDIRTOP)\tkstub$(TCL_VERSION).lib"
-TKIMPLIB	= "$(TKDIR)\win\$(OUT_DIR)\tk$(TCL_VERSION)$(DBGX).lib"
-TKLIB		= "$(TKDIR)\win\$(OUT_DIR)\tk$(TCL_VERSION)$(DBGX).dll"
-WISH		= "$(TKDIR)\win\$(OUT_DIR)\wish$(TCL_VERSION)$(DBGX).exe"
-TCL_LIBRARY	= "$(TCLDIR)\library"
-TK_LIBRARY	= "$(TKDIR)\library"
-!endif
-ITCL_LIBRARY	= "$(ITCLDIR:\=/)/library"
-ITK_LIBRARY	= "$(ROOT)/library"
+TKSTUBLIB	= $(TKDIR)\win\$(BUILDDIRTOP)\tkstub$(TCL_VERSION).lib
+TKIMPLIB	= $(TKDIR)\win\$(BUILDDIRTOP)\tk$(TCL_VERSION)$(DBGX).lib
+WISH		= $(TKDIR)\win\$(BUILDDIRTOP)\wish$(TCL_VERSION)$(DBGX).exe
+TCL_LIBRARY	= $(TCLDIR)\library
+TK_LIBRARY	= $(TKDIR)\library
+ITCL_LIBRARY	= $(ITCLDIR:\=/)/library
+ITK_LIBRARY	= $(ROOT)/library
 
 ITCLSTUBLIBNAME	= itclstub$(ITCL_VERSION).lib
-ITCLSTUBLIB	= "$(ITCLDIR)\win\$(BUILDDIRTOP)\$(ITCLSTUBLIBNAME)"
+ITCLSTUBLIB	= $(ITCLDIR)\win\$(BUILDDIRTOP)\$(ITCLSTUBLIBNAME)
 
-### For Tcl 8.0
-!if !$(TCL_DOES_STUBS)
-TCLSTUBLIB	= $(TCLIMPLIB)
-TKSTUBLIB	= $(TKIMPLIB)
-ITCLSTUBLIB	= $(ITCLIMPLIB)
-!endif
-
-
-BIN_INSTALL_DIR		= $(_INSTALLDIR)\bin
-DOC_INSTALL_DIR		= $(_INSTALLDIR)\doc
-LIB_INSTALL_DIR		= $(_INSTALLDIR)\lib
-SCRIPT_INSTALL_DIR	= $(_INSTALLDIR)\lib\itk$(ITK_DOTVERSION)
-INCLUDE_INSTALL_DIR	= $(_INSTALLDIR)\include
+BIN_INSTALL_DIR		= $(_INSTALLDIR)\..\bin
+DOC_INSTALL_DIR		= $(_INSTALLDIR)\..\doc
+LIB_INSTALL_DIR		= $(_INSTALLDIR)
+SCRIPT_INSTALL_DIR	= $(_INSTALLDIR)\$(PROJECT)$(DOTVERSION)
+INCLUDE_INSTALL_DIR	= $(_INSTALLDIR)\..\include
 
 ITKOBJS = \
-	$(TMP_DIR)\itk_archetype.obj \
-	$(TMP_DIR)\itk_cmds.obj \
-	$(TMP_DIR)\itk_option.obj \
-	$(TMP_DIR)\itk_util.obj \
+	$(TMP_DIR)\itkArchBase.obj \
+	$(TMP_DIR)\itkArchetype.obj \
+	$(TMP_DIR)\itkBase.obj \
+	$(TMP_DIR)\itkCmd.obj \
+	$(TMP_DIR)\itkHelpers.obj \
+	$(TMP_DIR)\itkOption.obj \
+	$(TMP_DIR)\itkUtil.obj \
 !if !$(STATIC_BUILD)
 	$(TMP_DIR)\dllEntryPoint.obj \
 	$(TMP_DIR)\itk.res \
 !endif
-!if $(TCL_DOES_STUBS)
 	$(TMP_DIR)\itkStubInit.obj
-!endif
 
 ITKSTUBOBJS = \
-!if $(TCL_DOES_STUBS)
     $(TMP_DIR)\itkStubLib.obj
-!endif
 
 GENERICDIR	= $(ROOT)\generic
 DOCDIR		= $(ROOT)\doc
@@ -176,41 +150,57 @@ ITK_DLLBASE	= -base:@$(TCLDIR)\win\coffbase.txt,itk
 ITK_DLLBASE	=
 !endif
 
+baselibs   =
+# Avoid 'unresolved external symbol __security_cookie' errors.
+# c.f. http://support.microsoft.com/?id=894573
+!if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
+!if $(VCVERSION) > 1399 && $(VCVERSION) < 1500
+baselibs   = $(baselibs) bufferoverflowU.lib
+!endif
+!endif
+
 #---------------------------------------------------------------------
 # Compile flags
 #---------------------------------------------------------------------
 
-!if $(DEBUG)
-!if "$(MACHINE)" == "IA64"
-cdebug = -Od -Zi
+!if !$(DEBUG)
+!if $(OPTIMIZING)
+### This cranks the optimization level to maximize speed
+cdebug	= -O2 $(OPTIMIZATIONS)
 !else
-cdebug = -Z7 -Od -WX
+cdebug	=
 !endif
+!if $(SYMBOLS)
+cdebug	= $(cdebug) -Zi
+!endif
+!else if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
+### Warnings are too many, can't support warnings into errors.
+cdebug	= -Zi -Od $(DEBUGFLAGS)
 !else
-# This cranks the optimization level up to max.
-cdebug = -O2
+cdebug	= -Zi -WX $(DEBUGFLAGS)
 !endif
 
-# declarations common to all compiler options
-cflags = -nologo -c -W3 -YX -D_USE_32BIT_TIME_T -Fp$(TMP_DIR)^\
-
-!if $(PENT_0F_ERRATA)
-cflags = $(cflags) -QI0f
-!endif
-
-!if $(ITAN_B_ERRATA)
-cflags = $(cflags) -QIA64_Bx
-!endif
+### Declarations common to all compiler options
+cwarn = $(WARNINGS) -D _CRT_SECURE_NO_DEPRECATE -D _CRT_NONSTDC_NO_DEPRECATE
+cflags = -nologo -c $(COMPILERFLAGS) $(cwarn) -Fp$(TMP_DIR)^\
 
 !if $(MSVCRT)
-crt = -MD$(DBGX)
+!if $(DEBUG) && !$(UNCHECKED)
+crt = -MDd
 !else
-crt = -MT$(DBGX)
+crt = -MD
+!endif
+!else
+!if $(DEBUG) && !$(UNCHECKED)
+crt = -MTd
+!else
+crt = -MT
+!endif
 !endif
 
 !if $(TCLINSTALL)
 TCL_INCLUDES	= -I"$(TCLDIR)\include"
-TK_INCLUDES	= 
+TK_INCLUDES	=
 !else
 TCL_INCLUDES	= -I"$(TCLDIR)\generic" -I"$(TCLDIR)\win"
 TK_INCLUDES	= -I"$(TKDIR)\generic" -I"$(TKDIR)\xlib"
@@ -226,10 +216,8 @@ ITK_EXE_CFLAGS	= $(cdebug) $(cflags) $(crt) $(ITCL_INCLUDES) $(ITK_INCLUDES) \
 ### not a technical limitation.
 !if $(STATIC_BUILD)
 ITK_CFLAGS	= $(ITK_EXE_CFLAGS) -DSTATIC_BUILD $(OPTDEFINES)
-!elseif $(TCL_DOES_STUBS)
-ITK_CFLAGS	= $(ITK_EXE_CFLAGS) -DUSE_TCL_STUBS -DUSE_TK_STUBS -DUSE_ITCL_STUBS $(OPTDEFINES)
 !else
-ITK_CFLAGS	= $(ITK_EXE_CFLAGS) $(OPTDEFINES)
+ITK_CFLAGS	= $(ITK_EXE_CFLAGS) -DUSE_TCL_STUBS -DUSE_TK_STUBS -DUSE_ITCL_STUBS $(OPTDEFINES)
 !endif
 
 #---------------------------------------------------------------------
@@ -240,17 +228,46 @@ all :     setup $(ITKLIB) $(ITKSTUBLIB)
 release : setup $(ITKLIB) $(ITKSTUBLIB)
 install	: install-binaries install-docs
 
+(ROOT)\manifest.uuid:
+   copy $(WIN_DIR)\gitmanifest.in $(ROOT)\manifest.uuid
+   git rev-parse HEAD >>$(ROOT)\manifest.uuid
+
+$(TMP_DIR)\itkUuid.h:	$(ROOT)\manifest.uuid
+	copy $(WIN_DIR)\itclUuid.h.in+$(ROOT)\manifest.uuid $(TMP_DIR)\itkUuid.h
+
+(TMP_DIR)\itkBase.obj: $(TMP_DIR)\itkUuid.h
+
+pkgindex:   $(OUT_DIR)\pkgIndex.tcl
+$(OUT_DIR)\pkgIndex.tcl:
+	@$(COPY) << "$(OUT_DIR)\pkgIndex.tcl"
+# -*- tcl -*-
+# Tcl package index file, version 1.1
+#
+
+if {![package vsatisfies [package provide Tcl] 8.6-]} {return}
+
+if {[package vsatisfies [package provide Tcl] 9.0-]} {
+    package ifneeded itk $(DOTVERSION) \
+	    [list load [file join $$dir tcl9itk$(VERSION).dll] Itk]
+} else {
+    package ifneeded itcl $(DOTVERSION) \
+	    [list load [file join $$dir itk$(VERSION).dll] Itk]
+}
+package ifneeded Itk $(DOTVERSION) [list package require -exact itk $(DOTVERSION)]
+<<
+
+
 !if $(STATIC_BUILD)
 test :
 	@echo test target not supported for a static library.
 !else
 test : setup $(ITKLIB) $(ITKSTUBLIB)
+	set TCL_LIBRARY=$(TCL_LIBRARY)
+	set TK_LIBRARY=$(TK_LIBRARY)
+	set ITCL_LIBRARY=$(ITCL_LIBRARY)
+	set ITK_LIBRARY=$(ITK_LIBRARY)
 	$(TCLSH) ..\tests\all.tcl $(TESTFLAGS) -loadfile <<
-	set env(TK_LIBRARY) $(TK_LIBRARY:\=/)
-	set env(ITCL_LIBRARY) [file normalize $(ITCL_LIBRARY:\=/)]
-	set env(ITK_LIBRARY) [file normalize $(ITK_LIBRARY:\=/)]
 	load [file normalize $(ITCLLIB:\=/)] Itcl
-	load [file normalize $(TKLIB:\=/)] Tk
 	load [file normalize $(ITKLIB:\=/)] Itk
 <<
 !endif
@@ -263,16 +280,14 @@ $(ITKLIB): $(ITKOBJS)
 !if $(STATIC_BUILD)
 	$(lib32) -nologo -machine:$(MACHINE) -out:$@ @<<
 !else
-	$(link32) $(ITK_LFLAGS) $(ITK_DLLBASE) -out:$@ $(ITK_LLIBS) @<<
+	$(link32) $(ITK_LFLAGS) $(ITK_DLLBASE) -out:$@ $(ITK_LLIBS) $(baselibs) @<<
 !endif
 		$(ITKOBJS)
 <<
 
 
-!if $(TCL_DOES_STUBS)
 $(ITKSTUBLIB) : $(ITKSTUBOBJS)
 	$(lib32) -nologo -out:$@ $(ITKSTUBOBJS)
-!endif
 
 install-binaries:
 	if not exist "$(_INSTALLDIR)" mkdir "$(_INSTALLDIR)"
@@ -287,26 +302,6 @@ install-binaries:
 	copy $(ROOT)\generic\itk.h "$(INCLUDE_INSTALL_DIR)"
 	copy $(ROOT)\generic\itkDecls.h "$(INCLUDE_INSTALL_DIR)"
 	copy $(ROOT)\library\*.* "$(SCRIPT_INSTALL_DIR)"
-	echo if {[package vsatisfies 8.0 [package provide Tcl]]} {\
-		> "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl"
-	echo ^ ^ ^ ^ set add 80>> "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl"
-	echo } else {>> "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl"
-	echo ^ ^ ^ ^ set add {}>> "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl"
-	echo }>> "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl"
-	echo if {[info exists ::tcl_platform(debug)] ^&^&\
-		$$::tcl_platform(debug)	^&^& \>> "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl"
-	echo ^ ^ ^ ^ ^ ^ ^ ^ [file exists [file join $$dir\
-		$(PROJECT)$(ITK_VERSION)$${add}g.dll]]}\
-		{>> "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl"
-	echo ^ ^ ^ ^ package ifneeded Itk $(ITK_DOTVERSION) [list load\
-		[file join $$dir $(PROJECT)$(ITK_VERSION)$${add}g.dll]\
-		Itk]>> "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl"
-	echo } else {>> "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl"
-	echo ^ ^ ^ ^ package ifneeded Itk $(ITK_DOTVERSION) [list load\
-		[file join $$dir $(PROJECT)$(ITK_VERSION)$${add}.dll]\
-		Itk]>> "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl"
-	echo }>> "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl"
-	echo unset add>> "$(SCRIPT_INSTALL_DIR)\pkgIndex.tcl"
 
 
 #---------------------------------------------------------------------
@@ -323,35 +318,6 @@ genstubs:
     @echo ERROR: Can't rebuild stubs tables without the Tcl source distribution
 !endif
 
-#---------------------------------------------------------------------
-# Generate the source dependencies.
-#---------------------------------------------------------------------
-
-depend:
-!if !exist($(TCLSH))
-	@echo Build tclsh first!
-!else
-	$(TCLSH) $(TCLTOOLSDIR)\mkdepend.tcl -vc32 -out:"$(OUT_DIR)\depend.mk" \
-		-passthru:"-DBUILD_itcl $(ITCL_INCLUDES) $(TCL_INCLUDES) $(ITK_INCLUDES) $(TK_INCLUDES)" \
-		$(GENERICDIR),$$(GENERICDIR) $(WINDIR),$$(WINDIR) @<<
-$(ITKOBJS)
-<<
-!endif
-
-#---------------------------------------------------------------------
-# Dependency rules
-#---------------------------------------------------------------------
-
-!if exist("$(OUT_DIR)\depend.mk")
-!include "$(OUT_DIR)\depend.mk"
-!message *** Dependency rules in use.
-!else
-!message *** Dependency rules are not being used.
-!endif
-
-### add a spacer in the output
-!message
-
 #---------------------------------------------------------------------
 # Special case object file targets
 #---------------------------------------------------------------------
@@ -435,7 +401,7 @@ CreateButton(4, "FAQ", ExecFile("http://www.purl.org/NET/Tcl-FAQ/"))
 	copy "$(DOCTMP_DIR)\$(@B).cnt" "$(OUT_DIR)"
 
 $(MAN2TCL): $(TCLTOOLSDIR)\$$(@B).c
-	$(cc32) -nologo -G4 -ML -O2 -Fo$(@D)\ $(TCLTOOLSDIR)\$(@B).c -link -out:$@
+	$(cc32) -nologo -G4 -ML -O2 -Fo$(@D)\ $(TCLTOOLSDIR)\$(@B).c $(baselibs) -link -out:$@
 
 $(HELPRTF): $(MAN2TCL) $(MAN2HELP) $(MAN2HELP2) $(INDEX)
 	$(TCLSH) $(MAN2HELP) -bitmap $(BMP_NOPATH) $(PROJECT) $(ITK_VERSION) $(DOCDIR:\=/)

win/nmakehlp.c

@@ -1,28 +1,45 @@
-/* ----------------------------------------------------------------------------
+/*
+ * ----------------------------------------------------------------------------
  * nmakehlp.c --
  *
  *	This is used to fix limitations within nmake and the environment.
  *
  * Copyright (c) 2002 by David Gravereaux.
+ * Copyright (c) 2006 by Pat Thoyts
  *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  * ----------------------------------------------------------------------------
  */
+
+#define _CRT_SECURE_NO_DEPRECATE
 #include <windows.h>
+#ifdef _MSC_VER
 #pragma comment (lib, "user32.lib")
 #pragma comment (lib, "kernel32.lib")
+#endif
 #include <stdio.h>
 #include <math.h>
 
+/* ISO hack for dumb VC++ */
+#ifdef _MSC_VER
+#define   snprintf	_snprintf
+#endif
+
+
 /* protos */
-int CheckForCompilerFeature (const char *option);
-int CheckForLinkerFeature (const char *option);
-int IsIn (const char *string, const char *substring);
-int GrepForDefine (const char *file, const char *string);
-DWORD WINAPI ReadFromPipe (LPVOID args);
+
+static int CheckForCompilerFeature(const char *option);
+static int CheckForLinkerFeature(char **options, int count);
+static int IsIn(const char *string, const char *substring);
+static int SubstituteFile(const char *substs, const char *filename);
+static int QualifyPath(const char *path);
+static int LocateDependency(const char *keyfile);
+static const char *GetVersionFromFile(const char *filename, const char *match, int numdots);
+static DWORD WINAPI ReadFromPipe(LPVOID args);
 
 /* globals */
+
 #define CHUNK	25
 #define STATICBUFFERSIZE    1000
 typedef struct {
@@ -30,23 +47,33 @@ typedef struct {
     char buffer[STATICBUFFERSIZE];
 } pipeinfo;
 
-pipeinfo Out = {INVALID_HANDLE_VALUE, '\0'};
-pipeinfo Err = {INVALID_HANDLE_VALUE, '\0'};
+pipeinfo Out = {INVALID_HANDLE_VALUE, ""};
+pipeinfo Err = {INVALID_HANDLE_VALUE, ""};
+
+/*
+ * exitcodes: 0 == no, 1 == yes, 2 == error
+ */
 
-
-
-/* exitcodes: 0 == no, 1 == yes, 2 == error */
 int
-main (int argc, char *argv[])
+main(
+    int argc,
+    char *argv[])
 {
     char msg[300];
     DWORD dwWritten;
     int chars;
+    const char *s;
+
+    /*
+     * Make sure children (cl.exe and link.exe) are kept quiet.
+     */
 
-    /* make sure children (cl.exe and link.exe) are kept quiet. */
     SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
 
-    /* Make sure the compiler and linker aren't effected by the outside world. */
+    /*
+     * Make sure the compiler and linker aren't effected by the outside world.
+     */
+
     SetEnvironmentVariable("CL", "");
     SetEnvironmentVariable("LINK", "");
 
@@ -54,56 +81,111 @@ main (int argc, char *argv[])
 	switch (*(argv[1]+1)) {
 	case 'c':
 	    if (argc != 3) {
-		chars = wsprintf(msg, "usage: %s -c <compiler option>\n"
+		chars = snprintf(msg, sizeof(msg) - 1,
+		        "usage: %s -c <compiler option>\n"
 			"Tests for whether cl.exe supports an option\n"
 			"exitcodes: 0 == no, 1 == yes, 2 == error\n", argv[0]);
-		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars, &dwWritten, NULL);
+		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars,
+			&dwWritten, NULL);
 		return 2;
 	    }
 	    return CheckForCompilerFeature(argv[2]);
 	case 'l':
-	    if (argc != 3) {
-		chars = wsprintf(msg, "usage: %s -l <linker option>\n"
+	    if (argc < 3) {
+		chars = snprintf(msg, sizeof(msg) - 1,
+	       		"usage: %s -l <linker option> ?<mandatory option> ...?\n"
 			"Tests for whether link.exe supports an option\n"
 			"exitcodes: 0 == no, 1 == yes, 2 == error\n", argv[0]);
-		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars, &dwWritten, NULL);
+		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars,
+			&dwWritten, NULL);
 		return 2;
 	    }
-	    return CheckForLinkerFeature(argv[2]);
+	    return CheckForLinkerFeature(&argv[2], argc-2);
 	case 'f':
 	    if (argc == 2) {
-		chars = wsprintf(msg, "usage: %s -f <string> <substring>\n"
-		    "Find a substring within another\n"
-		    "exitcodes: 0 == no, 1 == yes, 2 == error\n", argv[0]);
-		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars, &dwWritten, NULL);
+		chars = snprintf(msg, sizeof(msg) - 1,
+			"usage: %s -f <string> <substring>\n"
+			"Find a substring within another\n"
+			"exitcodes: 0 == no, 1 == yes, 2 == error\n", argv[0]);
+		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars,
+			&dwWritten, NULL);
 		return 2;
 	    } else if (argc == 3) {
-		/* if the string is blank, there is no match */
+		/*
+		 * If the string is blank, there is no match.
+		 */
+
 		return 0;
 	    } else {
 		return IsIn(argv[2], argv[3]);
 	    }
-	case 'g':
+	case 's':
 	    if (argc == 2) {
-		chars = wsprintf(msg, "usage: %s -g <file> <string>\n"
-		    "grep for a #define\n"
-		    "exitcodes: integer of the found string (no decimals)\n", argv[0]);
-		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars, &dwWritten, NULL);
+		chars = snprintf(msg, sizeof(msg) - 1,
+			"usage: %s -s <substitutions file> <file>\n"
+			"Perform a set of string map type substutitions on a file\n"
+			"exitcodes: 0\n",
+			argv[0]);
+		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars,
+			&dwWritten, NULL);
 		return 2;
 	    }
-	    return GrepForDefine(argv[2], argv[3]);
+	    return SubstituteFile(argv[2], argv[3]);
+	case 'V':
+	    if (argc != 4) {
+		chars = snprintf(msg, sizeof(msg) - 1,
+		    "usage: %s -V filename matchstring\n"
+		    "Extract a version from a file:\n"
+		    "eg: pkgIndex.tcl \"package ifneeded http\"",
+		    argv[0]);
+		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars,
+		    &dwWritten, NULL);
+		return 0;
+	    }
+	    s = GetVersionFromFile(argv[2], argv[3], *(argv[1]+2) - '0');
+	    if (s && *s) {
+		printf("%s\n", s);
+		return 0;
+	    } else
+		return 1; /* Version not found. Return non-0 exit code */
+
+	case 'Q':
+	    if (argc != 3) {
+		chars = snprintf(msg, sizeof(msg) - 1,
+		    "usage: %s -Q path\n"
+		    "Emit the fully qualified path\n"
+		    "exitcodes: 0 == no, 1 == yes, 2 == error\n", argv[0]);
+		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars,
+		    &dwWritten, NULL);
+		return 2;
+	    }
+	    return QualifyPath(argv[2]);
+
+	case 'L':
+	    if (argc != 3) {
+		chars = snprintf(msg, sizeof(msg) - 1,
+		    "usage: %s -L keypath\n"
+		    "Emit the fully qualified path of directory containing keypath\n"
+		    "exitcodes: 0 == success, 1 == not found, 2 == error\n", argv[0]);
+		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars,
+		    &dwWritten, NULL);
+		return 2;
+	    }
+	    return LocateDependency(argv[2]);
 	}
     }
-    chars = wsprintf(msg, "usage: %s -c|-l|-f ...\n"
+    chars = snprintf(msg, sizeof(msg) - 1,
+	    "usage: %s -c|-f|-l|-Q|-s|-V ...\n"
 	    "This is a little helper app to equalize shell differences between WinNT and\n"
 	    "Win9x and get nmake.exe to accomplish its job.\n",
 	    argv[0]);
     WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars, &dwWritten, NULL);
     return 2;
 }
-
-int
-CheckForCompilerFeature (const char *option)
+
+static int
+CheckForCompilerFeature(
+    const char *option)
 {
     STARTUPINFO si;
     PROCESS_INFORMATION pi;
@@ -127,24 +209,44 @@ CheckForCompilerFeature (const char *option)
     sa.lpSecurityDescriptor = NULL;
     sa.bInheritHandle = FALSE;
 
-    /* create a non-inheritible pipe. */
+    /*
+     * Create a non-inheritible pipe.
+     */
+
     CreatePipe(&Out.pipe, &h, &sa, 0);
 
-    /* dupe the write side, make it inheritible, and close the original. */
-    DuplicateHandle(hProcess, h, hProcess, &si.hStdOutput, 
-	    0, TRUE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE);
+    /*
+     * Dupe the write side, make it inheritible, and close the original.
+     */
+
+    DuplicateHandle(hProcess, h, hProcess, &si.hStdOutput, 0, TRUE,
+	    DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE);
+
+    /*
+     * Same as above, but for the error side.
+     */
 
-    /* Same as above, but for the error side. */
     CreatePipe(&Err.pipe, &h, &sa, 0);
-    DuplicateHandle(hProcess, h, hProcess, &si.hStdError, 
-	    0, TRUE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE);
+    DuplicateHandle(hProcess, h, hProcess, &si.hStdError, 0, TRUE,
+	    DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE);
 
-    /* base command line */
-    strcpy(cmdline, "cl.exe -nologo -c -TC -Zs -X ");
-    /* append our option for testing */
-    strcat(cmdline, option);
-    /* filename to compile, which exists, but is nothing and empty. */
-    strcat(cmdline, " .\\nul");
+    /*
+     * Base command line.
+     */
+
+    lstrcpy(cmdline, "cl.exe -nologo -c -TC -Zs -X -Fp.\\_junk.pch ");
+
+    /*
+     * Append our option for testing
+     */
+
+    lstrcat(cmdline, option);
+
+    /*
+     * Filename to compile, which exists, but is nothing and empty.
+     */
+
+    lstrcat(cmdline, " .\\nul");
 
     ok = CreateProcess(
 	    NULL,	    /* Module name. */
@@ -160,41 +262,65 @@ CheckForCompilerFeature (const char *option)
 
     if (!ok) {
 	DWORD err = GetLastError();
-	int chars = wsprintf(msg, "Tried to launch: \"%s\", but got error [%u]: ", cmdline, err);
+	int chars = snprintf(msg, sizeof(msg) - 1,
+		"Tried to launch: \"%s\", but got error [%u]: ", cmdline, err);
 
-	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS |
-		FORMAT_MESSAGE_MAX_WIDTH_MASK, 0L, err, 0, (LPVOID) &msg[chars],
+	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS|
+		FORMAT_MESSAGE_MAX_WIDTH_MASK, 0L, err, 0, (LPSTR)&msg[chars],
 		(300-chars), 0);
-	WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, strlen(msg), &err, NULL);
+	WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, lstrlen(msg), &err,NULL);
 	return 2;
     }
 
-    /* close our references to the write handles that have now been inherited. */
+    /*
+     * Close our references to the write handles that have now been inherited.
+     */
+
     CloseHandle(si.hStdOutput);
     CloseHandle(si.hStdError);
 
     WaitForInputIdle(pi.hProcess, 5000);
     CloseHandle(pi.hThread);
 
-    /* start the pipe reader threads. */
+    /*
+     * Start the pipe reader threads.
+     */
+
     pipeThreads[0] = CreateThread(NULL, 0, ReadFromPipe, &Out, 0, &threadID);
     pipeThreads[1] = CreateThread(NULL, 0, ReadFromPipe, &Err, 0, &threadID);
 
-    /* block waiting for the process to end. */
+    /*
+     * Block waiting for the process to end.
+     */
+
     WaitForSingleObject(pi.hProcess, INFINITE);
     CloseHandle(pi.hProcess);
 
-    /* wait for our pipe to get done reading, should it be a little slow. */
+    /*
+     * Wait for our pipe to get done reading, should it be a little slow.
+     */
+
     WaitForMultipleObjects(2, pipeThreads, TRUE, 500);
     CloseHandle(pipeThreads[0]);
     CloseHandle(pipeThreads[1]);
 
-    /* look for the commandline warning code in both streams. */
-    return !(strstr(Out.buffer, "D4002") != NULL || strstr(Err.buffer, "D4002") != NULL);
-}
+    /*
+     * Look for the commandline warning code in both streams.
+     *  - in MSVC 6 & 7 we get D4002, in MSVC 8 we get D9002.
+     */
 
-int
-CheckForLinkerFeature (const char *option)
+    return !(strstr(Out.buffer, "D4002") != NULL
+             || strstr(Err.buffer, "D4002") != NULL
+             || strstr(Out.buffer, "D9002") != NULL
+             || strstr(Err.buffer, "D9002") != NULL
+             || strstr(Out.buffer, "D2021") != NULL
+             || strstr(Err.buffer, "D2021") != NULL);
+}
+
+static int
+CheckForLinkerFeature(
+    char **options,
+    int count)
 {
     STARTUPINFO si;
     PROCESS_INFORMATION pi;
@@ -203,7 +329,8 @@ CheckForLinkerFeature (const char *option)
     char msg[300];
     BOOL ok;
     HANDLE hProcess, h, pipeThreads[2];
-    char cmdline[100];
+    int i;
+    char cmdline[255];
 
     hProcess = GetCurrentProcess();
 
@@ -218,22 +345,42 @@ CheckForLinkerFeature (const char *option)
     sa.lpSecurityDescriptor = NULL;
     sa.bInheritHandle = TRUE;
 
-    /* create a non-inheritible pipe. */
+    /*
+     * Create a non-inheritible pipe.
+     */
+
     CreatePipe(&Out.pipe, &h, &sa, 0);
 
-    /* dupe the write side, make it inheritible, and close the original. */
-    DuplicateHandle(hProcess, h, hProcess, &si.hStdOutput, 
-	    0, TRUE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE);
+    /*
+     * Dupe the write side, make it inheritible, and close the original.
+     */
+
+    DuplicateHandle(hProcess, h, hProcess, &si.hStdOutput, 0, TRUE,
+	    DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE);
+
+    /*
+     * Same as above, but for the error side.
+     */
 
-    /* Same as above, but for the error side. */
     CreatePipe(&Err.pipe, &h, &sa, 0);
-    DuplicateHandle(hProcess, h, hProcess, &si.hStdError, 
-	    0, TRUE, DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE);
+    DuplicateHandle(hProcess, h, hProcess, &si.hStdError, 0, TRUE,
+	    DUPLICATE_SAME_ACCESS | DUPLICATE_CLOSE_SOURCE);
 
-    /* base command line */
-    strcpy(cmdline, "link.exe -nologo ");
-    /* append our option for testing */
-    strcat(cmdline, option);
+    /*
+     * Base command line.
+     */
+
+    lstrcpy(cmdline, "link.exe -nologo ");
+
+    /*
+     * Append our option for testing.
+     */
+
+    for (i = 0; i < count; i++) {
+	lstrcat(cmdline, " \"");
+	lstrcat(cmdline, options[i]);
+	lstrcat(cmdline, "\"");
+    }
 
     ok = CreateProcess(
 	    NULL,	    /* Module name. */
@@ -249,51 +396,73 @@ CheckForLinkerFeature (const char *option)
 
     if (!ok) {
 	DWORD err = GetLastError();
-	int chars = wsprintf(msg, "Tried to launch: \"%s\", but got error [%u]: ", cmdline, err);
+	int chars = snprintf(msg, sizeof(msg) - 1,
+		"Tried to launch: \"%s\", but got error [%u]: ", cmdline, err);
 
-	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS |
-		FORMAT_MESSAGE_MAX_WIDTH_MASK, 0L, err, 0, (LPVOID) &msg[chars],
+	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS|
+		FORMAT_MESSAGE_MAX_WIDTH_MASK, 0L, err, 0, (LPSTR)&msg[chars],
 		(300-chars), 0);
-	WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, strlen(msg), &err, NULL);
+	WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, lstrlen(msg), &err,NULL);
 	return 2;
     }
 
-    /* close our references to the write handles that have now been inherited. */
+    /*
+     * Close our references to the write handles that have now been inherited.
+     */
+
     CloseHandle(si.hStdOutput);
     CloseHandle(si.hStdError);
 
     WaitForInputIdle(pi.hProcess, 5000);
     CloseHandle(pi.hThread);
 
-    /* start the pipe reader threads. */
+    /*
+     * Start the pipe reader threads.
+     */
+
     pipeThreads[0] = CreateThread(NULL, 0, ReadFromPipe, &Out, 0, &threadID);
     pipeThreads[1] = CreateThread(NULL, 0, ReadFromPipe, &Err, 0, &threadID);
 
-    /* block waiting for the process to end. */
+    /*
+     * Block waiting for the process to end.
+     */
+
     WaitForSingleObject(pi.hProcess, INFINITE);
     CloseHandle(pi.hProcess);
 
-    /* wait for our pipe to get done reading, should it be a little slow. */
+    /*
+     * Wait for our pipe to get done reading, should it be a little slow.
+     */
+
     WaitForMultipleObjects(2, pipeThreads, TRUE, 500);
     CloseHandle(pipeThreads[0]);
     CloseHandle(pipeThreads[1]);
 
-    /* look for the commandline warning code in the stderr stream. */
-    return !(strstr(Out.buffer, "LNK1117") != NULL || strstr(Err.buffer, "LNK1117") != NULL);
-}
+    /*
+     * Look for the commandline warning code in the stderr stream.
+     */
 
-DWORD WINAPI
-ReadFromPipe (LPVOID args)
+    return !(strstr(Out.buffer, "LNK1117") != NULL ||
+	    strstr(Err.buffer, "LNK1117") != NULL ||
+	    strstr(Out.buffer, "LNK4044") != NULL ||
+	    strstr(Err.buffer, "LNK4044") != NULL ||
+	    strstr(Out.buffer, "LNK4224") != NULL ||
+	    strstr(Err.buffer, "LNK4224") != NULL);
+}
+
+static DWORD WINAPI
+ReadFromPipe(
+    LPVOID args)
 {
     pipeinfo *pi = (pipeinfo *) args;
     char *lastBuf = pi->buffer;
     DWORD dwRead;
     BOOL ok;
 
-again:
+  again:
     if (lastBuf - pi->buffer + CHUNK > STATICBUFFERSIZE) {
 	CloseHandle(pi->pipe);
-	return -1;
+	return (DWORD)-1;
     }
     ok = ReadFile(pi->pipe, lastBuf, CHUNK, &dwRead, 0L);
     if (!ok || dwRead == 0) {
@@ -305,52 +474,333 @@ again:
 
     return 0;  /* makes the compiler happy */
 }
-
-int
-IsIn (const char *string, const char *substring)
+
+static int
+IsIn(
+    const char *string,
+    const char *substring)
 {
     return (strstr(string, substring) != NULL);
 }
-
+
 /*
- *  Find a specified #define by name.
- *
- *  If the line is '#define TCL_VERSION "8.5"', it returns
- *  85 as the result.
+ * GetVersionFromFile --
+ * 	Looks for a match string in a file and then returns the version
+ * 	following the match where a version is anything acceptable to
+ * 	package provide or package ifneeded.
  */
 
-int
-GrepForDefine (const char *file, const char *string)
+static const char *
+GetVersionFromFile(
+    const char *filename,
+    const char *match,
+    int numdots)
 {
-    FILE *f;
-    char s1[51], s2[51], s3[51];
-    int r = 0;
-    double d1;
+    static char szBuffer[100];
+    char *szResult = NULL;
+    FILE *fp = fopen(filename, "rt");
 
-    f = fopen(file, "rt");
-    if (f == NULL) {
-	return 0;
-    }
+    if (fp != NULL) {
+	/*
+	 * Read data until we see our match string.
+	 */
 
-    do {
-	r = fscanf(f, "%50s", s1);
-	if (r == 1 && !strcmp(s1, "#define")) {
-	    /* get next two words */
-	    r = fscanf(f, "%50s %50s", s2, s3);
-	    if (r != 2) continue;
-	    /* is the first word what we're looking for? */
-	    if (!strcmp(s2, string)) {
-		fclose(f);
-		/* add 1 past first double quote char. "8.5" */
-		d1 = atof(s3 + 1);		  /*    8.5  */
-		while (floor(d1) != d1) {
-		    d1 *= 10.0;
+	while (fgets(szBuffer, sizeof(szBuffer), fp) != NULL) {
+	    LPSTR p, q;
+
+	    p = strstr(szBuffer, match);
+	    if (p != NULL) {
+		/*
+		 * Skip to first digit after the match.
+		 */
+
+		p += strlen(match);
+		while (*p && !isdigit((unsigned char)*p)) {
+		    ++p;
 		}
-		return ((int) d1);		  /*    85   */
+
+		/*
+		 * Find ending whitespace.
+		 */
+
+		q = p;
+		while (*q && (strchr("0123456789.ab", *q)) && (((!strchr(".ab", *q)
+			    && !strchr("ab", q[-1])) || --numdots))) {
+		    ++q;
+		}
+
+		*q = 0;
+		szResult = p;
+		break;
 	    }
 	}
-    } while (!feof(f));
+	fclose(fp);
+    }
+    return szResult;
+}
+
+/*
+ * List helpers for the SubstituteFile function
+ */
 
-    fclose(f);
+typedef struct list_item_t {
+    struct list_item_t *nextPtr;
+    char * key;
+    char * value;
+} list_item_t;
+
+/* insert a list item into the list (list may be null) */
+static list_item_t *
+list_insert(list_item_t **listPtrPtr, const char *key, const char *value)
+{
+    list_item_t *itemPtr = (list_item_t *)malloc(sizeof(list_item_t));
+    if (itemPtr) {
+	itemPtr->key = strdup(key);
+	itemPtr->value = strdup(value);
+	itemPtr->nextPtr = NULL;
+
+	while(*listPtrPtr) {
+	    listPtrPtr = &(*listPtrPtr)->nextPtr;
+	}
+	*listPtrPtr = itemPtr;
+    }
+    return itemPtr;
+}
+
+static void
+list_free(list_item_t **listPtrPtr)
+{
+    list_item_t *tmpPtr, *listPtr = *listPtrPtr;
+    while (listPtr) {
+	tmpPtr = listPtr;
+	listPtr = listPtr->nextPtr;
+	free(tmpPtr->key);
+	free(tmpPtr->value);
+	free(tmpPtr);
+    }
+}
+
+/*
+ * SubstituteFile --
+ *	As windows doesn't provide anything useful like sed and it's unreliable
+ *	to use the tclsh you are building against (consider x-platform builds -
+ *	eg compiling AMD64 target from IX86) we provide a simple substitution
+ *	option here to handle autoconf style substitutions.
+ *	The substitution file is whitespace and line delimited. The file should
+ *	consist of lines matching the regular expression:
+ *	  \s*\S+\s+\S*$
+ *
+ *	Usage is something like:
+ *	  nmakehlp -S << $** > $@
+ *        @PACKAGE_NAME@ $(PACKAGE_NAME)
+ *        @PACKAGE_VERSION@ $(PACKAGE_VERSION)
+ *        <<
+ */
+
+static int
+SubstituteFile(
+    const char *substitutions,
+    const char *filename)
+{
+    static char szBuffer[1024], szCopy[1024];
+    list_item_t *substPtr = NULL;
+    FILE *fp, *sp;
+
+    fp = fopen(filename, "rt");
+    if (fp != NULL) {
+
+	/*
+	 * Build a list of substutitions from the first filename
+	 */
+
+	sp = fopen(substitutions, "rt");
+	if (sp != NULL) {
+	    while (fgets(szBuffer, sizeof(szBuffer), sp) != NULL) {
+		unsigned char *ks, *ke, *vs, *ve;
+		ks = (unsigned char*)szBuffer;
+		while (ks && *ks && isspace(*ks)) ++ks;
+		ke = ks;
+		while (ke && *ke && !isspace(*ke)) ++ke;
+		vs = ke;
+		while (vs && *vs && isspace(*vs)) ++vs;
+		ve = vs;
+		while (ve && *ve && !(*ve == '\r' || *ve == '\n')) ++ve;
+		*ke = 0, *ve = 0;
+		list_insert(&substPtr, (char*)ks, (char*)vs);
+	    }
+	    fclose(sp);
+	}
+
+	/* debug: dump the list */
+#ifndef NDEBUG
+	{
+	    int n = 0;
+	    list_item_t *p = NULL;
+	    for (p = substPtr; p != NULL; p = p->nextPtr, ++n) {
+		fprintf(stderr, "% 3d '%s' => '%s'\n", n, p->key, p->value);
+	    }
+	}
+#endif
+
+	/*
+	 * Run the substitutions over each line of the input
+	 */
+
+	while (fgets(szBuffer, sizeof(szBuffer), fp) != NULL) {
+	    list_item_t *p = NULL;
+	    for (p = substPtr; p != NULL; p = p->nextPtr) {
+		char *m = strstr(szBuffer, p->key);
+		if (m) {
+		    char *cp, *op, *sp;
+		    cp = szCopy;
+		    op = szBuffer;
+		    while (op != m) *cp++ = *op++;
+		    sp = p->value;
+		    while (sp && *sp) *cp++ = *sp++;
+		    op += strlen(p->key);
+		    while (*op) *cp++ = *op++;
+		    *cp = 0;
+		    memcpy(szBuffer, szCopy, sizeof(szCopy));
+		}
+	    }
+	    printf("%s", szBuffer);
+	}
+
+	list_free(&substPtr);
+    }
+    fclose(fp);
     return 0;
 }
+
+BOOL FileExists(LPCTSTR szPath)
+{
+#ifndef INVALID_FILE_ATTRIBUTES
+    #define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
+#endif
+    DWORD pathAttr = GetFileAttributes(szPath);
+    return (pathAttr != INVALID_FILE_ATTRIBUTES &&
+	    !(pathAttr & FILE_ATTRIBUTE_DIRECTORY));
+}
+
+
+/*
+ * QualifyPath --
+ *
+ *	This composes the current working directory with a provided path
+ *	and returns the fully qualified and normalized path.
+ *	Mostly needed to setup paths for testing.
+ */
+
+static int
+QualifyPath(
+    const char *szPath)
+{
+    char szCwd[MAX_PATH + 1];
+
+    GetFullPathName(szPath, sizeof(szCwd)-1, szCwd, NULL);
+    printf("%s\n", szCwd);
+    return 0;
+}
+
+/*
+ * Implements LocateDependency for a single directory. See that command
+ * for an explanation.
+ * Returns 0 if found after printing the directory.
+ * Returns 1 if not found but no errors.
+ * Returns 2 on any kind of error
+ * Basically, these are used as exit codes for the process.
+ */
+static int LocateDependencyHelper(const char *dir, const char *keypath)
+{
+    HANDLE hSearch;
+    char path[MAX_PATH+1];
+    size_t dirlen;
+    int keylen, ret;
+    WIN32_FIND_DATA finfo;
+
+    if (dir == NULL || keypath == NULL)
+	return 2; /* Have no real error reporting mechanism into nmake */
+    dirlen = strlen(dir);
+    if ((dirlen + 3) > sizeof(path))
+	return 2;
+    strncpy(path, dir, dirlen);
+    strncpy(path+dirlen, "\\*", 3);	/* Including terminating \0 */
+    keylen = strlen(keypath);
+
+#if 0 /* This function is not available in Visual C++ 6 */
+    /*
+     * Use numerics 0 -> FindExInfoStandard,
+     * 1 -> FindExSearchLimitToDirectories,
+     * as these are not defined in Visual C++ 6
+     */
+    hSearch = FindFirstFileEx(path, 0, &finfo, 1, NULL, 0);
+#else
+    hSearch = FindFirstFile(path, &finfo);
+#endif
+    if (hSearch == INVALID_HANDLE_VALUE)
+	return 1; /* Not found */
+
+    /* Loop through all subdirs checking if the keypath is under there */
+    ret = 1; /* Assume not found */
+    do {
+	int sublen;
+	/*
+	 * We need to check it is a directory despite the
+	 * FindExSearchLimitToDirectories in the above call. See SDK docs
+	 */
+	if ((finfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
+	    continue;
+	sublen = strlen(finfo.cFileName);
+	if ((dirlen+1+sublen+1+keylen+1) > sizeof(path))
+	    continue;		/* Path does not fit, assume not matched */
+	strncpy(path+dirlen+1, finfo.cFileName, sublen);
+	path[dirlen+1+sublen] = '\\';
+	strncpy(path+dirlen+1+sublen+1, keypath, keylen+1);
+	if (FileExists(path)) {
+	    /* Found a match, print to stdout */
+	    path[dirlen+1+sublen] = '\0';
+	    QualifyPath(path);
+	    ret = 0;
+	    break;
+	}
+    } while (FindNextFile(hSearch, &finfo));
+    FindClose(hSearch);
+    return ret;
+}
+
+/*
+ * LocateDependency --
+ *
+ *	Locates a dependency for a package.
+ *        keypath - a relative path within the package directory
+ *          that is used to confirm it is the correct directory.
+ *	The search path for the package directory is currently only
+ *      the parent and grandparent of the current working directory.
+ *      If found, the command prints
+ *         name_DIRPATH=<full path of located directory>
+ *      and returns 0. If not found, does not print anything and returns 1.
+ */
+static int LocateDependency(const char *keypath)
+{
+    size_t i;
+    int ret;
+    static const char *paths[] = {"..", "..\\..", "..\\..\\.."};
+
+    for (i = 0; i < (sizeof(paths)/sizeof(paths[0])); ++i) {
+	ret = LocateDependencyHelper(paths[i], keypath);
+	if (ret == 0)
+	    return ret;
+    }
+    return ret;
+}
+
+
+/*
+ * Local variables:
+ *   mode: c
+ *   c-basic-offset: 4
+ *   fill-column: 78
+ *   indent-tabs-mode: t
+ *   tab-width: 8
+ * End:
+ */

win/rules.vc

@@ -1,490 +0,0 @@
-#------------------------------------------------------------------------------
-# rules.vc --
-#
-#	Microsoft Visual C++ makefile include for decoding the commandline
-#	macros.  This file does not need editing to build Tcl.
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-# 
-# Copyright (c) 2001-2003 David Gravereaux.
-#
-#------------------------------------------------------------------------------
-# RCS: @(#) $Id: rules.vc,v 1.5 2004/04/29 17:40:43 davygrvy Exp $
-#------------------------------------------------------------------------------
-
-!ifndef _RULES_VC
-_RULES_VC = 1
-
-cc32		= $(CC)   # built-in default.
-link32		= link
-lib32		= lib
-rc32		= $(RC)   # built-in default.
-
-!ifndef INSTALLDIR
-### Assume the normal default.
-_INSTALLDIR	= C:\Program Files\Tcl
-!else
-### Fix the path seperators.
-_INSTALLDIR	= $(INSTALLDIR:/=\)
-!endif
-
-#------------------------------------------------------------------------------
-# Determine the host and target architectures and compiler version.
-#------------------------------------------------------------------------------
-
-_HASH=^#
-_VC_MANIFEST_EMBED_EXE=
-_VC_MANIFEST_EMBED_DLL=
-VCVER=0
-!if ![echo VCVERSION=_MSC_VER > vercl.x] \
-    && ![echo $(_HASH)if defined(_M_IX86) >> vercl.x] \
-    && ![echo ARCH=IX86 >> vercl.x] \
-    && ![echo $(_HASH)elif defined(_M_AMD64) >> vercl.x] \
-    && ![echo ARCH=AMD64 >> vercl.x] \
-    && ![echo $(_HASH)endif >> vercl.x] \
-    && ![cl -nologo -TC -P vercl.x $(ERRNULL)]
-!include vercl.i
-!if ![echo VCVER= ^\> vercl.vc] \
-    && ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc]
-!include vercl.vc
-!endif
-!endif
-!if ![del $(ERRNUL) /q/f vercl.x vercl.i vercl.vc]
-!endif
-
-!if ![reg query HKLM\Hardware\Description\System\CentralProcessor\0 /v Identifier | findstr /i x86]
-NATIVE_ARCH=IX86
-!else
-NATIVE_ARCH=AMD64
-!endif
-
-# Since MSVC8 we must deal with manifest resources.
-!if $(VCVERSION) >= 1400
-_VC_MANIFEST_EMBED_EXE=if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;1
-_VC_MANIFEST_EMBED_DLL=if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;2
-!endif
-
-!ifndef MACHINE
-MACHINE		= IX86
-!endif
-
-!ifndef CFG_ENCODING
-CFG_ENCODING	= \"cp1252\"
-!endif
-
-#----------------------------------------------------------
-# Set the proper copy method to avoid overwrite questions
-# to the user when copying files and selecting the right
-# "delete all" method.
-#----------------------------------------------------------
-
-!if "$(OS)" == "Windows_NT"
-RMDIR	= rmdir /S /Q
-!if ![ver | find "4.0" > nul]
-CPY	= echo y | xcopy /i
-!else
-CPY	= xcopy /i /y
-!endif
-!else
-CPY	= xcopy /i
-RMDIR	= deltree /Y
-!endif
-
-
-!message ===============================================================================
-
-#----------------------------------------------------------
-# build the helper app we need to overcome nmake's limiting
-# environment.
-#----------------------------------------------------------
-
-!if !exist(nmakehlp.exe)
-!if [$(cc32) -nologo -ML nmakehlp.c -link -subsystem:console > nul]
-!endif
-!endif
-
-#----------------------------------------------------------
-# Test for compiler features
-#----------------------------------------------------------
-
-### test for optimizations
-!if [nmakehlp -c -Otip]
-!message *** Compiler has 'Optimizations'
-OPTIMIZING	= 1
-!else
-!message *** Compiler doesn't have 'Optimizations'
-OPTIMIZING	= 0
-!endif
-
-!if "$(MACHINE)" == "IX86"
-### test for pentium errata
-!if [nmakehlp -c -QI0f]
-!message *** Compiler has 'Pentium 0x0f fix'
-PENT_0F_ERRATA	= 1
-!else
-!message *** Compiler doesn't have 'Pentium 0x0f fix'
-PENT_0F_ERRATA	= 0
-!endif
-### test for -align:4096, when align:512 will do.
-!if [nmakehlp -l -opt:nowin98]
-!message *** Linker has 'Win98 alignment problem'
-ALIGN98_HACK	= 1
-!else
-!message *** Linker doesn't have 'Win98 alignment problem'
-ALIGN98_HACK	= 0
-!endif
-!else
-PENT_0F_ERRATA	= 0
-ALIGN98_HACK	= 0
-!endif
-
-!if "$(MACHINE)" == "IA64"
-### test for Itanium errata
-!if [nmakehlp -c -QIA64_Bx]
-!message *** Compiler has 'B-stepping errata workarounds'
-ITAN_B_ERRATA	= 1
-!else
-!message *** Compiler doesn't have 'B-stepping errata workarounds'
-ITAN_B_ERRATA	= 0
-!endif
-!else
-ITAN_B_ERRATA	= 0
-!endif
-
-#----------------------------------------------------------
-# Decode the options requested.
-#----------------------------------------------------------
-
-!if "$(OPTS)" == "" || [nmakehlp -f "$(OPTS)" "none"]
-STATIC_BUILD	= 0
-TCL_THREADS	= 0
-DEBUG		= 0
-PROFILE		= 0
-MSVCRT		= 0
-LOIMPACT	= 0
-TCL_USE_STATIC_PACKAGES	= 0
-USE_THREAD_ALLOC = 0
-UNCHECKED	= 0
-!else
-!if [nmakehlp -f $(OPTS) "static"]
-!message *** Doing static
-STATIC_BUILD	= 1
-!else
-STATIC_BUILD	= 0
-!endif
-!if [nmakehlp -f $(OPTS) "msvcrt"]
-!message *** Doing msvcrt
-MSVCRT		= 1
-!else
-MSVCRT		= 0
-!endif
-!if [nmakehlp -f $(OPTS) "staticpkg"]
-!message *** Doing staticpkg
-TCL_USE_STATIC_PACKAGES	= 1
-!else
-TCL_USE_STATIC_PACKAGES	= 0
-!endif
-!if [nmakehlp -f $(OPTS) "threads"]
-!message *** Doing threads
-TCL_THREADS	= 1
-!else
-TCL_THREADS	= 0
-!endif
-!if [nmakehlp -f $(OPTS) "symbols"]
-!message *** Doing symbols
-DEBUG		= 1
-!else
-DEBUG		= 0
-!endif
-!if [nmakehlp -f $(OPTS) "profile"]
-!message *** Doing profile
-PROFILE		= 1
-!else
-PROFILE		= 0
-!endif
-!if [nmakehlp -f $(OPTS) "loimpact"]
-!message *** Doing loimpact
-LOIMPACT	= 1
-!else
-LOIMPACT	= 0
-!endif
-!if [nmakehlp -f $(OPTS) "thrdalloc"]
-!message *** Doing thrdalloc
-USE_THREAD_ALLOC = 1
-!else
-USE_THREAD_ALLOC = 0
-!endif
-!if [nmakehlp -f $(OPTS) "unchecked"]
-!message *** Doing unchecked
-UNCHECKED = 1
-!else
-UNCHECKED = 0
-!endif
-!endif
-
-
-!if !$(STATIC_BUILD)
-# Make sure we don't build overly fat DLLs.
-MSVCRT		= 1
-# We shouldn't statically put the extensions inside the shell when dynamic.
-TCL_USE_STATIC_PACKAGES = 0
-!endif
-
-
-#----------------------------------------------------------
-# Figure-out how to name our intermediate and output directories.
-# We wouldn't want different builds to use the same .obj files
-# by accident.
-#----------------------------------------------------------
-
-#----------------------------------------
-# Naming convention:
-#   t = full thread support.
-#   s = static library (as opposed to an
-#	import library)
-#   g = linked to the debug enabled C
-#	run-time.
-#   x = special static build when it
-#	links to the dynamic C run-time.
-#----------------------------------------
-SUFX	    = tsgx
-
-!if $(DEBUG)
-BUILDDIRTOP = Debug
-!else
-BUILDDIRTOP = Release
-!endif
-
-!if "$(MACHINE)" != "IX86"
-BUILDDIRTOP =$(BUILDDIRTOP)_$(MACHINE)
-!endif
-!if $(VCVER) > 6
-BUILDDIRTOP =$(BUILDDIRTOP)_VC$(VCVER)
-!endif
-
-!if !$(DEBUG) || $(DEBUG) && $(UNCHECKED)
-SUFX	    = $(SUFX:g=)
-!endif
-
-TMP_DIRFULL = .\$(BUILDDIRTOP)\$(PROJECT)_ThreadedDynamicStaticX
-
-!if !$(STATIC_BUILD)
-TMP_DIRFULL = $(TMP_DIRFULL:Static=)
-SUFX	    = $(SUFX:s=)
-EXT	    = dll
-!if $(MSVCRT)
-TMP_DIRFULL = $(TMP_DIRFULL:X=)
-SUFX	    = $(SUFX:x=)
-!endif
-!else
-TMP_DIRFULL = $(TMP_DIRFULL:Dynamic=)
-EXT	    = lib
-!if !$(MSVCRT)
-TMP_DIRFULL = $(TMP_DIRFULL:X=)
-SUFX	    = $(SUFX:x=)
-!endif
-!endif
-
-!if !$(TCL_THREADS)
-TMP_DIRFULL = $(TMP_DIRFULL:Threaded=)
-SUFX	    = $(SUFX:t=)
-!endif
-
-!ifndef TMP_DIR
-TMP_DIR	    = $(TMP_DIRFULL)
-!ifndef OUT_DIR
-OUT_DIR	    = .\$(BUILDDIRTOP)
-!endif
-!else
-!ifndef OUT_DIR
-OUT_DIR	    = $(TMP_DIR)
-!endif
-!endif
-
-
-#----------------------------------------------------------
-# Decode the statistics requested.
-#----------------------------------------------------------
-
-!if "$(STATS)" == "" || [nmakehlp -f "$(STATS)" "none"]
-TCL_MEM_DEBUG	    = 0
-TCL_COMPILE_DEBUG   = 0
-!else
-!if [nmakehlp -f $(STATS) "memdbg"]
-!message *** Doing memdbg
-TCL_MEM_DEBUG	    = 1
-!else
-TCL_MEM_DEBUG	    = 0
-!endif
-!if [nmakehlp -f $(STATS) "compdbg"]
-!message *** Doing compdbg
-TCL_COMPILE_DEBUG   = 1
-!else
-TCL_COMPILE_DEBUG   = 0
-!endif
-!endif
-
-
-#----------------------------------------------------------
-# Decode the checks requested.
-#----------------------------------------------------------
-
-!if "$(CHECKS)" == "" || [nmakehlp -f "$(CHECKS)" "none"]
-TCL_NO_DEPRECATED	    = 0
-FULLWARNINGS		    = 0
-!else
-!if [nmakehlp -f $(CHECKS) "nodep"]
-!message *** Doing nodep check
-TCL_NO_DEPRECATED	    = 1
-!else
-TCL_NO_DEPRECATED	    = 0
-!endif
-!if [nmakehlp -f $(CHECKS) "fullwarn"]
-!message *** Doing full warnings check
-FULLWARNINGS		    = 1
-!else
-FULLWARNINGS		    = 0
-!endif
-!endif
-
-
-#----------------------------------------------------------
-# Set our defines now armed with our options.
-#----------------------------------------------------------
-
-OPTDEFINES	= -DTCL_CFGVAL_ENCODING=$(CFG_ENCODING)
-
-!if $(TCL_MEM_DEBUG)
-OPTDEFINES	= $(OPTDEFINES) -DTCL_MEM_DEBUG
-!endif
-!if $(TCL_COMPILE_DEBUG)
-OPTDEFINES	= $(OPTDEFINES) -DTCL_COMPILE_DEBUG -DTCL_COMPILE_STATS
-!endif
-!if $(TCL_THREADS)
-OPTDEFINES	= $(OPTDEFINES) -DTCL_THREADS=1
-!if $(USE_THREAD_ALLOC)
-OPTDEFINES	= $(OPTDEFINES) -DUSE_THREAD_ALLOC=1
-!endif
-!endif
-!if $(STATIC_BUILD)
-OPTDEFINES	= $(OPTDEFINES) -DSTATIC_BUILD
-!endif
-!if $(TCL_NO_DEPRECATED)
-OPTDEFINES	= $(OPTDEFINES) -DTCL_NO_DEPRECATED
-!endif
-
-!if $(DEBUG)
-OPTDEFINES	= $(OPTDEFINES) -DTCL_CFG_DEBUG
-!elseif $(OPTIMIZING)
-OPTDEFINES	= $(OPTDEFINES) -DTCL_CFG_OPTIMIZED
-!endif
-!if $(PROFILE)
-OPTDEFINES	= $(OPTDEFINES) -DTCL_CFG_PROFILED
-!endif
-!if "$(MACHINE)" == "IA64"
-OPTDEFINES	= $(OPTDEFINES) -DTCL_CFG_DO64BIT
-!endif
-
-
-#----------------------------------------------------------
-# Get common info used when building extensions.
-#----------------------------------------------------------
-
-!if "$(PROJECT)" != "tcl"
-
-!if !defined(TCLDIR)
-!if exist("$(_INSTALLDIR)\include\tcl.h")
-TCLH		= "$(_INSTALLDIR)\include\tcl.h"
-TCLINSTALL	= 1
-_TCLDIR		= $(_INSTALLDIR)
-!else
-MSG=^
-Don't know where tcl.h is.  Set the TCLDIR macro.
-!error $(MSG)
-!endif
-!else
-_TCLDIR	= $(TCLDIR:/=\)
-!if exist("$(_TCLDIR)\include\tcl.h")
-TCLH		= "$(_TCLDIR)\include\tcl.h"
-TCLINSTALL	= 1
-!elseif exist("$(_TCLDIR)\generic\tcl.h")
-TCLH		= "$(_TCLDIR)\generic\tcl.h"
-TCLINSTALL	= 0
-!else
-MSG =^
-Don't know where tcl.h is.  The TCLDIR macro doesn't appear correct.
-!error $(MSG)
-!endif
-!endif
-
-#----------------------------------------------------------
-# Get the version from the header file.  Try all possibles
-# even though some aren't fully valid.
-#----------------------------------------------------------
-
-!if [nmakehlp -g $(TCLH) TCL_VERSION] == 76
-TCL_DOTVERSION	= 7.6
-!elseif [nmakehlp -g $(TCLH) TCL_VERSION] == 80
-TCL_DOTVERSION	= 8.0
-!elseif [nmakehlp -g $(TCLH) TCL_VERSION] == 81
-TCL_DOTVERSION	= 8.1
-!elseif [nmakehlp -g $(TCLH) TCL_VERSION] == 82
-TCL_DOTVERSION	= 8.2
-!elseif [nmakehlp -g $(TCLH) TCL_VERSION] == 83
-TCL_DOTVERSION	= 8.3
-!elseif [nmakehlp -g $(TCLH) TCL_VERSION] == 84
-TCL_DOTVERSION	= 8.4
-!elseif [nmakehlp -g $(TCLH) TCL_VERSION] == 85
-TCL_DOTVERSION	= 8.5
-!elseif [nmakehlp -g $(TCLH) TCL_VERSION] == 86
-TCL_DOTVERSION	= 8.6
-!elseif [nmakehlp -g $(TCLH) TCL_VERSION] == 90
-TCL_DOTVERSION	= 9.0
-!elseif [nmakehlp -g $(TCLH) TCL_VERSION] == 0
-MSG =^
-Can't get version string from $(TCLH)
-!error $(MSG)
-!endif
-
-TCL_VERSION	= $(TCL_DOTVERSION:.=)
-
-!if $(TCL_VERSION) < 81
-TCL_DOES_STUBS	= 0
-!else
-TCL_DOES_STUBS	= 1
-!endif
-
-!if $(TCLINSTALL)
-TCLSH		= "$(_INSTALLDIR)\bin\tclsh$(TCL_VERSION)$(SUFX).exe"
-TCLSTUBLIB	= "$(_INSTALLDIR)\lib\tclstub$(TCL_VERSION).lib"
-TCLIMPLIB	= "$(_INSTALLDIR)\lib\tcl$(TCL_VERSION)$(SUFX).lib"
-TCL_LIBRARY	= $(_INSTALLDIR)\lib
-TCLREGLIB	= "$(_INSTALLDIR)\lib\tclreg11$(SUFX:t=).lib"
-TCLDDELIB	= "$(_INSTALLDIR)\lib\tcldde12$(SUFX:t=).lib"
-COFFBASE	= \must\have\tcl\sources\to\build\this\target
-TCLTOOLSDIR	= \must\have\tcl\sources\to\build\this\target
-!else
-TCLSH		= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)$(SUFX).exe"
-TCLSTUBLIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub$(TCL_VERSION).lib"
-TCLIMPLIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX).lib"
-TCL_LIBRARY	= $(_TCLDIR)\library
-TCLREGLIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclreg11$(SUFX:t=).lib"
-TCLDDELIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcldde12$(SUFX:t=).lib"
-COFFBASE	= "$(_TCLDIR)\win\coffbase.txt"
-TCLTOOLSDIR	= $(_TCLDIR)\tools
-!endif
-
-!endif
-
-
-#----------------------------------------------------------
-# Display stats being used.
-#----------------------------------------------------------
-
-!message *** Intermediate directory will be '$(TMP_DIR)'
-!message *** Output directory will be '$(OUT_DIR)'
-!message *** Suffix for binaries will be '$(SUFX)'
-!message *** Optional defines are '$(OPTDEFINES)'
-
-!endif

win/svnmanifest.in

@@ -0,0 +1 @@
+svn-r