Check-in [4ca3730f2d]
Not logged in
Bounty program for improvements to Tcl and certain Tcl packages.
Tcl 2018 Conference, Houston/TX, US, Oct 15-19
Send your abstracts to tclconference@googlegroups.com or submit via the online form
by Aug 20.

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Upgraded to tcl 8.6.5 Fixed some "only works on windows-isms"
Timelines: family | ancestors | descendants | both | gort
Files: files | file ages | folders
SHA1: 4ca3730f2d6c7f6d2ccd80e54147461e5f9ca063
User & Date: hypnotoad 2016-02-29 23:59:29
Context
2016-03-01
11:42
Upgraded all the tcl bits to reference 8.6.5 Fixed more platform aphorisms for Windows that didn't translate to unix check-in: c77f5a58bd user: hypnotoad tags: gort
2016-02-29
23:59
Upgraded to tcl 8.6.5 Fixed some "only works on windows-isms" check-in: 4ca3730f2d user: hypnotoad tags: gort
23:24
The toadkit.rc file now builds in the local project's build directory, allowing scripts to leverage what the kitbuild discovered/built Moved all of the odie specific config data to a specific section which is now only consulted if a project.rc is not present. Reimplemented the build project in stages, with rules at the top to determine which stage needs to run when. All paths referenced by the KIT are stored in the KIT array check-in: 427a4ac4ce user: hypnotoad tags: gort
Changes
Unified Diff Ignore Whitespace Patch
Changes to build.tcl.
281
282
283
284
285
286
287

288
289
290

291
292
293
294
295
296
297
  set ::KIT(TCL_PATCH_LEVEL) $::odie_tcl(patch_level)
  set ::KIT(TK_PATCH_LEVEL) $::odie_tk(patch_level)
  lappend _search_paths $::odie(sandbox)
}
if { $::KIT(platform) eq "windows" } {
  set ::KIT(EXEEXT) .exe
  set ::KIT(platform_src_dir) win

} else {
  set ::KIT(EXEEXT) {}
  set ::KIT(platform_src_dir) win

}
set PKGPREFIX /tcl

foreach dpath $_search_paths {
  set path [file normalize [file join {*}[subst $dpath] toadkit$::KIT(TCL_VERSION)$::KIT(TCL_PATCH_LEVEL)]]
  set KIT(TCLSRCDIR)  [file join $path tcl]
  set KIT(TKSRCDIR)   [file join $path tk]







>


|
>







281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
  set ::KIT(TCL_PATCH_LEVEL) $::odie_tcl(patch_level)
  set ::KIT(TK_PATCH_LEVEL) $::odie_tk(patch_level)
  lappend _search_paths $::odie(sandbox)
}
if { $::KIT(platform) eq "windows" } {
  set ::KIT(EXEEXT) .exe
  set ::KIT(platform_src_dir) win
  set USEMSVC [info exists env(VisualStudioVersion)]
} else {
  set ::KIT(EXEEXT) {}
  set ::KIT(platform_src_dir) unix
  set USEMSVC 0
}
set PKGPREFIX /tcl

foreach dpath $_search_paths {
  set path [file normalize [file join {*}[subst $dpath] toadkit$::KIT(TCL_VERSION)$::KIT(TCL_PATCH_LEVEL)]]
  set KIT(TCLSRCDIR)  [file join $path tcl]
  set KIT(TKSRCDIR)   [file join $path tk]
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390

if {$build(tcl)} {
  file mkdir build
  file mkdir [file join $KIT(BASEVFS) boot]
  ###
  # Build a starter VFS for both Tcl and wish
  ###
  set USEMSVC [info exists env(VisualStudioVersion)]
  if {![file exists $KIT(TCLSRCDIR)]} {
    copyDir $::KIT(ORIG_TCL_SRC_DIR) $KIT(TCLSRCDIR)
    cd $_TclSrcDir
    catch {domake distclean}
  }
  if {$USEMSVC} {
    puts "BUILDING Static Tcl"







<







378
379
380
381
382
383
384

385
386
387
388
389
390
391

if {$build(tcl)} {
  file mkdir build
  file mkdir [file join $KIT(BASEVFS) boot]
  ###
  # Build a starter VFS for both Tcl and wish
  ###

  if {![file exists $KIT(TCLSRCDIR)]} {
    copyDir $::KIT(ORIG_TCL_SRC_DIR) $KIT(TCLSRCDIR)
    cd $_TclSrcDir
    catch {domake distclean}
  }
  if {$USEMSVC} {
    puts "BUILDING Static Tcl"
Changes to scripts/make_tcl.sh.
1
2
3
4
5
6
7
8
9
10
11
12
13
#! /bin/bash

source odieConfig.sh

TCL_SRCPATH=${SANDBOX}/tcl8.6.3/${ODIE_TCL_PLATFORM_DIR}
TK_SRCPATH=${SANDBOX}/tk8.6.3/${ODIE_TCL_PLATFORM_DIR}
ODIE_SRCPATH=${SANDBOX}/odie

#echo DOWNLOAD $DOWNLOAD
#echo "Cloning Tcl/Tk Sources"
#if [ ! -f "${DOWNLOAD}/tcl.fos" ]; then
#  ${FOSSIL} clone ${ODIEMIRRORURL}/tcl ${DOWNLOAD}/tcl.fos
#fi




|
|







1
2
3
4
5
6
7
8
9
10
11
12
13
#! /bin/bash

source odieConfig.sh

TCL_SRCPATH=${SANDBOX}/tcl8.6.5/${ODIE_TCL_PLATFORM_DIR}
TK_SRCPATH=${SANDBOX}/tk8.6.5/${ODIE_TCL_PLATFORM_DIR}
ODIE_SRCPATH=${SANDBOX}/odie

#echo DOWNLOAD $DOWNLOAD
#echo "Cloning Tcl/Tk Sources"
#if [ ! -f "${DOWNLOAD}/tcl.fos" ]; then
#  ${FOSSIL} clone ${ODIEMIRRORURL}/tcl ${DOWNLOAD}/tcl.fos
#fi