Index: .fossil-settings/ignore-glob ================================================================== --- .fossil-settings/ignore-glob +++ .fossil-settings/ignore-glob @@ -140,10 +140,20 @@ tclx/build tclx/build.log tclx/inst tclx/out tclx/src +tuapi/build +tuapi/build.log +tuapi/inst +tuapi/out +tuapi/src +tdom/build +tdom/build.log +tdom/inst +tdom/out +tdom/src kitdll/buildsrc/kitdll-0.0/starpack.vfs kitdll/buildsrc/kitdll-0.0/starpack.vfs/* kitdll/buildsrc/kitdll-0.0/test kitdll/buildsrc/kitdll-0.0/configure kitdll/buildsrc/kitdll-0.0/libtcl*.so Index: build/web/kitcreator.vfs/index.rvt ================================================================== --- build/web/kitcreator.vfs/index.rvt +++ build/web/kitcreator.vfs/index.rvt @@ -59,26 +59,32 @@ set packages(itcl) {[incr Tcl]} set packages(tcllib) "Tcllib" set packages(yajltcl) "YAJL-TCL" set packages(udp) "TclUDP" set packages(nsf) "Next Scripting Framework" + set packages(tdom) "tDOM" + set packages(tuapi) "Tcl UNIX API" set disable { platform linux-mipsel {package_tk package_tcc4tcl package_tclx kitdll} platform android-arm {package_tk package_tclx} - platform netbsd-amd64 {package_tk package_tcc4tcl package_tclx} - platform netbsd-i386 {package_tk package_tcc4tcl package_tclx} - platform solaris-sparc {package_tcc4tcl package_tclx} - platform solaris-sparc64 {package_tcc4tcl package_tclx} - platform hpux-hppa64 {package_tcc4tcl package_tclx} + platform freebsd-amd64 {package_tuapi} + platform hpux-hppa64 {package_tuapi} + platform netbsd-amd64 {package_tk package_tcc4tcl package_tclx package_tuapi} + platform netbsd-i386 {package_tk package_tcc4tcl package_tclx package_tuapi} + platform solaris-sparc {package_tcc4tcl package_tclx package_tuapi} + platform solaris-sparc64 {package_tcc4tcl package_tclx package_tuapi} + platform hpux-hppa64 {package_tcc4tcl package_tclx package_tuapi} platform linux-arm {package_tk package_tclx} platform linux-amd64-static {package_tk package_dbus kitdll} platform linux-i386-static {package_tk package_dbus kitdll} - platform macosx-ppc {package_dbus package_tcc4tcl} - platform macosx-ppc64 {package_dbus package_tcc4tcl} - platform macosx-i386 {package_dbus} - platform macosx-amd64 {package_dbus} + platform macosx-ppc {package_dbus package_tcc4tcl package_tuapi} + platform macosx-ppc64 {package_dbus package_tcc4tcl package_tuapi} + platform macosx-i386 {package_dbus package_tuapi} + platform macosx-amd64 {package_dbus package_tuapi} + platform win32 {package_tuapi} + platform win64 {package_tuapi} } set specific { platform win32 file icon {Kit Icon} platform win32 text description {Description} Index: kitcreator ================================================================== --- kitcreator +++ kitcreator @@ -32,11 +32,11 @@ echo "Please remember to run 'build/pre.sh' if you expect this build to work." >&2 fi fi # Define the list of all packages, for cleaning purposes -KITCREATOR_ALLPKGS="kitsh tcl tclvfs zlib tk itcl mk4tcl thread dbus tls tclx tcc4tcl tcllib udp yajltcl" +KITCREATOR_ALLPKGS="kitsh tcl tclvfs zlib tk itcl mk4tcl thread dbus tls tclx tcc4tcl tcllib udp yajltcl tdom tuapi" # Always rebuild kitsh rm -f "kitsh/.success" for pkg in ${KITCREATOR_ALLPKGS} ${KITCREATOR_PKGS}; do if [ "${mode}" != "retry" -o ! -f "${pkg}/.success" ]; then ADDED tdom/build.sh Index: tdom/build.sh ================================================================== --- tdom/build.sh +++ tdom/build.sh @@ -0,0 +1,7 @@ +#! /usr/bin/env bash + +# BuildCompatible: KitCreator + +version='0.8.3' +url="https://github.com/downloads/tDOM/tdom/tDOM-${version}.tgz" +sha256='496d5950907dd70db61bc20c55a05a5521363ce3c076e2fdd97270181bc720b9' ADDED tdom/patches/all/tdom-0.8.3-tcl86.diff Index: tdom/patches/all/tdom-0.8.3-tcl86.diff ================================================================== --- tdom/patches/all/tdom-0.8.3-tcl86.diff +++ tdom/patches/all/tdom-0.8.3-tcl86.diff @@ -0,0 +1,32 @@ +diff --git a/generic/dom.h b/generic/dom.h +index b10e729..145366f 100644 +--- a/generic/dom.h ++++ b/generic/dom.h +@@ -94,6 +94,14 @@ + #endif + + /* ++ * Beginning with 8.6, interp->errorLine isn't public visible anymore ++ * (TIP 330) ++ */ ++#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 6) ++# define Tcl_GetErrorLine(interp) (interp)->errorLine ++#endif ++ ++/* + * Starting with Tcl 8.2 the Tcl_Panic() is defined properly + * over the stubs table. + * Also, we have a proper Tcl_GetString() shortcut afterwards. +diff --git a/generic/tcldom.c b/generic/tcldom.c +index 0126f54..a4578ab 100644 +--- a/generic/tcldom.c ++++ b/generic/tcldom.c +@@ -5934,7 +5934,7 @@ int tcldom_EvalLocked ( + if (ret == TCL_ERROR) { + char msg[64 + TCL_INTEGER_SPACE]; + sprintf(msg, "\n (\"%s %s\" body line %d)", Tcl_GetString(objv[0]), +- Tcl_GetString(objv[1]), interp->errorLine); ++ Tcl_GetString(objv[1]), Tcl_GetErrorLine(interp)); + Tcl_AddErrorInfo(interp, msg); + } + ADDED tuapi/build.sh Index: tuapi/build.sh ================================================================== --- tuapi/build.sh +++ tuapi/build.sh @@ -0,0 +1,31 @@ +#! /usr/bin/env bash + +# BuildCompatible: KitCreator + +version='0.6' +url="http://rkeene.org/devel/tuapi-${version}.tar.gz" +sha256='-' + +function configure() { + : +} + +function build() { + ( + . build-common.sh + + eval ${TCL_CC} ${TCL_DEFS} ${TCL_INCLUDE_SPEC} -o tuapi.o -c tuapi.c || exit 1 + + ${AR:-ar} rcu libtuapi.a tuapi.o || exit 1 + + ${RANLIB:-ranlib} libtuapi.a || exit 1 + + echo 'package ifneeded tuapi '"${tuapi_version}"' [list load {} tuapi]' > pkgIndex.tcl + ) || return 1 +} + +function install() { + mkdir -p "${installdir}/lib/tuapi${version}" || return 1 + + cp libtuapi.a pkgIndex.tcl "${installdir}/lib/tuapi${version}" || return 1 +}