Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Upgraded all the tcl bits to reference 8.6.5 Fixed more platform aphorisms for Windows that didn't translate to unix |
|---|---|
| Timelines: | family | ancestors | descendants | both | gort |
| Files: | files | file ages | folders |
| SHA1: |
c77f5a58bdd8b01f81240a3528d1bb11 |
| User & Date: | hypnotoad 2016-03-01 11:42:42 |
Context
|
2016-03-01
| ||
| 18:12 | Instead of embedding the package ifneeded script for TK in the tclIndex file, it now gets its own "pkgIndex.tcl" file in boot/tk The packages.tcl file for the VFS is now loaded on startup (if present) Cleaned up and straightened up the boot process for kits Closed-Leaf check-in: 07c8c54701 user: hypnotoad tags: gort | |
| 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 | |
Changes
Changes to autosetup/lib/odie.tcl.
| ︙ | ︙ | |||
248 249 250 251 252 253 254 |
# Initialize our picture of the world
###
array set odie_tcl {
config_flags {}
version 8.6
major_version 8
minor_version 6
| | | | 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 |
# Initialize our picture of the world
###
array set odie_tcl {
config_flags {}
version 8.6
major_version 8
minor_version 6
patch_level .5
fossil_branch release
}
array set odie_tk {
config_flags {}
version 8.6
major_version 8
minor_version 6
patch_level .5
fossil_branch release
}
array set odie {
exe_suffix {}
platform unix
tea_platform_dir unix
tcl_platform_dir unix
|
| ︙ | ︙ | |||
313 314 315 316 317 318 319 |
set ::odie(ld_flags) "-static-libgcc -static-libstdc++"
}
*win32* - *WIN32* {
###
# With visual studio, 64 bit should be assumed
# but is otherwise to taste
###
| | | 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 |
set ::odie(ld_flags) "-static-libgcc -static-libstdc++"
}
*win32* - *WIN32* {
###
# With visual studio, 64 bit should be assumed
# but is otherwise to taste
###
set ::odie(windows) 1
set ::odie(os) windows
}
}
###
# Build information about the local tools
|
| ︙ | ︙ |
Changes to build.tcl.
1 2 3 4 5 6 7 8 9 10 |
###
# script to build a tclkit
###
set HERE [file dirname [file normalize [info script]]]
set PWD [pwd]
namespace eval ::practcl {}
lappend auto_path [file normalize [file join $HERE .. tcllib modules]]
lappend auto_path [file normalize [file join $HERE .. odielib modules]]
#package ifneeded zipfile::mkzip 1.2 [list source [file join $::HERE scripts mkzip.tcl]]
| < < < < < < < < < < > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 |
###
# script to build a tclkit
###
set HERE [file dirname [file normalize [info script]]]
set PWD [pwd]
namespace eval ::practcl {}
lappend auto_path [file normalize [file join $HERE .. tcllib modules]]
lappend auto_path [file normalize [file join $HERE .. odielib modules]]
#package ifneeded zipfile::mkzip 1.2 [list source [file join $::HERE scripts mkzip.tcl]]
package require fileutil
proc ::cat fname {
set fname [open $fname r]
set data [read $fname]
close $fname
return $data
}
proc ::practcl::localtools {} {
}
proc ::practcl::_isdirectory name {
return [file isdirectory $name]
}
###
# topic: ebd68484cb7f18cad38beaab3cf574e2de5702ea
###
|
| ︙ | ︙ | |||
144 145 146 147 148 149 150 |
} finally {
set thisline {}
}
}
return $buffer
}
| > > > > | | | | | < | | | | | | | | | | | | | | | > | 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 |
} finally {
set thisline {}
}
}
return $buffer
}
###
# Index all paths given as though they will end up in the same
# virtual file system
###
proc ::practcl::pkgindex_path args {
set stack {}
set buffer {
lappend ::PATHSTACK $dir
}
foreach base $args {
set i [string length $base]
# Build a list of all of the paths
set paths [fileutil::find $base ::practcl::_isdirectory]
foreach path $paths {
if {$path eq $base} continue
set path_indexed($path) 0
}
set path_index([file join $base boot tcl]) 1
set path_index([file join $base boot tk]) 1
foreach path $paths {
set thisdir [::fileutil::relative $base $path]
set idxbuf [::practcl::_pkgindex_directory $path]
if {[string length $idxbuf]} {
incr path_indexed($path)
append buffer "set dir \[file join \[lindex \$::PATHSTACK end\] $thisdir\]" \n
append buffer [string trimright $idxbuf] \n
}
}
}
append buffer {
set dir [lindex $::PATHSTACK end]
set ::PATHSTACK [lrange $::PATHSTACK 0 end-1]
}
return $buffer
}
|
| ︙ | ︙ | |||
213 214 215 216 217 218 219 |
proc ::domake {args} {
puts [list make {*}$args]
exec make {*}$args >&@ stdout
}
proc ::COMPILE {which cfile {extras {}}} {
| | | 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 |
proc ::domake {args} {
puts [list make {*}$args]
exec make {*}$args >&@ stdout
}
proc ::COMPILE {which cfile {extras {}}} {
set objfile [file normalize [file join $::PWD build [file tail [file dirname $cfile]]_[file rootname [file tail $cfile]].o]]
lappend ::KIT(${which}_OBJS) $objfile
if {[file exists $objfile] && [file mtime $objfile] > [file mtime $cfile]} return
lappend cmd $::KIT(cc) {*}$::KIT(cflags_optimize) {*}$::KIT(shlib_cflags) {*}$::KIT(cflags_warning) {*}$::KIT(extra_cflags) {*}$::KIT(defs) {*}$extras
foreach path $::KIT(INCLUDES) {
lappend cmd -I./[fileutil::relative $::PWD $path]
}
lappend cmd {*}$::KIT(EXTRA_CFLAGS)
|
| ︙ | ︙ | |||
241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 |
if {[file isdirectory $f] && [string compare CVS $ftail]} {
copyDir $f [file join $d2 $ftail]
} elseif {[file isfile $f]} {
file copy -force $f [file join $d2 $ftail]
}
}
}
#########################################
#
# BEGIN THE KITBUILDING PROCESS HERE
#
#########################################
set _search_paths {{$PWD} {$PWD ..}}
if {[file exists [file join $PWD project.rc]]} {
source [file join $PWD project.rc]
set ::KIT(platform) $::project(TEA_PLATFORM)
set ::KIT(ORIG_TCL_SRC_DIR) $::project(TCL_SRC_DIR)
set ::KIT(ORIG_TK_SRC_DIR) $::project(TK_SRC_DIR)
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < | < < < < < < < | < < < < < < < < < < < < < | > > > > > > | > > | | | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > > | > > > | | | | > > > > > > > > | | | | | | | | | | | 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 |
if {[file isdirectory $f] && [string compare CVS $ftail]} {
copyDir $f [file join $d2 $ftail]
} elseif {[file isfile $f]} {
file copy -force $f [file join $d2 $ftail]
}
}
}
proc ::practcl::wrap {PWD name vfspath args} {
cd $PWD
if {![file exists $vfspath]} {
file mkdir $vfspath
}
package ifneeded zipfile::mkzip 1.2 [list source [file join $::HERE scripts mkzip.tcl]]
package require zipfile::mkzip
set fout [open [file join $vfspath pkgIndex.tcl] w]
set buffer [::practcl::pkgindex_path $::KIT(BASEVFS) $vfspath]
puts $fout $buffer
close $fout
::zipfile::mkzip::mkzip ${name}$::KIT(EXEEXT) -runtime $::TARGET(tclkit_bare) $::KIT(BASEVFS) {*}$args $vfspath
}
#########################################
#
# BEGIN THE KITBUILDING PROCESS HERE
#
#########################################
set _search_paths {{$PWD} {$PWD ..}}
if {![file exists odieConfig.tcl]} {
# Build the local toolset
cd $HERE
exec [info nameofexecutable] [file join $HERE autosetup autosetup] --host
cd $PWD
}
source [file join $::HERE odieConfig.tcl]
set ::KIT(platform) ::odie(platform)
set ::KIT(ORIG_TCL_SRC_DIR) $::odie_tcl(src_dir)
set ::KIT(ORIG_TK_SRC_DIR) $::odie_tk(src_dir)
set ::KIT(TCL_BUILD_OPTS) $::odie_tcl(config_flags)
set ::KIT(TK_BUILD_OPTS) $::odie_tk(config_flags)
set ::KIT(HOST) $::odie(host)
set ::KIT(TARGET) $::odie(target)
set ::KIT(TCL_VERSION) $::odie_tcl(version)
set ::KIT(TK_VERSION) $::odie_tk(version)
set ::KIT(TCL_PATCH_LEVEL) $::odie_tcl(patch_level)
set ::KIT(TK_PATCH_LEVEL) $::odie_tk(patch_level)
if {[file exists [file join $PWD project.rc]]} {
source [file join $PWD project.rc]
set ::KIT(platform) $::project(TEA_PLATFORM)
set ::KIT(ORIG_TCL_SRC_DIR) $::project(TCL_SRC_DIR)
set ::KIT(ORIG_TK_SRC_DIR) $::project(TK_SRC_DIR)
set ::KIT(TARGET) $::project(TEA_PLATFORM)
set ::KIT(TCL_VERSION) $::project(TCL_VERSION)
set ::KIT(TK_VERSION) $::project(TK_VERSION)
set ::KIT(TCL_PATCH_LEVEL) $::project(TCL_PATCH_LEVEL)
set ::KIT(TK_PATCH_LEVEL) $::project(TCL_PATCH_LEVEL)
lappend _search_paths {[file dirname $::project(srcdir)]}
}
lappend _search_paths $::odie(sandbox)
array set build {
tcl 0
tk 0
packages 0
basekitvfs 0
toadkit.rc 0
toadkit 0
tclkit_bare 0
libtoadkit.a 0
}
###
# Begin processing our arguments
###
set COMMAND [lindex $argv 0]
switch $COMMAND {
localtcl {
}
toadkit {
set build(toadkit) 1
}
basekit {
set build(toadkit) 1
}
wrap {
}
clean {
}
default {
error "Unknown command $COMMAND. Valid: clean tcl toadkit wrap"
}
}
for {set i 1} {$i < [llength $argv]} {incr i} {
set arg [lindex $argv $i]
switch $arg {
set
target {
incr i
set ::KIT(TARGET) [lindex $argv $i]
}
default {
error "Unknown option $arg"
}
}
}
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 ::KIT(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]
set ::KIT(PKGROOT) [file join $path pkg]
set ::KIT(BASEVFS) [file join $path vfs]
if {[file exists $::KIT(TCLSRCDIR)]} {
break
}
}
###
# Sort out our various build products
###
set _TclSrcDir [file join $::KIT(TCLSRCDIR) $::KIT(platform_src_dir)]
set _TkSrcDir [file join $::KIT(TKSRCDIR) $::KIT(platform_src_dir)]
set ::TARGET(tclConfig.sh) [file join $_TclSrcDir tclConfig.sh]
set ::TARGET(tkConfig.sh) [file join $_TkSrcDir tkConfig.sh]
set ::TARGET(libtoadkit.a) [file join $PWD libtoadkit.a]
set ::TARGET(tclkit_bare) [file join $PWD tclkit_bare$::KIT(EXEEXT)]
set ::TARGET(toadkit.rc) [file join $PWD toadkit.rc]
if {![file exists $::TARGET(tclkit_bare)]} {
set build(tclkit_bare) 1
}
if {![file exists $::TARGET(tclConfig.sh)]} {
set build(tcl) 1
set build(tk) 1
}
if {![file exists $::TARGET(tkConfig.sh)]} {
set build(tk) 1
}
if {![file exists $::TARGET(libtoadkit.a)]} {
set build(libtoadkit.a) 1
}
if {![file exists $::KIT(PKGROOT)]} {
set build(packages) 1
}
if {![file exists $::KIT(BASEVFS)]} {
set build(basekitvfs) 1
}
if {$build(tcl) || $build(tk) || $build(toadkit)} {
set build(packages) 1
set build(basekitvfs) 1
set build(toadkit.rc) 1
set build(tclkit_bare) 1
set build(libtoadkit.a) 1
}
if {$build(libtoadkit.a)} {
set build(tclkit_bare) 1
}
if {$build(packages)} {
set build(basekitvfs) 1
}
if {![file exists $::TARGET(toadkit.rc)]} {
set build(toadkit.rc) 1
}
file mkdir build
puts "***
::KIT(TCLSRCDIR): [file exists $::KIT(TCLSRCDIR)] $::KIT(TCLSRCDIR)
::KIT(TKSRCDIR): [file exists $::KIT(TKSRCDIR)] $::KIT(TKSRCDIR)
::KIT(PKGROOT): [file exists $::KIT(PKGROOT)] $::KIT(PKGROOT)
::KIT(BASEVFS): [file exists $::KIT(BASEVFS)] $::KIT(BASEVFS)
toadkit.rc: [file exists $::TARGET(toadkit.rc)] $::TARGET(toadkit.rc)
***"
parray build
if {$COMMAND eq "clean"} {
file delete -force $path
file delete -force build/
foreach file [glob -nocomplain *.a] {
file delete $file
}
exit
}
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"
cd $_TclSrcDir
doexec nmake -f makefile.vc INSTALLDIR=$::KIT(PKGROOT) release
doexec nmake -f makefile.vc INSTALLDIR=$::KIT(PKGROOT) install
cd $PWD
} else {
if {![file exists $::TARGET(tclConfig.sh)]} {
puts "BUILDING Static Tcl"
cd $_TclSrcDir
set opts {}
if {$::KIT(HOST) != $::KIT(TARGET)} {
lappend opts --host=$::KIT(TARGET)
}
lappend opts {*}$::KIT(TCL_BUILD_OPTS) --prefix=$::KIT(PKGPREFIX) --exec_prefix=$::KIT(PKGPREFIX) --with-tzdata --enable-shared=no
doexec sh configure {*}$opts
domake binaries
domake packages
cd $PWD
}
}
}
if {$build(tk)} {
if {![file exists $::KIT(TKSRCDIR)]} {
copyDir $::KIT(ORIG_TK_SRC_DIR) $::KIT(TKSRCDIR)
cd [file join $_TkSrcDir]
catch {domake distclean}
}
if {$USEMSVC} {
cd $_TkSrcDir
puts "BUILD TK"
doexec nmake -f makefile.vc TCLDIR=[file nativename $::KIT(TCLSRCDIR)] INSTALLDIR=$::KIT(PKGROOT) release
doexec nmake -f makefile.vc TCLDIR=[file nativename $::KIT(TCLSRCDIR)] INSTALLDIR=$::KIT(PKGROOT) install
cd $PWD
} else {
if {![file exists $::TARGET(tkConfig.sh)]} {
puts "BUILD TK"
set opts {}
cd $_TkSrcDir
if {$::KIT(HOST) != $::KIT(TARGET)} {
|
| ︙ | ︙ | |||
460 461 462 463 464 465 466 |
}
}
}
###
# Add/synthesize bits
###
| | | | | | | | | | | 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 |
}
}
}
###
# Add/synthesize bits
###
lappend ::KIT(INCLUDES) [file join $::KIT(TKSRCDIR) generic]
lappend ::KIT(INCLUDES) [file join $::KIT(TKSRCDIR) $::KIT(platform_src_dir)]
lappend ::KIT(INCLUDES) [file join $::KIT(TKSRCDIR) bitmaps]
lappend ::KIT(INCLUDES) [file join $::KIT(TKSRCDIR) xlib]
lappend ::KIT(INCLUDES) [file join $::KIT(TCLSRCDIR) generic]
lappend ::KIT(INCLUDES) [file join $::KIT(TCLSRCDIR) $::KIT(platform_src_dir)]
#lappend ::KIT(INCLUDES) [file join $$::KIT(TCLSRCDIR) compat]
lappend ::KIT(INCLUDES) [file join $::KIT(TCLSRCDIR) compat zlib]
lappend ::KIT(INCLUDES) [file join $::HERE generic]
lappend ::KIT(INCLUDES) [file join $::HERE $::KIT(platform_src_dir)]
if { $::KIT(platform) eq "windows" } {
set ::KIT(EXEEXT) .exe
set ::KIT(LDFLAGS_CONSOLE) {-mconsole -pipe -static-libgcc}
set ::KIT(LDFLAGS_WINDOW) {-mwindows -pipe -static-libgcc}
set ::KIT(EXTRA_CFLAGS) {-DTCL_TOMMATH -DMP_PREC=4 -DUNICODE -D_UNICODE -DBUILD_tcl -DBUILD_tk -DBUILD_ttk -DSTATIC_BUILD}
if {[file exists [file join $PWD tclkit.rc]]} {
set RCSRC [file join $PWD tclkit.rc]
} else {
set RCSRC [file join $_TkSrcDir rc wish.rc]
}
doexec windres -o [file join $PWD tclkit.res.o] -DSTATIC_BUILD \
--include [file join $::KIT(TCLSRCDIR) generic] --include [file join $::KIT(TKSRCDIR) generic] \
--include $_TkSrcDir \
--include [file join $_TkSrcDir rc] $RCSRC
lappend ::KIT(TCLSHELL_OBJS) [file join $PWD tclkit.res.o]
lappend ::KIT(WISHSHELL_OBJS) [file join $PWD tclkit.res.o]
lappend ::KIT(INCLUDES) [file join $_TkSrcDir rc]
} else {
|
| ︙ | ︙ | |||
541 542 543 544 545 546 547 |
if {[file exists $::TARGET(libtoadkit.a)]} {
file delete $::TARGET(libtoadkit.a)
}
###
# Rig ourselves to statically build the bits of
# zlib we need
###
| | | 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 |
if {[file exists $::TARGET(libtoadkit.a)]} {
file delete $::TARGET(libtoadkit.a)
}
###
# Rig ourselves to statically build the bits of
# zlib we need
###
set cdir [file join $::KIT(TCLSRCDIR) compat zlib]
foreach file {
adler32.c compress.c crc32.c
deflate.c infback.c inffast.c
inflate.c inftrees.c trees.c
uncompr.c zutil.c
} {
COMPILE LIBTOADKIT [file join $cdir $file]
|
| ︙ | ︙ | |||
568 569 570 571 572 573 574 575 576 577 578 579 580 |
foreach file {
tclsh_packages.c
} {
COMPILE LIBTOADKIT [file join $cdir $file]
}
COMPILE TCLSHELL [file join $_TclSrcDir tclAppInit.c] [list -DTCL_LOCAL_MAIN_HOOK=Toadkit_MainHook -DTCL_LOCAL_APPINIT=Toadkit_AppInit]
COMPILE WISHSHELL [file join $_TkSrcDir winMain.c] [list -DTK_LOCAL_MAIN_HOOK=Toadkit_MainHook -DTK_LOCAL_APPINIT=Toadkit_AppInit]
} else {
foreach file {
tclsh_packages.c
} {
COMPILE LIBTOADKIT [file join $cdir $file]
}
| > | | > | | | | | | | | | | | | | | | | > | > > > | | | < | | > > > > > > < < < | < < < | < < < < | < < < < < < | < < < | 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 |
foreach file {
tclsh_packages.c
} {
COMPILE LIBTOADKIT [file join $cdir $file]
}
COMPILE TCLSHELL [file join $_TclSrcDir tclAppInit.c] [list -DTCL_LOCAL_MAIN_HOOK=Toadkit_MainHook -DTCL_LOCAL_APPINIT=Toadkit_AppInit]
COMPILE WISHSHELL [file join $_TkSrcDir winMain.c] [list -DTK_LOCAL_MAIN_HOOK=Toadkit_MainHook -DTK_LOCAL_APPINIT=Toadkit_AppInit]
lappend ::KIT(LIBTOADKIT_OBJS) [file join $_TclSrcDir libtclstub86.a]
} else {
foreach file {
tclsh_packages.c
} {
COMPILE LIBTOADKIT [file join $cdir $file]
}
COMPILE TCLSHELL [file join $_TclSrcDir tclAppInit.c] [list -DTCL_LOCAL_MAIN_HOOK=Toadkit_MainHook -DTCL_LOCAL_APPINIT=Toadkit_AppInit]
COMPILE WISHSHELL [file join $_TkSrcDir tkAppInit.c] [list -DTK_LOCAL_MAIN_HOOK=Toadkit_MainHook -DTK_LOCAL_APPINIT=Toadkit_AppInit]
lappend ::KIT(LIBTOADKIT_OBJS) [file join $_TclSrcDir libtclstub8.6.a]
}
###
# Link together our executable
###
doexec ar cr $::TARGET(libtoadkit.a) {*}$::KIT(LIBTOADKIT_OBJS)
doexec ranlib $::TARGET(libtoadkit.a)
}
if {$build(packages)} {
cd $PWD
if {[file exists $::KIT(PKGROOT)]} {
file delete -force $::KIT(PKGROOT)
}
set pkg_paths [glob [file join $::KIT(TCLSRCDIR) pkgs *]]
foreach pkgpath $pkg_paths {
if {[string range [file tail $pkgpath] 0 3] eq "itcl"} continue
if {![file isdirectory $pkgpath]} continue
cd $pkgpath
if {![file exists [file join $pkgpath Makefile]]} {
if {[file exists [file join $pkgpath Makefile.in]]} {
doexec sh configure --with-tcl=$_TclSrcDir --with-tclinclude=[file join $::KIT(TCLSRCDIR) generic] --with-tzdata --enable-shared --enable-threads
} else {
continue
}
}
puts "INSTALLING to VFS [file tail $pkgpath]"
domake install DESTDIR=$::KIT(PKGROOT)
}
}
if {$build(tclkit_bare)} {
cd $PWD
# Build a Tcl-only shell
set cmd [list $::KIT(cc) {*}$::KIT(cflags_optimize) {*}$::KIT(shlib_cflags)]
lappend cmd {*}$::KIT(TCLSHELL_OBJS)
foreach item [glob ${_TclSrcDir}/*.a] {
lappend cmd $item
}
lappend cmd $::TARGET(libtoadkit.a) {*}$::TCL(libs)
lappend cmd -o $::TARGET(tclkit_bare) {*}$::KIT(LDFLAGS_CONSOLE)
doexec {*}$cmd
}
if {$build(basekitvfs)} {
cd $PWD
if {[file exists $::KIT(BASEVFS)]} {
file delete -force $::KIT(BASEVFS)
}
puts "***
*** BASE KIT VFS PACKAGES
***"
puts [list COPY [file join $::KIT(PKGROOT) [string trimleft $::KIT(PKGPREFIX) /] lib]]
copyDir [file join $::KIT(PKGROOT) [string trimleft $::KIT(PKGPREFIX) /] lib] [file join $::KIT(BASEVFS) pkgs]
copyDir [file join $::KIT(TCLSRCDIR) library] [file join $::KIT(BASEVFS) boot tcl]
if { $::KIT(platform) eq "windows" } {
set ddedll [glob -nocomplain [file join $_TclSrcDir tcldde*.dll]]
if {$ddedll != {}} {
file copy $ddedll [file join $::KIT(BASEVFS) boot tcl dde]
}
set regdll [glob -nocomplain [file join $_TclSrcDir tclreg*.dll]]
if {$regdll != {}} {
file copy $regdll [file join $::KIT(BASEVFS) boot tcl reg]
}
} else {
file delete -force [file join $::KIT(BASEVFS) boot tcl dde]
file delete -force [file join $::KIT(BASEVFS) boot tcl reg]
}
copyDir [file join $::KIT(TKSRCDIR) library] $::KIT(BASEVFS)/boot/tk
if { $::KIT(platform) eq "windows" } {
set dllsrc [file join $_TkSrcDir [string trim $::TK(dll_file) \"]]
} else {
set dllsrc [file join $_TkSrcDir [string trim $::TK(lib_file) \"]]
}
file copy -force $dllsrc [file join $::KIT(BASEVFS) boot tk]
# For the following packages, cat their pkgIndex files to tclIndex
if {$::tcl_platform(platform) eq {unix}} {
file attributes [file join $::KIT(BASEVFS) boot tcl tclIndex] -permissions 0744
} else {
file attributes [file join $::KIT(BASEVFS) boot tcl tclIndex] -readonly 0
}
set fout [open [file join $::KIT(BASEVFS) boot tcl tclIndex] a]
puts $fout {#
# MANIFEST OF INCLUDED PACKAGES
#
}
set map [list @TKVERSION@ $::TK(version)$::TK(patch_level)]
if { $::KIT(platform) eq "windows" } {
lappend map @TKDLL@ [string trim $::TK(dll_file) \"]
} else {
lappend map @TKDLL@ [string trim $::TK(lib_file) \"]
}
puts $fout [string map $map {
package ifneeded Tk @TKVERSION@ [list load $::tk_library/@TKDLL@ Tk]
}]
puts $fout {
if {[file exists /zvfs/pkgIndex.tcl]} {
set dir /zvfs
source /zvfs/pkgIndex.tcl
}
}
#close $fout
close $fout
}
if {$COMMAND eq "toadkit"} {
::practcl::wrap $::PWD toadkit toadkit-vfs
}
if {$COMMAND eq "wrap"} {
::practcl::wrap $::PWD {*}[lrange $args 1 end]
}
|