Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Feature branch to try to do builds locally |
|---|---|
| Timelines: | family | ancestors | private |
| Files: | files | file ages | folders |
| SHA1: |
c44f1e7ec20364e8d699e865268fa71e |
| User & Date: | hypnotoad 2016-03-09 11:53:19 |
Context
|
2016-03-09
| ||
| 11:53 | Feature branch to try to do builds locally Closed-Leaf check-in: c44f1e7ec2 user: hypnotoad tags: private (unpublished) | |
|
2016-03-07
| ||
| 23:48 | Reversed the package preference order for twapi. The nettool package only properly supports 3.0.29 check-in: 27aad69f9e user: hypnotoad tags: trunk | |
Changes
Changes to build.tcl.
| ︙ | ︙ | |||
21 22 23 24 25 26 27 |
namespace eval ::practcl {}
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
| | | 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 |
namespace eval ::practcl {}
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(defs) {*}$extras
foreach path $::KIT(INCLUDES) {
lappend cmd -I./[::practcl::file_relative $::PWD $path]
}
lappend cmd {*}$::KIT(EXTRA_CFLAGS)
lappend cmd -c [::practcl::file_relative $::PWD $cfile] -o $objfile
puts [list [file tail $cfile] -> [file tail $objfile]]
puts $cmd
|
| ︙ | ︙ | |||
83 84 85 86 87 88 89 |
###
set ::KIT(PACKAGES) {
thread {tag release}
sqlite {tag release}
udp {tag trunk}
canvas3d {tag trunk tk 1}
tkimg {tag trunk tk 1 broken_destroot 1}
| < > > > > > > | 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 |
###
set ::KIT(PACKAGES) {
thread {tag release}
sqlite {tag release}
udp {tag trunk}
canvas3d {tag trunk tk 1}
tkimg {tag trunk tk 1 broken_destroot 1}
}
# tcllibc {version 0.3.14}
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(EXTRA_CFLAGS) $::odie_tcl(extra_cflags)
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)
puts "PLATFORM: $::KIT(platform)"
set ::KIT(TEAPOT) {}
if {$::KIT(platform) eq "windows"} {
set ::KIT(TEAPOT) C:/Tcl/lib/teapot/package/win32-ix86/lib
dict set ::KIT(PACKAGES) twapi {version {3.0.32 4.1.27}}
} elseif {$::KIT(platform) eq "macox"} {
}
array set build {
tcl 0
tk 0
packages 0
basekitvfs 0
|
| ︙ | ︙ | |||
312 313 314 315 316 317 318 |
doexec sh configure {*}$opts
domake binaries
cd $PWD
}
}
}
| < > > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | < < < > > > > > > > > > > > > > > > > > > | > | < < | | | > | | > | < < < < < < < < | | > > | 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 491 492 493 |
doexec sh configure {*}$opts
domake binaries
cd $PWD
}
}
}
###
# Read configuration data from Tcl/Tk config
###
set ::KIT(OBJS) {}
set ::KIT(INCLUDES) {}
###
# Read tclConfig.sh and tkConfig.sh
###
foreach {array pre file} [list ::TCL tcl $::TARGET(tclConfig.sh) ::TK tk $::TARGET(tkConfig.sh)] {
set l [expr {[string length $pre]+1}]
foreach {field dat} [::practcl::read_Config.sh $file] {
set field [string tolower $field]
if {[string match ${pre}_* $field]} {
set field [string range $field $l end]
}
set ${array}($field) $dat
if {[info exists ::KIT($field)]} {
if {$::KIT($field) ne $dat} {
unset ::KIT($field)
}
} else {
set ::KIT($field) $dat
}
}
}
###
# 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 {
set ::KIT(EXEEXT) {}
set ::KIT(LDFLAGS_CONSOLE) {}
set ::KIT(LDFLAGS_WINDOW) {}
set ::KIT(EXTRA_CFLAGS) {-DTCL_TOMMATH -DMP_PREC=4 -DBUILD_tk -DBUILD_ttk}
}
set ::KIT(LIBS) {}
set ::KIT(defs) $::TK(defs)
set fout [open $::TARGET(toadkit.rc) w]
puts $fout "array set ::TCL \{"
foreach {field value} [lsort -stride 2 [array get ::TCL]] {
puts $fout " [list $field $value]"
}
puts $fout "\}"
puts $fout "array set ::TK \{"
foreach {field value} [lsort -stride 2 [array get ::TK]] {
puts $fout " [list $field $value]"
}
puts $fout "\}"
puts $fout "array set ::TARGET \{"
foreach {field value} [lsort -stride 2 [array get ::TARGET]] {
puts $fout " [list $field $value]"
}
puts $fout "\}"
puts $fout "array set ::KIT \{"
foreach {field value} [lsort -stride 2 [array get ::KIT]] {
puts $fout " [list $field $value]"
}
puts $fout "\}"
close $fout
if {$build(libtoadkit.a)} {
::practcl::library create LIBTOADKIT {
name libtoadkit
localpath libtoadkit
}
foreach {f v} [array get ::TCL] {
LIBTOADKIT define set [string toupper $f] $v
}
foreach {f v} [array get ::project] {
LIBTOADKIT define set [string toupper $f] $v
}
LIBTOADKIT define set EXTRA_CFLAGS $::KIT(EXTRA_CFLAGS)
puts "CC: [LIBTOADKIT define get CC]"
puts "EXTRA_CFLAGS: [LIBTOADKIT define get EXTRA_CFLAGS]"
LIBTOADKIT define set INCLUDES $::KIT(INCLUDES)
LIBTOADKIT graft module LIBTOADKIT
LIBTOADKIT define print
###
# Compile our resident static C library
###
cd $PWD
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
} {
LIBTOADKIT add [file join $cdir $file]
#COMPILE LIBTOADKIT [file join $cdir $file]
}
set cdir [file join $::HERE generic]
foreach file {
password.c rc4.c tclkit_init.c zvfs.c zvfsboot.c
} {
LIBTOADKIT add [file join $cdir $file]
#COMPILE LIBTOADKIT [file join $cdir $file]
}
set cdir [file join $::HERE $::KIT(platform_src_dir)]
foreach file {
tclsh_packages.c
} {
LIBTOADKIT add [file join $cdir $file]
#COMPILE LIBTOADKIT [file join $cdir $file]
}
if { $::KIT(platform) eq "windows" } {
# tkwinico.c tlink32.c
lappend ::KIT(LIBTOADKIT_OBJS) [file join $_TclSrcDir libtclstub86.a]
} else {
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)
LIBTOADKIT generate-static-library $PWD $::TARGET(libtoadkit.a) $::KIT(EXTRA_CFLAGS)
}
if {$build(packages)} {
###
# Clean out any packages stuffed in the path where packages that
# don't handle DESTROOT properly
###
|
| ︙ | ︙ | |||
543 544 545 546 547 548 549 550 551 552 553 554 555 556 |
file delete -force $BROKENROOT
}
}
}
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)
| > > > > > > > > | 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 |
file delete -force $BROKENROOT
}
}
}
if {$build(tclkit_bare)} {
cd $PWD
if { $::KIT(platform) eq "windows" } {
# tkwinico.c tlink32.c
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 {
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]
}
# 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)
|
| ︙ | ︙ |