diff --git a/goals/G-155-mint-stage-vocabulary.md b/goals/G-155-mint-stage-vocabulary.md index aae8233e..dba68f97 100644 --- a/goals/G-155-mint-stage-vocabulary.md +++ b/goals/G-155-mint-stage-vocabulary.md @@ -116,10 +116,11 @@ pre-approved): - 2026-08-02 increment A verification bake: fresh src/_bake full bake, 11 kits INSTALLED zero failures (11m29s cold ledger). Byte-compare vs pre-rename snapshot (51 files): 35 byte-identical (incl punk86/punksys/punk905/punkluck86/punkshell902 + all sidecars); 11 missing all accounted - (bake_default=false punkdeclare, punkmagic runtime-absent, pre-G-127 flat punk91ix86 orphans - - tier copy baked correctly, stale experiment stubs); 5 differ (punkbi punk91 punk902z punk9_beta - punk9bi_beta) with EVERY member CRC identical - old products predate the G-126 punkzip - deterministic-assembly switch (directory entries + different ratios = older creator), stale + (bake_default=false punkdeclare, punkmagic runtime-absent, flat punk91ix86 orphans predating + G-127 (achieved - goals/archive/G-127-crosstarget-vfs-bake.md) - tier copy baked correctly, stale + experiment stubs); 5 differ (punkbi punk91 punk902z punk9_beta punk9bi_beta) with EVERY member CRC + identical - old products predate the punkzip deterministic-assembly switch of G-126 (achieved - + goals/archive/G-126-punkzip-accelerator.md) (directory entries + different ratios = older creator), stale baselines masquerading as 'current', not a rename delta. punk905 identical while sharing punk9_beta's vfs clinches it. - Remaining for acceptance: increment B (punk_main/project_main dev-mode _bake logic, diff --git a/src/vfs/_config/project_main.tcl b/src/vfs/_config/project_main.tcl index c3eb9aab..96520cb4 100644 --- a/src/vfs/_config/project_main.tcl +++ b/src/vfs/_config/project_main.tcl @@ -901,7 +901,7 @@ apply { args { tcl::tm::add {*}[lreverse $new_tm_list] - #If it looks like we are running the vfs/_build/exename.vfs/main.tcl from an external tclsh - try to use vfs folders to simulate kit state + #If it looks like we are running the vfs/_bake/exename.vfs/main.tcl from an external tclsh - try to use vfs folders to simulate kit state #set script_relative_lib [file normalize [file join [file dirname [info script]] lib]] #set scriptdir [file dirname [info script]] set scriptdir [file dirname $normscript] @@ -917,9 +917,9 @@ apply { args { #presumably running the vfs/xxx.vfs/main.tcl script using a non-kit tclsh that doesn't have starkit lib or mounted zipfs/cookfs available.. lets see if we can move forward anyway set vfscontainer [file normalize [file dirname $scriptdir]] #set vfscommon [file join $vfscontainer _vfscommon] - #we shouldn't be targetting the src/vfs folders - use src/_build/exename.vfs instead + #we shouldn't be targetting the src/vfs folders - use src/_bake/exename.vfs instead set vfsdir [file normalize $scriptdir] - set projectroot [file dirname [file dirname $vfscontainer]] ;#back below src/_build/exename.vfs/main.tcl + set projectroot [file dirname [file dirname $vfscontainer]] ;#back below src/_bake/exename.vfs/main.tcl puts stdout "no starkit. projectroot?: $projectroot executable:[info nameofexecutable]" puts stdout "info lib: [info library]" diff --git a/src/vfs/_config/punk_main.tcl b/src/vfs/_config/punk_main.tcl index 21b02b48..6d9ea847 100644 --- a/src/vfs/_config/punk_main.tcl +++ b/src/vfs/_config/punk_main.tcl @@ -1253,7 +1253,7 @@ apply { args { tcl::tm::add {*}[lreverse $new_tm_list] - #If it looks like we are running the vfs/_build/exename.vfs/main.tcl from an external tclsh - try to use vfs folders to simulate kit state + #If it looks like we are running the vfs/_bake/exename.vfs/main.tcl from an external tclsh - try to use vfs folders to simulate kit state #set script_relative_lib [file normalize [file join [file dirname [info script]] lib]] #set scriptdir [file dirname [info script]] set scriptdir [file dirname $normscript] @@ -1269,9 +1269,9 @@ apply { args { #presumably running the vfs/xxx.vfs/main.tcl script using a non-kit tclsh that doesn't have starkit lib or mounted zipfs/cookfs available.. lets see if we can move forward anyway set vfscontainer [file normalize [file dirname $scriptdir]] #set vfscommon [file join $vfscontainer _vfscommon] - #we shouldn't be targetting the src/vfs folders - use src/_build/exename.vfs instead + #we shouldn't be targetting the src/vfs folders - use src/_bake/exename.vfs instead set vfsdir [file normalize $scriptdir] - set projectroot [file dirname [file dirname $vfscontainer]] ;#back below src/_build/exename.vfs/main.tcl + set projectroot [file dirname [file dirname $vfscontainer]] ;#back below src/_bake/exename.vfs/main.tcl puts stdout "no starkit. projectroot?: $projectroot executable:[info nameofexecutable]" puts stdout "info lib: [info library]" @@ -1384,8 +1384,8 @@ apply { args { #recursive glob for #modpod-* directories (Tcl 8.6+ supports ** in glob) set modpod_dirs [list] foreach found [glob -nocomplain -type d -directory $src_modules_dir ** #modpod-*] { - #skip _build subdirectories - if {[string match "*_build*" $found]} { continue } + #skip staging subdirectories (_mint; legacy _build; _bake defensively) + if {[string match "*_build*" $found] || [string match "*_mint*" $found] || [string match "*_bake*" $found]} { continue } lappend modpod_dirs $found } foreach modpod_dir $modpod_dirs {