Index: Makefile.in =================================================================== diff -u -redea1a9c44f4c685e45e59e7f8864ae11d84ff42 -r60d83a2fa5b5b46b6aa49e61ccc4ac4533cfeb88 --- Makefile.in (.../Makefile.in) (revision edea1a9c44f4c685e45e59e7f8864ae11d84ff42) +++ Makefile.in (.../Makefile.in) (revision 60d83a2fa5b5b46b6aa49e61ccc4ac4533cfeb88) @@ -19,8 +19,7 @@ # have been added in a customized configure script. #======================================================================== -#NX_VERSION = @PACKAGE_VERSION@ -NX_VERSION = @NX_VERSION@ +NX_VERSION = @PACKAGE_VERSION@ src_lib_dir = ${srcdir}/library src_doc_dir = ${srcdir}/doc @@ -137,12 +136,20 @@ DESTDIR = +PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION) +pkgdatadir = $(datadir)/$(PKG_DIR) +pkglibdir = $(libdir)/$(PKG_DIR) +pkgincludedir = $(includedir)/$(PKG_DIR) + top_builddir = . -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_OPTIONS = +INSTALL = $(SHELL) $(srcdir)/config/install-sh -c ${INSTALL_OPTIONS} +INSTALL_DATA_DIR = ${INSTALL} -d -m 755 +INSTALL_PROGRAM = ${INSTALL} -m 555 +INSTALL_DATA = ${INSTALL} -m 444 +INSTALL_SCRIPT = ${INSTALL_PROGRAM} +INSTALL_LIBRARY = ${INSTALL_DATA} PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ @@ -163,8 +170,6 @@ SHLIB_CFLAGS = @SHLIB_CFLAGS@ SHLIB_LD = @SHLIB_LD@ SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ -#CC_SEARCH_FLAGS = @CC_SEARCH_FLAGS@ -#LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@ STLIB_LD = @STLIB_LD@ TCL_DEFS = @TCL_DEFS@ TCL_BIN_DIR = @TCL_BIN_DIR@ @@ -175,12 +180,8 @@ # Not used, but retained for reference of what libs Tcl required TCL_LIBS = @TCL_LIBS@ -pkgdatadir = @pkgdatadir@ -pkglibdir = @pkglibdir@ -pkgincludedir = @pkgincludedir@ +xotcl_pkglibdir = $(pkglibdir)/xotcl -xotcl_pkglibdir = @pkglibdir@/xotcl - installed_shells = $(DESTDIR)$(bindir)/nxsh $(DESTDIR)$(bindir)/nxwish $(DESTDIR)$(bindir)/xotclsh $(DESTDIR)$(bindir)/xowish #======================================================================== @@ -217,7 +218,7 @@ LIBS = @PKG_LIBS@ @LIBS@ AR = @AR@ CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -DNSF_CFLAGS=\"$(CFLAGS_DEFAULT)\" #======================================================================== # Start of user-definable TARGETS section @@ -309,22 +310,22 @@ xowiki: pkgIndex.tcl $(XOWIKI_OUTPUT) $(target_doc_dir)/$(PACKAGE_NAME).xowiki : $(PACKAGE_NAME).nxd - $(TCLSH) $(src_app_dir_native)/utils/nxdoc $(NXDFLAGS) -doctitle $(basename $(notdir $@)) \ + $(TCLSH) $(src_app_dir_native)/utils/nxdoc $(NXDFLAGS) -doctitle $(PACKAGE_NAME) \ -docurl "http://next-scripting.org/" -docversion $(PACKAGE_VERSION) \ - -outdir $(@D) -format xowiki -layout many-to-1 -indexfiles "generic/nxdocIndex" \ - -- "package:$(basename $(notdir $@))" + -outdir $(target_doc_dir) -format xowiki -layout many-to-1 -indexfiles "generic/nxdocIndex" \ + -- "package:$(PACKAGE_NAME)" $(target_doc_dir)/nx.xowiki : library/nx/nx.nxd $(PACKAGE_NAME).nxd - $(TCLSH) $(src_app_dir_native)/utils/nxdoc $(NXDFLAGS) -doctitle $(basename $(notdir $@)) \ + $(TCLSH) $(src_app_dir_native)/utils/nxdoc $(NXDFLAGS) -doctitle nx \ -docurl "http://next-scripting.org/" -docversion $(PACKAGE_VERSION) \ - -outdir $(@D) -format xowiki -layout many-to-1 -indexfiles "library/nx/nxdocIndex" \ - -- "package:$(basename $(notdir $@))" + -outdir $(target_doc_dir) -format xowiki -layout many-to-1 -indexfiles "library/nx/nxdocIndex" \ + -- "package:nx" $(xotcl_target_doc_dir)/XOTcl-langRef.xowiki : library/xotcl/doc/langRef.xotcl - $(TCLSH) $(src_app_dir_native)/utils/nxdoc -doctitle $(basename $(notdir $@)) \ + $(TCLSH) $(src_app_dir_native)/utils/nxdoc -doctitle XOTcl-langRef \ -docurl "http://next-scripting.org/" -docversion $(PACKAGE_VERSION) \ - -outdir $(@D) -format xowiki -layout many-to-1 "@package:$(basename $(notdir $@))" + -outdir $(target_doc_dir) -format xowiki -layout many-to-1 "@package:XOTcl-langRef" xowiki-dev: NXDFLAGS := -validation xowiki-dev: xowiki @@ -613,6 +614,7 @@ aolstub.$(OBJEXT): $(src_generic_dir)/aolstub.c $(PKG_HEADERS) nsf.$(OBJEXT): $(src_generic_dir)/nsf.c $(src_generic_dir)/predefined.h $(src_generic_dir)/nsfAccessInt.h $(src_generic_dir)/nsfAPI.h $(PKG_HEADERS) $(src_generic_dir)/nsfStack.c $(DTRACE_HDR) +nsfDebug.$(OBJEXT): $(src_generic_dir)/nsfDebug.c $(PKG_HEADERS) nsfError.$(OBJEXT): $(src_generic_dir)/nsfError.c $(PKG_HEADERS) nsfMetaData.$(OBJEXT): $(src_generic_dir)/nsfMetaData.c $(PKG_HEADERS) nsfObj.$(OBJEXT): $(src_generic_dir)/nsfObj.c $(PKG_HEADERS) @@ -622,7 +624,6 @@ nsfShadow.$(OBJEXT): $(src_generic_dir)/nsfShadow.c $(PKG_HEADERS) nsfStubInit.$(OBJEXT): $(PKG_HEADERS) nsfStubLib.$(OBJEXT): $(src_generic_dir)/nsfStubLib.c $(PKG_HEADERS) -nsfTrace.$(OBJEXT): $(src_generic_dir)/nsfTrace.c $(PKG_HEADERS) nsfUtil.$(OBJEXT): $(src_generic_dir)/nsfUtil.c $(PKG_HEADERS) # @@ -674,8 +675,7 @@ -rm -rf $(xotcl_target_doc_dir)/*-xotcl.html $(dir $(YUIDOC_OUTPUT)) $(XOWIKI_OUTPUT) clean: cleandoc - -rm -rf $(BINARIES) $(CLEANFILES) $(installed_shells) pkgIndex.tcl ./receiver - + -rm -rf $(BINARIES) $(CLEANFILES) ./receiver find ${srcdir} -type f -name \*~ -exec rm \{} \; @if test ! "x$(subdirs)" = "x" ; then dirs="$(subdirs)" ; \ for dir in $$dirs ; do \ Index: TODO =================================================================== diff -u -r7c0fa49f01d0a37ccb4e36778e72ac1c1e3f6b30 -r60d83a2fa5b5b46b6aa49e61ccc4ac4533cfeb88 --- TODO (.../TODO) (revision 7c0fa49f01d0a37ccb4e36778e72ac1c1e3f6b30) +++ TODO (.../TODO) (revision 60d83a2fa5b5b46b6aa49e61ccc4ac4533cfeb88) @@ -3510,7 +3510,16 @@ Optional Packages: --with-dtrace build nsf with dtrace (default: without) +- nsf.c: + * report configuration options via "parray nsf::config" +build-environment: + * make configure.in Makefile.in more in line with the TEA sample app + (removing leftovers from prior versions of TEA) + * remove GNU-Makefile-isms from Makefile.in + + + TODO: - private: * document private in tutorial Index: configure =================================================================== diff -u -r7c0fa49f01d0a37ccb4e36778e72ac1c1e3f6b30 -r60d83a2fa5b5b46b6aa49e61ccc4ac4533cfeb88 --- configure (.../configure) (revision 7c0fa49f01d0a37ccb4e36778e72ac1c1e3f6b30) +++ configure (.../configure) (revision 60d83a2fa5b5b46b6aa49e61ccc4ac4533cfeb88) @@ -618,10 +618,6 @@ NSF_BUILD_LIB_SPEC UNSHARED_LIB_SUFFIX SHARED_LIB_SUFFIX -pkgincludedir -pkglibdir -pkgdatadir -PKG_DIR NSF_COMPATIBLE_TCLSH TCLSH_PROG RANLIB_STUB @@ -5542,7 +5538,7 @@ if test "$enable_development" = yes; then -$as_echo "#define NSF_DEVLOPMENT 1" >>confdefs.h +$as_echo "#define NSF_DEVELOPMENT 1" >>confdefs.h fi @@ -5580,9 +5576,9 @@ #----------------------------------------------------------------------- - vars="nsf.c nsfError.c nsfObjectData.c nsfProfile.c \ - nsfTrace.c nsfUtil.c nsfObj.c nsfPointer.c nsfShadow.c nsfCompile.c aolstub.c nsfStubInit.c" + nsfDebug.c nsfUtil.c nsfObj.c nsfPointer.c \ + nsfShadow.c nsfCompile.c aolstub.c nsfStubInit.c" for i in $vars; do case $i in \$*) @@ -5686,16 +5682,40 @@ - #-------------------------------------------------------------------- +# __CHANGE__ +# +# 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. +#-------------------------------------------------------------------- +if test "${TEA_PLATFORM}" = "windows" ; then + if test "$GCC" != "yes" ; then + $as_echo "#define VISUAL_CC 1" >>confdefs.h + + fi + CLEANFILES="*.lib *.dll *.exp *.ilk *.pdb vc50.pch vc60.pch " + #TEA_ADD_SOURCES([win/winFile.c]) + #TEA_ADD_INCLUDES([-I\"$(${CYGPATH} ${srcdir}/win)\"]) +else + CLEANFILES="*.o *.a *.so *~ core gmon.out" + #TEA_ADD_SOURCES([unix/unixFile.c]) + #TEA_ADD_LIBS([-lsuperfly]) +fi +CLEANFILES="$CLEANFILES pkgIndex.tcl" + #-------------------------------------------------------------------- # __CHANGE__ # Choose which headers you need. Extension authors should try very # 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 +# 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 #-------------------------------------------------------------------- @@ -5844,40 +5864,10 @@ $as_echo "${result}" >&6; } -#-------------------------------------------------------------------- -# __CHANGE__ -# A few miscellaneous platform-specific items: -# -# Define a special symbol for Windows (BUILD_xotcl in this case) so -# that we create the export library with the dll. See sha1.h on how -# to use this. -# -# 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. -# -# Define any extra compiler flags in the PACKAGE_CFLAGS variable. -# These will be appended to the current set of compiler flags for -# your system. -#-------------------------------------------------------------------- +#TEA_PUBLIC_TK_HEADERS +#TEA_PRIVATE_TK_HEADERS +#TEA_PATH_X -if test "${TEA_PLATFORM}" = "windows" ; then - if test "$GCC" != "yes" ; then - $as_echo "#define VISUAL_CC 1" >>confdefs.h - - fi - CLEANFILES="*.lib *.dll *.exp *.ilk *.pdb vc50.pch vc60.pch" - #TEA_ADD_SOURCES([win/winFile.c]) - #TEA_ADD_INCLUDES([-I\"$(${CYGPATH} ${srcdir}/w -else - CLEANFILES="*.o *.a *.so *~ core gmon.out" - #TEA_ADD_SOURCES([unix/unixFile.c]) - #TEA_ADD_LIBS([-lsuperfly]) -fi - - - - #-------------------------------------------------------------------- # Check whether --enable-threads or --disable-threads was given. #-------------------------------------------------------------------- @@ -8330,15 +8320,9 @@ #-------------------------------------------------------------------- -#if test "${TCL_MAJOR_VERSION}" = "8" -a "${TCL_MINOR_VERSION}" = "0"; then -# FORCE_NO_STUBS=1 -#fi +$as_echo "#define USE_TCL_STUBS 1" >>confdefs.h -if test "${FORCE_NO_STUBS}" = "0" ; then - $as_echo "#define USE_TCL_STUBS 1" >>confdefs.h -fi - #-------------------------------------------------------------------- # This macro generates a line to use when building a library. It # depends on values set by the TEA_ENABLE_SHARED, TEA_ENABLE_SYMBOLS, @@ -8463,22 +8447,6 @@ NSF_COMPATIBLE_TCLSH=${TCLSH_PROG} -# resolve the variables -eval "libdir=${libdir}" -eval "datadir=${datadir}" -eval "includedir=${includedir}" - -PKG_DIR="${PACKAGE_NAME}${PACKAGE_VERSION}" -pkgdatadir="${datadir}/${PKG_DIR}" -pkglibdir="${libdir}/${PKG_DIR}" -# make sure this is right (then remove this comment) -pkgincludedir="${includedir}/${PKG_DIR}" - - - - - - # # XOTcl specific configs # Index: configure.in =================================================================== diff -u -r7c0fa49f01d0a37ccb4e36778e72ac1c1e3f6b30 -r60d83a2fa5b5b46b6aa49e61ccc4ac4533cfeb88 --- configure.in (.../configure.in) (revision 7c0fa49f01d0a37ccb4e36778e72ac1c1e3f6b30) +++ configure.in (.../configure.in) (revision 60d83a2fa5b5b46b6aa49e61ccc4ac4533cfeb88) @@ -182,7 +182,7 @@ fi if test "$enable_development" = yes; then - AC_DEFINE(NSF_DEVLOPMENT, 1, [Are we building with development support?]) + AC_DEFINE(NSF_DEVELOPMENT, 1, [Are we building with development support?]) fi if test "$enable_memcount" = yes; then @@ -212,9 +212,9 @@ # and PKG_TCL_SOURCES. #----------------------------------------------------------------------- - TEA_ADD_SOURCES([nsf.c nsfError.c nsfObjectData.c nsfProfile.c \ - nsfTrace.c nsfUtil.c nsfObj.c nsfPointer.c nsfShadow.c nsfCompile.c aolstub.c nsfStubInit.c]) + nsfDebug.c nsfUtil.c nsfObj.c nsfPointer.c \ + nsfShadow.c nsfCompile.c aolstub.c nsfStubInit.c]) TEA_ADD_HEADERS([generic/nsf.h generic/nsfInt.h generic/nsfDecls.h generic/nsfIntDecls.h]) TEA_ADD_INCLUDES([]) TEA_ADD_LIBS([]) @@ -223,56 +223,50 @@ TEA_ADD_STUB_SOURCES([nsfStubLib.c]) TEA_ADD_TCL_SOURCES([]) - #-------------------------------------------------------------------- +# __CHANGE__ +# +# 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. +#-------------------------------------------------------------------- +if test "${TEA_PLATFORM}" = "windows" ; then + if test "$GCC" != "yes" ; then + AC_DEFINE(VISUAL_CC) + fi + CLEANFILES="*.lib *.dll *.exp *.ilk *.pdb vc50.pch vc60.pch " + #TEA_ADD_SOURCES([win/winFile.c]) + #TEA_ADD_INCLUDES([-I\"$(${CYGPATH} ${srcdir}/win)\"]) +else + CLEANFILES="*.o *.a *.so *~ core gmon.out" + #TEA_ADD_SOURCES([unix/unixFile.c]) + #TEA_ADD_LIBS([-lsuperfly]) +fi +CLEANFILES="$CLEANFILES pkgIndex.tcl" + #-------------------------------------------------------------------- # __CHANGE__ # Choose which headers you need. Extension authors should try very # 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 +# 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 #-------------------------------------------------------------------- #TEA_PUBLIC_TCL_HEADERS TEA_PRIVATE_TCL_HEADERS -#-------------------------------------------------------------------- -# __CHANGE__ -# A few miscellaneous platform-specific items: -# -# Define a special symbol for Windows (BUILD_xotcl in this case) so -# that we create the export library with the dll. See sha1.h on how -# to use this. -# -# 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. -# -# Define any extra compiler flags in the PACKAGE_CFLAGS variable. -# These will be appended to the current set of compiler flags for -# your system. -#-------------------------------------------------------------------- +#TEA_PUBLIC_TK_HEADERS +#TEA_PRIVATE_TK_HEADERS +#TEA_PATH_X -if test "${TEA_PLATFORM}" = "windows" ; then - if test "$GCC" != "yes" ; then - AC_DEFINE(VISUAL_CC) - fi - CLEANFILES="*.lib *.dll *.exp *.ilk *.pdb vc50.pch vc60.pch" - #TEA_ADD_SOURCES([win/winFile.c]) - #TEA_ADD_INCLUDES([-I\"$(${CYGPATH} ${srcdir}/w -else - CLEANFILES="*.o *.a *.so *~ core gmon.out" - #TEA_ADD_SOURCES([unix/unixFile.c]) - #TEA_ADD_LIBS([-lsuperfly]) -fi - - -AC_SUBST(CLEANFILES) - #-------------------------------------------------------------------- # Check whether --enable-threads or --disable-threads was given. #-------------------------------------------------------------------- @@ -328,15 +322,8 @@ # link against the non-stubbed Tcl library. #-------------------------------------------------------------------- +AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs]) -#if test "${TCL_MAJOR_VERSION}" = "8" -a "${TCL_MINOR_VERSION}" = "0"; then -# FORCE_NO_STUBS=1 -#fi - -if test "${FORCE_NO_STUBS}" = "0" ; then - AC_DEFINE(USE_TCL_STUBS) -fi - #-------------------------------------------------------------------- # This macro generates a line to use when building a library. It # depends on values set by the TEA_ENABLE_SHARED, TEA_ENABLE_SYMBOLS, @@ -359,22 +346,6 @@ NSF_COMPATIBLE_TCLSH=${TCLSH_PROG} AC_SUBST(NSF_COMPATIBLE_TCLSH) -# resolve the variables -eval "libdir=${libdir}" -eval "datadir=${datadir}" -eval "includedir=${includedir}" - -PKG_DIR="${PACKAGE_NAME}${PACKAGE_VERSION}" -pkgdatadir="${datadir}/${PKG_DIR}" -pkglibdir="${libdir}/${PKG_DIR}" -# make sure this is right (then remove this comment) -pkgincludedir="${includedir}/${PKG_DIR}" - -AC_SUBST(PKG_DIR) -AC_SUBST(pkgdatadir) -AC_SUBST(pkglibdir) -AC_SUBST(pkgincludedir) - # # XOTcl specific configs # Index: generic/nsf.c =================================================================== diff -u -r128b6dbb279c86914136b8812e249c951a88baf3 -r60d83a2fa5b5b46b6aa49e61ccc4ac4533cfeb88 --- generic/nsf.c (.../nsf.c) (revision 128b6dbb279c86914136b8812e249c951a88baf3) +++ generic/nsf.c (.../nsf.c) (revision 60d83a2fa5b5b46b6aa49e61ccc4ac4533cfeb88) @@ -22905,10 +22905,8 @@ #ifdef NSF_BYTECODE NsfBytecodeInit(); #endif + NsfReportVars(interp); - Tcl_SetVar(interp, "::nsf::version", NSF_VERSION, TCL_GLOBAL_ONLY); - Tcl_SetVar(interp, "::nsf::patchLevel", NSF_PATCHLEVEL, TCL_GLOBAL_ONLY); - Tcl_AddInterpResolvers(interp,"nxt", (Tcl_ResolveCmdProc *)InterpColonCmdResolver, InterpColonVarResolver, Fisheye: Tag 60d83a2fa5b5b46b6aa49e61ccc4ac4533cfeb88 refers to a dead (removed) revision in file `generic/nsfTrace.c'. Fisheye: No comparison available. Pass `N' to diff?