Index: build/test/test ================================================================== --- build/test/test +++ build/test/test @@ -1,8 +1,8 @@ #! /bin/bash -VERSIONS="8.5.19 8.6.9 fossil_trunk" +VERSIONS="8.5.19 8.6.10 fossil_trunk" # Find the base directory for x in 1 2 3 4 __fail__; do if [ "${x}" = "__fail__" ]; then echo 'Unable to find KitCreator, aborting.' >&2 Index: build/web/kitcreator.vfs/index.rvt ================================================================== --- build/web/kitcreator.vfs/index.rvt +++ build/web/kitcreator.vfs/index.rvt @@ -60,10 +60,11 @@ set tcl_versions(8.6.5) 8.6.5 set tcl_versions(8.6.6) 8.6.6 set tcl_versions(8.6.7) 8.6.7 set tcl_versions(8.6.8) 8.6.8 set tcl_versions(8.6.9) 8.6.9 + set tcl_versions(8.6.10) 8.6.10 set tcl_versions(fossil_trunk) "Fossil Trunk Tip" set tcl_version_list [lsort -dictionary [array names tcl_versions]] set tcl_version_selected [lindex $tcl_version_list end-1] @@ -416,18 +417,10 @@ ## Compute basic key set key [list $secret $build_platform $cache_tcl_version $cache_kitcreator_version $build_packages] ## Update key with options in deterministic order foreach option [lsort -dictionary [array names build_options]] { - switch -- $option { - "threaded" - "kitdll" - "debug" { - # For boolean options, skip them if they are not enabled - if {!$build_options($option)} { - continue - } - } - } lappend key [list "option:$option" $build_options($option)] } ## Convert key to a user-consumable string via hashing set key [string tolower [sha1::sha1 -hex $key]] Index: kitcreator ================================================================== --- kitcreator +++ kitcreator @@ -11,11 +11,11 @@ shift ;; esac # Determine which Tcl version to build -TCLVERS="8.6.9" +TCLVERS="8.6.10" if echo "$1" | grep '^[0-9][0-9]*\.' >/dev/null || echo "$1" | egrep '^(cvs|fossil)_' >/dev/null; then TCLVERS="$1" shift fi Index: tcl/build.sh ================================================================== --- tcl/build.sh +++ tcl/build.sh @@ -47,10 +47,13 @@ SRCHASH='c43cb0c1518ce42b00e7c8f6eaddd5195c53a98f94adc717234a65cbcfd3f96a' ;; 8.6.9) SRCHASH='ad0cd2de2c87b9ba8086b43957a0de3eb2eb565c7159d5f53ccbba3feb915f4e' ;; + 8.6.10) + SRCHASH='5196dbf6638e3df8d5c87b5815c8c2b758496eb6f0e41446596c9a4e638d87ed' + ;; esac # Set configure options for this sub-project LDFLAGS="${LDFLAGS} ${KC_TCL_LDFLAGS}" CFLAGS="${CFLAGS} ${KC_TCL_CFLAGS}" Index: tk/build.sh ================================================================== --- tk/build.sh +++ tk/build.sh @@ -47,10 +47,13 @@ SRCHASH='49e7bca08dde95195a27f594f7c850b088be357a7c7096e44e1158c7a5fd7b33' ;; 8.6.9) SRCHASH='d3f9161e8ba0f107fe8d4df1f6d3a14c30cc3512dfc12a795daa367a27660dac' ;; + 8.6.10) + SRCHASH='63df418a859d0a463347f95ded5cd88a3dd3aaa1ceecaeee362194bc30f3e386' + ;; esac # Set configure options for this sub-project LDFLAGS="${LDFLAGS} ${KC_TK_LDFLAGS}" CFLAGS="${CFLAGS} ${KC_TK_CFLAGS}"