Browse Source

make.tcl progress on stdout for testing

master
Julian Noble 1 month ago
parent
commit
68598468cf
  1. 7
      src/bootsupport/modules/punk/libunknown-0.1.tm
  2. 8
      src/bootsupport/modules/punkcheck-0.1.0.tm
  3. 5
      src/modules/punk/libunknown-0.1.tm
  4. 8
      src/modules/punkcheck-0.1.0.tm

7
src/bootsupport/modules/punk/libunknown-0.1.tm

@ -847,23 +847,24 @@ tcl::namespace::eval punk::libunknown {
#keys are in reverse order due to tclPkgUnknown processing order
set ordered_searchpaths [lreverse [dict keys $dict_added]];# ordered as in auto_path
#JN todo - look at tm epochs
dict for {pkg versiond} $refresh_dict {
set versions [dict keys $versiond]
puts stderr "---->pkg:$pkg versions: $versions"
#puts stderr "---->pkg:$pkg versions: $versions"
foreach searchpath $ordered_searchpaths {
set addedinfo [dict get $dict_added $searchpath]
set vidx -1
foreach v $versions {
incr vidx
if {[dict exists $addedinfo $pkg $v]} {
ledit versions $vidx $vidx
ledit versions $vidx $vidx ;incr vidx -1 ;#maintain vidx as index into current state of $versions - not original state the foreach operates across.
set iscript [dict get $addedinfo $pkg $v scr]
#todo - find the iscript in the '$epoch pkg epochs <e> added paths' lists and determine os vs dev vs internal
#(scanning for path directly in the ifneeded script for pkgs is potentially error prone)
#for .tm ifneeded scripts - the syntax is simple enough to determine directly (and ifneeded scr not stored for those anyway)
set justaddedscript [package ifneeded $pkg $v]
if {$justaddedscript ne $iscript} {
puts "---->refreshing $pkg $v - reverting to already stored from path:$searchpath versions: $versions"
#puts "---->refreshing $pkg $v - reverting to already stored from path:$searchpath versions: $versions"
package ifneeded $pkg $v $iscript
#dict set pkgvdone $pkg $v 1
}

8
src/bootsupport/modules/punkcheck-0.1.0.tm

@ -1599,6 +1599,7 @@ namespace eval punkcheck {
#puts stdout "Current target dir: $current_target_dir"
set last_processed_dir ""
foreach m $match_list {
set new_tgt_cksum_info [list]
set relative_target_path [file join $relative_target_dir $m]
@ -1617,6 +1618,13 @@ namespace eval punkcheck {
continue
}
#puts stdout " checking file : $current_source_dir/$m"
set thismatchdir [file dirname $m]
if {$last_processed_dir ne $thismatchdir} {
puts stdout "\n checking files in [file join $current_source_dir $thismatchdir]"
set last_processed_dir $thismatchdir
} else {
puts -nonewline stdout .
}
set ts_start [clock microseconds]
set seconds [expr {$ts_start / 1000000}]
set ts_start_iso [clock format $seconds -format "%Y-%m-%dT%H:%M:%S"]

5
src/modules/punk/libunknown-0.1.tm

@ -847,9 +847,10 @@ tcl::namespace::eval punk::libunknown {
#keys are in reverse order due to tclPkgUnknown processing order
set ordered_searchpaths [lreverse [dict keys $dict_added]];# ordered as in auto_path
#JN todo - look at tm epochs
dict for {pkg versiond} $refresh_dict {
set versions [dict keys $versiond]
puts stderr "---->pkg:$pkg versions: $versions"
#puts stderr "---->pkg:$pkg versions: $versions"
foreach searchpath $ordered_searchpaths {
set addedinfo [dict get $dict_added $searchpath]
set vidx -1
@ -863,7 +864,7 @@ tcl::namespace::eval punk::libunknown {
#for .tm ifneeded scripts - the syntax is simple enough to determine directly (and ifneeded scr not stored for those anyway)
set justaddedscript [package ifneeded $pkg $v]
if {$justaddedscript ne $iscript} {
puts "---->refreshing $pkg $v - reverting to already stored from path:$searchpath versions: $versions"
#puts "---->refreshing $pkg $v - reverting to already stored from path:$searchpath versions: $versions"
package ifneeded $pkg $v $iscript
#dict set pkgvdone $pkg $v 1
}

8
src/modules/punkcheck-0.1.0.tm

@ -1599,6 +1599,7 @@ namespace eval punkcheck {
#puts stdout "Current target dir: $current_target_dir"
set last_processed_dir ""
foreach m $match_list {
set new_tgt_cksum_info [list]
set relative_target_path [file join $relative_target_dir $m]
@ -1617,6 +1618,13 @@ namespace eval punkcheck {
continue
}
#puts stdout " checking file : $current_source_dir/$m"
set thismatchdir [file dirname $m]
if {$last_processed_dir ne $thismatchdir} {
puts stdout "\n checking files in [file join $current_source_dir $thismatchdir]"
set last_processed_dir $thismatchdir
} else {
puts -nonewline stdout .
}
set ts_start [clock microseconds]
set seconds [expr {$ts_start / 1000000}]
set ts_start_iso [clock format $seconds -format "%Y-%m-%dT%H:%M:%S"]

Loading…
Cancel
Save