From 9d1ece3dcae8dfd00304df6eda0b70b68812fe9e Mon Sep 17 00:00:00 2001 From: Julian Noble Date: Sun, 2 Aug 2026 15:58:19 +1000 Subject: [PATCH] G-155 achieved flip (edits): status + final evidence, index entry -> GOALS-archive record, G-156/G-131 reference sweep, punkproject.toml 0.42.0 + CHANGELOG, bake-product test-pin fixes, layout make.tcl sync riders Assisted-by: harness=claude; primary-model=claude-fable-5; api-location=anthropic.com --- CHANGELOG.md | 22 +++++++++++++++++++ GOALS-archive.md | 4 ++++ GOALS.md | 4 ---- goals/G-131-boot-payload-autodetection.md | 2 +- goals/G-155-mint-stage-vocabulary.md | 16 +++++++++++--- ...G-156-alpha-window-identifier-alignment.md | 13 ++++++----- punkproject.toml | 2 +- .../vendor/punk/project-0.1/src/make.tcl | 6 ++--- .../vendor/punk/basic/src/make.tcl | 6 ++--- .../vendor/punk/project-0.1/src/make.tcl | 6 ++--- .../punkexe/maketclkitlocations.test | 8 +++---- .../testsuites/punkexe/maketclplatform.test | 4 ++-- 12 files changed, 64 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3cbca877..3e3132a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,28 @@ The latest `## [X.Y.Z]` header must match the `version` field in `punkproject.to Entries are newest-first; one bullet per notable change. See the root `AGENTS.md` "Project Versioning" section for the bump policy. +## [0.42.0] - 2026-08-02 + +- Stage-true vocabulary part 2 (G-155): make.tcl speaks strict stage verbs - + build = compile (buildsuites/tool only), mint = stamp/pack modules from src + into the projectroot trees (the modules/libs/packages subcommands), promote + = the bootsupport/vfscommonupdate gates, bake = kit assembly. `make.tcl + workflow` now opens with a TERMINOLOGY key and the charter reads "one mint + stage, two promotion gates, one bake"; help/summaries/guidance swept. +- Recapped warning tag renamed BUILD-WARNING -> BAKE-WARNING (every emitter is + bake-domain; PROVENANCE-WARNING unchanged). Grep contracts and test pins + updated; captured-output consumers should grep for BAKE-WARNING. +- Stage workdirs renamed to teach the vocabulary: kit assembly now uses + src/_bake (was src/_build) and module staging /_mint; + src/buildsuites/_build keeps its name (true compile area). Ignore rules + updated in git + fossil; stale _build dirs are inert leftovers. +- bakelist deployed-state token nobuild -> nobake; detail label "bake + product:". punk::mix::base 0.2.0 renames get_build_workdir -> + get_bake_workdir (legacy alias retained) and retires the dead vfs-cksums + quartet; punk::mix::cli 0.6.0 stages modpods under _mint; + punkboot::utils 0.6.2 wording. build_modules_from_source_to_base keeps its + name (punkcheck installer identity - G-156 owns any rename). + ## [0.41.4] - 2026-08-02 - Generated projects complete their trailing fossil initial commit (G-146): diff --git a/GOALS-archive.md b/GOALS-archive.md index d250ab43..6ba248ac 100644 --- a/GOALS-archive.md +++ b/GOALS-archive.md @@ -306,3 +306,7 @@ Acceptance: In c:/repo/jn/tclparser_punk under the pinned zig 0.16.0, 'zig build ### G-101 [achieved 2026-08-02] kit container strategy for zig-built Tcl 8.6 runtimes (no zipfs) → detail: goals/archive/G-101-tcl86-kit-container-strategy.md Scope: investigation + decision record under src/buildsuites/suite_tcl86/ (or successor mechanism); src/buildsuites/suite_tcl86/patches/ (tracked sdx wrap.tcl provenance capture); TEMP_REFERENCE/{metakit_jnorthrup,KitCreator,kbs,sdx,tcl9} (read-only guidance - inventory in the detail file); src/runtime/mapvfs.toml ('kit' type consumers); src/make.tcl kit-wrap path (as consumer); bin/sdx.kit (the tracked wrapping tool - provenance is part of this goal) Acceptance: the candidate containers are assessed and recorded here against punkshell's kit expectations (compatibility with make.tcl's 'kit' wrap path or a documented replacement path; boot-time vfs mount without an installed Tcl; loading binary dlls from or via the container; buildable from source under the zig-only policy); one strategy is demonstrated end-to-end - a kit wrapped from the suite-built 8.6 runtime boots on a path without any Tcl installation and runs a script from inside its vfs; the decision, rationale, and the follow-on work needed to reach punk86-kit parity are recorded in this file. + +### G-155 [achieved 2026-08-02] Stage-true vocabulary part 2: mint stage named, build reserved for compiling, _mint/_bake workdirs → detail: goals/archive/G-155-mint-stage-vocabulary.md +Scope: src/make.tcl (SUMMARIES/HELPTEXTS/SUBGROUPS, workflow_text + new TERMINOLOGY block, BUILD-WARNING -> BAKE-WARNING, bakelist vocabulary, workdir paths); src/modules/punk/mix/base-999999.0a1.0.tm + src/modules/punk/mix/cli-999999.0a1.0.tm (workdir paths, antidir/antipattern/reserved lists, legacy vfs-cksums trio disposition); src/vfs/_config/punk_main.tcl + src/vfs/_config/project_main.tcl (dev-mode src/_build path logic); .gitignore + .fossil-settings/ignore-glob (_build glob split per dual-VCS derivation); src/project_layouts (make.tcl copies, gitignore.in + ignore-glob payloads, via established sync channels); src/tests/shell/testsuites/punkexe/ + src/tests/modules/punkboot/ + src/tests/modules/punkcheck/ (pinned tokens: BUILD-WARNING, nobuild, _build paths); AGENTS.md + src/AGENTS.md + src/modules/AGENTS.md + src/vfs/AGENTS.md + src/runtime/AGENTS.md + bin/AGENTS.md + README.md + src/README.md + ARCHITECTURE.md (prose sweep); GOALS.md G-029 entry title (coordinated proposal-first edit) +Acceptance: (1) 'make.tcl help' and 'make.tcl workflow' describe modules/libs/packages with mint vocabulary and no module-stage or bake-domain verb-'build', the persona header reads "one mint stage, two promotion gates, one bake", and the TERMINOLOGY block renders in workflow output; (2) every recap-warning emit site prints BAKE-WARNING (PROVENANCE-WARNING untouched) and BUILD-WARNING survives only in historical records (CHANGELOG, GOALS-archive.md, goals/archive/); (3) on a clean checkout 'make.tcl bakehouse -confirm 0' completes with kit products in src/_bake and module staging under per-srcdir _mint folders, kits byte-comparable to same-tree pre-rename products (allowing only known-nondeterministic zip metadata), src/buildsuites/_build untouched and no new _build content created outside src/buildsuites; (4) bakelist's deployed-state vocabulary agrees with the rename (nobuild -> nobake or a recorded keep-decision) and the punk::mix vfs-cksums trio (store_vfs_build_cksums calls the undefined get_vfs_build_cksums) is repaired or retired; (5) ignore rules updated in both VCS per the derivation rules, layout make.tcl + ignore payloads synced, templates modpod repacked, docs in Scope swept, pinned testsuites updated and passing against kits baked under the new vocabulary, and the project version bumped with a CHANGELOG entry. diff --git a/GOALS.md b/GOALS.md index bf4a4915..7747e808 100644 --- a/GOALS.md +++ b/GOALS.md @@ -406,10 +406,6 @@ Detail: goals/G-150-cmdhelp-form-narrowing.md Scope: src/modules/punk/args-999999.0a1.0.tm (parse-result presentation); src/tests/modules/punk/args/testsuites/args/ Detail: goals/G-151-punkargs-annotated-success-render.md -### G-155 [active] Stage-true vocabulary part 2: mint stage named, build reserved for compiling, _mint/_bake workdirs -Scope: src/make.tcl (SUMMARIES/HELPTEXTS/SUBGROUPS, workflow_text + new TERMINOLOGY block, BUILD-WARNING -> BAKE-WARNING, bakelist vocabulary, workdir paths); src/modules/punk/mix/base-999999.0a1.0.tm + src/modules/punk/mix/cli-999999.0a1.0.tm (workdir paths, antidir/antipattern/reserved lists, legacy vfs-cksums trio disposition); src/vfs/_config/punk_main.tcl + src/vfs/_config/project_main.tcl (dev-mode src/_build path logic); .gitignore + .fossil-settings/ignore-glob (_build glob split per dual-VCS derivation); src/project_layouts (make.tcl copies, gitignore.in + ignore-glob payloads, via established sync channels); src/tests/shell/testsuites/punkexe/ + src/tests/modules/punkboot/ + src/tests/modules/punkcheck/ (pinned tokens: BUILD-WARNING, nobuild, _build paths); AGENTS.md + src/AGENTS.md + src/modules/AGENTS.md + src/vfs/AGENTS.md + src/runtime/AGENTS.md + bin/AGENTS.md + README.md + src/README.md + ARCHITECTURE.md (prose sweep); GOALS.md G-029 entry title (coordinated proposal-first edit) -Detail: goals/G-155-mint-stage-vocabulary.md - ### G-156 [proposed] Alpha-window identifier alignment: persisted build-named identities renamed while consumers are none, with derived-project census Scope: src/modules/punk/mix/cli-999999.0a1.0.tm + src/modules/punk/mix/base-999999.0a1.0.tm (mint-named installer surface, identity migration); src/make.tcl (BUILDCOPY -> BAKECOPY, identity references, buildversion.txt readers); modules/.punkcheck + derived-project .punkcheck ledgers (identity migration or accepted re-record); src/modules/*-buildversion.txt sidecar convention + module-header boilerplate (disposition decided at activation); scriptlib/developer/ (census scanner + committed census report); src/project_layouts + src/modules/punk/mix/#modpod-templates-999999.0a1.0/ (re-seeded identities via established sync channels); machine-wide census over user-confirmed roots (fossil config-db enumeration + bounded filesystem scan, punkorigin.toml + pre-G-087 marker fallbacks, siblings incl c:/repo/jn/tclmodules/tomlish + c:/repo/jn/serversecretsync + c:/repo/jn/punkbin); punkbin repo schema fields (build_id, build_sha1sums.tcl - disposition only) Detail: goals/G-156-alpha-window-identifier-alignment.md diff --git a/goals/G-131-boot-payload-autodetection.md b/goals/G-131-boot-payload-autodetection.md index a863c91f..063b0ba6 100644 --- a/goals/G-131-boot-payload-autodetection.md +++ b/goals/G-131-boot-payload-autodetection.md @@ -124,7 +124,7 @@ independently-written branches. already a both-capability row this goal's mismatch-check work must accommodate). - G-133 (archived) recorded the payload/target failure-report vocabulary this goal's kit_type_mismatch rework should read as one voice with ("payload/target arch mismatch - in kit (target ) ...", recapped BUILD-WARNINGs), and its smoke-require probe + in kit (target ) ...", recapped BAKE-WARNINGs - retagged under G-155, achieved 2026-08-02), and its smoke-require probe runs the built artifact via the tclsh subcommand - another consumer of the runtime_caps /probe surface being reworked here - see goals/archive/G-133-bake-payload-consistency-checks.md. - G-127 (achieved 2026-07-31, archived) landed the sibling output half of the kit loop diff --git a/goals/G-155-mint-stage-vocabulary.md b/goals/G-155-mint-stage-vocabulary.md index dba68f97..a8d61a44 100644 --- a/goals/G-155-mint-stage-vocabulary.md +++ b/goals/G-155-mint-stage-vocabulary.md @@ -1,6 +1,6 @@ # G-155 stage-true vocabulary part 2: mint stage named, build reserved for compiling, _mint/_bake workdirs -Status: active +Status: achieved 2026-08-02 Scope: src/make.tcl (SUMMARIES/HELPTEXTS/SUBGROUPS, workflow_text + new TERMINOLOGY block, BUILD-WARNING -> BAKE-WARNING, bakelist vocabulary, workdir paths); src/modules/punk/mix/base-999999.0a1.0.tm + src/modules/punk/mix/cli-999999.0a1.0.tm (workdir paths, antidir/antipattern/reserved lists, legacy vfs-cksums trio disposition); src/vfs/_config/punk_main.tcl + src/vfs/_config/project_main.tcl (dev-mode src/_build path logic); .gitignore + .fossil-settings/ignore-glob (_build glob split per dual-VCS derivation); src/project_layouts (make.tcl copies, gitignore.in + ignore-glob payloads, via established sync channels); src/tests/shell/testsuites/punkexe/ + src/tests/modules/punkboot/ + src/tests/modules/punkcheck/ (pinned tokens: BUILD-WARNING, nobuild, _build paths); AGENTS.md + src/AGENTS.md + src/modules/AGENTS.md + src/vfs/AGENTS.md + src/runtime/AGENTS.md + bin/AGENTS.md + README.md + src/README.md + ARCHITECTURE.md (prose sweep); GOALS.md G-029 entry title (coordinated proposal-first edit) Goal: The pipeline vocabulary is stage-true end to end: 'build' means compiling source to binary and lives only in the arm's-length factories (buildsuite, tool), the src -> projectroot packaging stage is named 'mint' (stamp real versions, pack modpods, prune superseded, install) with packages/modules/libs keeping their G-112 subcommand names, bake-domain prose and tags stop borrowing 'build' (BAKE-WARNING, bake product, rebake), the workdirs teach the same words (src/_bake for kit assembly, per-srcdir _mint for module staging, src/buildsuites/_build unchanged), and ::punkboot::workflow_text carries a TERMINOLOGY block defining the stage verbs so the vocabulary travels into layout copies and generated projects. Acceptance: (1) 'make.tcl help' and 'make.tcl workflow' describe modules/libs/packages with mint vocabulary and no module-stage or bake-domain verb-'build', the persona header reads "one mint stage, two promotion gates, one bake", and the TERMINOLOGY block renders in workflow output; (2) every recap-warning emit site prints BAKE-WARNING (PROVENANCE-WARNING untouched) and BUILD-WARNING survives only in historical records (CHANGELOG, GOALS-archive.md, goals/archive/); (3) on a clean checkout 'make.tcl bakehouse -confirm 0' completes with kit products in src/_bake and module staging under per-srcdir _mint folders, kits byte-comparable to same-tree pre-rename products (allowing only known-nondeterministic zip metadata), src/buildsuites/_build untouched and no new _build content created outside src/buildsuites; (4) bakelist's deployed-state vocabulary agrees with the rename (nobuild -> nobake or a recorded keep-decision) and the punk::mix vfs-cksums trio (store_vfs_build_cksums calls the undefined get_vfs_build_cksums) is repaired or retired; (5) ignore rules updated in both VCS per the derivation rules, layout make.tcl + ignore payloads synced, templates modpod repacked, docs in Scope swept, pinned testsuites updated and passing against kits baked under the new vocabulary, and the project version bumped with a CHANGELOG entry. @@ -123,8 +123,18 @@ pre-approved): 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, - vfscommonupdate, full bakehouse, punkexe suites), project version bump + CHANGELOG, DOX closeout. +- 2026-08-02 increment B + ACHIEVED flip: punk_main/project_main dev-mode comments follow src/_bake + and the modpod scan skips _mint/_bake staging (legacy _build kept); vfscommonupdate promoted the + payload (punk::mix 0.2.0/0.6.0, punkboot::utils 0.6.2, punk::lib 0.6.0 + riders punk::args 0.14.0, + tclparser 0.1.0, layout 0.3.0, project 0.4.1); full 'bakehouse -confirm 0' green - 11 kits + INSTALLED, recap = only the three known pre-existing warnings now tagged BAKE-WARNING, all + guidance in mint/bake vocabulary, fresh punk905 payload spot-checked carrying the four updated + modules; steady state creates no _build content (mtime proof: src/modules/_build untouched by the + bakehouse). Suites: punkexe + punkboot + punkcheck sweep 268 tests / 264 passed / 4 skipped / + 0 failed (native tclsh90, -jobs 16; three initially-missed 'bake product:' label regexps fixed in + maketclkitlocations + maketclplatform). Live-tier gates: nobuild absent from code/tests; + BUILD-WARNING remains only in historical records, dead old-workdir leftovers and this file's dated + survey prose. punkproject.toml 0.42.0 + CHANGELOG entry; projectversion check OK. - Manual leftover (deliberate): old src/_build + src/modules/_build + src/modules/test/_build left in place (ignored, inert - src/modules/_build holds a #tarjar staging copy; tarjar disposition is user-manual per standing note). Delete at leisure. diff --git a/goals/G-156-alpha-window-identifier-alignment.md b/goals/G-156-alpha-window-identifier-alignment.md index 1d9ad301..50fd50cb 100644 --- a/goals/G-156-alpha-window-identifier-alignment.md +++ b/goals/G-156-alpha-window-identifier-alignment.md @@ -33,7 +33,9 @@ Candidate work-list (G-155's identifier keep-list, promoted): punk::mix::commandset::module, layout seeds, docs. Disposition at activation: rename (e.g. mintversion.txt, readers accepting both during transition) vs keep-with-recorded-reading ("the version stamped when minted"). -- If G-155 lands with keeps on get_build_workdir or bakelist's nobuild token, those fold in here. +- (Resolved 2026-08-02: G-155 achieved with both renamed - get_bake_workdir landed with a legacy + alias whose retirement is this goal's decision, and bakelist says nobake - so nothing folds in + from there beyond the alias-retirement question.) - Internal locals (build_warnings_pending, building_runtime, module_build_version, kit_builddir) - opportunistic, zero contract weight. - Stays out of scope even under the window: build.zig/build.zig.zon, tcl::build-info, kettle's @@ -42,8 +44,8 @@ Candidate work-list (G-155's identifier keep-list, promoted): ## Approach Ordering: census FIRST (it prices every rename decision), then punkshell renames, then re-seeded -layouts/templates, then per-project reconciliation. Runs after G-155 or in the same window - this -goal presupposes the mint/bake vocabulary. +layouts/templates, then per-project reconciliation. Runs after G-155 (achieved 2026-08-02) - the +mint/bake vocabulary this goal presupposes is landed. Census tool (scriptlib/developer, name decided in the work): @@ -115,8 +117,9 @@ src/modules/punk/mix surfaced G-069 (scriptlib neighbour, unrelated), G-066 (pun the buildversion.txt disposition does not touch its repackaging surface) and G-155; punkcheck has no live intersecting goals. Related lines below record the real relationships. -Related: G-155 (predecessor, proposed - its identifier keep-list is this goal's candidate work-list; -this goal presupposes its mint/bake vocabulary; ordering: G-155 first or same window) +Related: G-155 (predecessor, achieved 2026-08-02 - see goals/archive/G-155-mint-stage-vocabulary.md; +its identifier keep-list is this goal's candidate work-list and the mint/bake vocabulary is landed; +the get_build_workdir legacy alias retirement decision transfers here) Related: G-027 (this goal's census is its requirements-gathering and its punkorigin.toml carrier is the census's primary marker; reconciliation here is one-time catch-up via the existing push flow, never the pull system itself - G-027 stays the durable mechanism; its docs-ownership split governs diff --git a/punkproject.toml b/punkproject.toml index 464946c0..bcae49ae 100644 --- a/punkproject.toml +++ b/punkproject.toml @@ -1,6 +1,6 @@ [project] name = "punkshell" -version = "0.41.4" +version = "0.42.0" license = "BSD-2-Clause" url = "https://www.gitea1.intx.com.au/jn/punkshell" #packager: declared identity for published artifacts (declarative, not proof - diff --git a/src/modules/punk/mix/#modpod-templates-999999.0a1.0/templates/project_layouts/vendor/punk/project-0.1/src/make.tcl b/src/modules/punk/mix/#modpod-templates-999999.0a1.0/templates/project_layouts/vendor/punk/project-0.1/src/make.tcl index ec134c79..9db306a6 100644 --- a/src/modules/punk/mix/#modpod-templates-999999.0a1.0/templates/project_layouts/vendor/punk/project-0.1/src/make.tcl +++ b/src/modules/punk/mix/#modpod-templates-999999.0a1.0/templates/project_layouts/vendor/punk/project-0.1/src/make.tcl @@ -9435,10 +9435,10 @@ if {[llength $failed_kits]} { } set had_kits [expr {[llength $installed_kits] || [llength $failed_kits] || [llength $skipped_kits]}] if {$had_kits} { - puts stdout " module builds and kit/zipkit builds processed (kit mapping: src/runtime/mapvfs.toml)" - puts stdout " - use 'make.tcl modules' to build modules without baking the vfs folders into executable kits/zipkits" + puts stdout " module mint and kit/zipkit bakes processed (kit mapping: src/runtime/mapvfs.toml)" + puts stdout " - use 'make.tcl modules' to mint modules without baking the vfs folders into executable kits/zipkits" puts stdout " - use 'make.tcl vfscommonupdate' to promote minted modules into the base vfs folder /src/vfs/_vfscommon.vfs (promotion gate)" - puts stdout " - Note that without the vfscommonupdate step, 'make.tcl bake' (the kit-assembly stage of 'make.tcl bakehouse') will build vfs based executables" + puts stdout " - Note that without the vfscommonupdate step, 'make.tcl bake' (the kit-assembly stage of 'make.tcl bakehouse') will bake vfs based executables" puts stdout " that include your current custom vfs folders in src/vfs, but with a _vfscommon.vfs that doesn't have the latest minted modules" puts stdout " calling 'builtexename(.exe) dev' will allow testing of minted modules before they are baked into the kits/zipkits via 'vfscommonupdate' then 'bake'" } else { diff --git a/src/project_layouts/vendor/punk/basic/src/make.tcl b/src/project_layouts/vendor/punk/basic/src/make.tcl index ec134c79..9db306a6 100644 --- a/src/project_layouts/vendor/punk/basic/src/make.tcl +++ b/src/project_layouts/vendor/punk/basic/src/make.tcl @@ -9435,10 +9435,10 @@ if {[llength $failed_kits]} { } set had_kits [expr {[llength $installed_kits] || [llength $failed_kits] || [llength $skipped_kits]}] if {$had_kits} { - puts stdout " module builds and kit/zipkit builds processed (kit mapping: src/runtime/mapvfs.toml)" - puts stdout " - use 'make.tcl modules' to build modules without baking the vfs folders into executable kits/zipkits" + puts stdout " module mint and kit/zipkit bakes processed (kit mapping: src/runtime/mapvfs.toml)" + puts stdout " - use 'make.tcl modules' to mint modules without baking the vfs folders into executable kits/zipkits" puts stdout " - use 'make.tcl vfscommonupdate' to promote minted modules into the base vfs folder /src/vfs/_vfscommon.vfs (promotion gate)" - puts stdout " - Note that without the vfscommonupdate step, 'make.tcl bake' (the kit-assembly stage of 'make.tcl bakehouse') will build vfs based executables" + puts stdout " - Note that without the vfscommonupdate step, 'make.tcl bake' (the kit-assembly stage of 'make.tcl bakehouse') will bake vfs based executables" puts stdout " that include your current custom vfs folders in src/vfs, but with a _vfscommon.vfs that doesn't have the latest minted modules" puts stdout " calling 'builtexename(.exe) dev' will allow testing of minted modules before they are baked into the kits/zipkits via 'vfscommonupdate' then 'bake'" } else { diff --git a/src/project_layouts/vendor/punk/project-0.1/src/make.tcl b/src/project_layouts/vendor/punk/project-0.1/src/make.tcl index ec134c79..9db306a6 100644 --- a/src/project_layouts/vendor/punk/project-0.1/src/make.tcl +++ b/src/project_layouts/vendor/punk/project-0.1/src/make.tcl @@ -9435,10 +9435,10 @@ if {[llength $failed_kits]} { } set had_kits [expr {[llength $installed_kits] || [llength $failed_kits] || [llength $skipped_kits]}] if {$had_kits} { - puts stdout " module builds and kit/zipkit builds processed (kit mapping: src/runtime/mapvfs.toml)" - puts stdout " - use 'make.tcl modules' to build modules without baking the vfs folders into executable kits/zipkits" + puts stdout " module mint and kit/zipkit bakes processed (kit mapping: src/runtime/mapvfs.toml)" + puts stdout " - use 'make.tcl modules' to mint modules without baking the vfs folders into executable kits/zipkits" puts stdout " - use 'make.tcl vfscommonupdate' to promote minted modules into the base vfs folder /src/vfs/_vfscommon.vfs (promotion gate)" - puts stdout " - Note that without the vfscommonupdate step, 'make.tcl bake' (the kit-assembly stage of 'make.tcl bakehouse') will build vfs based executables" + puts stdout " - Note that without the vfscommonupdate step, 'make.tcl bake' (the kit-assembly stage of 'make.tcl bakehouse') will bake vfs based executables" puts stdout " that include your current custom vfs folders in src/vfs, but with a _vfscommon.vfs that doesn't have the latest minted modules" puts stdout " calling 'builtexename(.exe) dev' will allow testing of minted modules before they are baked into the kits/zipkits via 'vfscommonupdate' then 'bake'" } else { diff --git a/src/tests/shell/testsuites/punkexe/maketclkitlocations.test b/src/tests/shell/testsuites/punkexe/maketclkitlocations.test index e39558ef..2ef4f4bc 100644 --- a/src/tests/shell/testsuites/punkexe/maketclkitlocations.test +++ b/src/tests/shell/testsuites/punkexe/maketclkitlocations.test @@ -134,11 +134,11 @@ namespace eval ::testspace { #legitimately appear on a host without the runtime - only the location notes matter) lappend result natrow [regexp {(?n)^fixnat\s+zip\s+tclsfe-x64\s+punk9wintk903\.vfs\s} $out] lappend result natnonotes [expr {![regexp {(?n)^fixnat\s.*(target=|out=)} $out]}] - lappend result natbuild [regexp {(?n)^\s+build product: src/_bake/fixnat\.exe } $out] + lappend result natbuild [regexp {(?n)^\s+bake product:\s+src/_bake/fixnat\.exe } $out] lappend result natdeploy [regexp {(?n)^\s+deployed:\s+bin/fixnat\.exe } $out] #non-default-target row: kits// tier both sides, suffixless for linux lappend result linrow [regexp {(?n)^fixlin\s+kit\s+tclkit-902-Linux64-intel-dyn\s+punk9wintk903\.vfs\s+\S+\s.*target=linux-x86_64 out=kits/linux-x86_64/} $out] - lappend result linbuild [regexp {(?n)^\s+build product: src/_bake/kits/linux-x86_64/fixlin } $out] + lappend result linbuild [regexp {(?n)^\s+bake product:\s+src/_bake/kits/linux-x86_64/fixlin } $out] lappend result lindeploy [regexp {(?n)^\s+deployed:\s+bin/kits/linux-x86_64/fixlin } $out] set result } -result {timedout 0 exitcode 0 natrow 1 natnonotes 1 natbuild 1 natdeploy 1 linrow 1 linbuild 1 lindeploy 1} @@ -159,8 +159,8 @@ namespace eval ::testspace { #the pre-G-127 behaviour disambiguated the second row by RUNTIME name - pin its absence lappend result norename [expr {![regexp {(?n)^fixsame_} $out]}] #distinct artifacts by construction: same name, two tiers, suffix follows target - lappend result linbuild [regexp {(?n)^\s+build product: src/_bake/kits/linux-x86_64/fixsame } $out] - lappend result ixbuild [regexp {(?n)^\s+build product: src/_bake/kits/win32-ix86/fixsame\.exe } $out] + lappend result linbuild [regexp {(?n)^\s+bake product:\s+src/_bake/kits/linux-x86_64/fixsame } $out] + lappend result ixbuild [regexp {(?n)^\s+bake product:\s+src/_bake/kits/win32-ix86/fixsame\.exe } $out] set result } -result {timedout 0 exitcode 0 linrow 1 ixrow 1 norename 1 linbuild 1 ixbuild 1} diff --git a/src/tests/shell/testsuites/punkexe/maketclplatform.test b/src/tests/shell/testsuites/punkexe/maketclplatform.test index f09695d2..e079bf58 100644 --- a/src/tests/shell/testsuites/punkexe/maketclplatform.test +++ b/src/tests/shell/testsuites/punkexe/maketclplatform.test @@ -202,9 +202,9 @@ namespace eval ::testspace { lappend result row [regexp {(?n)^punkshell902\s+kit\s+tclkit-902-Linux64-intel-dyn\s+punk9linux\.vfs\s+\S+\s+target=linux-x86_64 out=kits/linux-x86_64/} $out] lappend result store [regexp {(?n)^\s+runtime file:\s+bin/runtime/linux-x86_64/tclkit-902-Linux64-intel-dyn \(present\)} $out] lappend result target [regexp {(?n)^\s+target:\s+linux-x86_64 \(declared in the kit mapping\)} $out] - #linux target -> no .exe on the build product or the deployed artifact + #linux target -> no .exe on the bake product or the deployed artifact #(G-127: a non-default-target kit's locations sit under the kits// tier) - lappend result nosuffix [regexp {(?n)^\s+build product: src/_bake/kits/linux-x86_64/punkshell902 } $out] + lappend result nosuffix [regexp {(?n)^\s+bake product:\s+src/_bake/kits/linux-x86_64/punkshell902 } $out] lappend result nosuffix2 [regexp {(?n)^\s+deployed:\s+bin/kits/linux-x86_64/punkshell902 } $out] set result } -result {timedout 0 exitcode 0 row 1 store 1 target 1 nosuffix 1 nosuffix2 1}