Upgrade Toolshed 2.5 -> 2.6.0 and BASIC-To-6809 v5.33 -> v5.35 - #76
Merged
Conversation
Toolshed v2.6.0 gives its unix Makefile a standard prefix/bindir/docdir and honours DESTDIR against /usr/local, instead of hardcoding $(DESTDIR)/usr/bin. That retires the workaround in the stage: rather than installing into the real prefix and hand-copying ten named binaries plus the share directory into /staging, the stage now just installs with DESTDIR=/staging. The installed set is unchanged -- upstream's APPS list is exactly the set the old loop copied. One path moves as a result: ToolShed.html now lands in /usr/local/share/doc/toolshed/ rather than /usr/local/share/toolshed/, which is upstream's new docdir and matches the convention basto6809.pdf already uses. Nothing in the repo referenced the old location. BASIC-To-6809 has no tags, so it stays pinned by SHA with the version carried in the zip name; v5.35 is the only release left in Binary_Versions (5.33 has since moved to Old_Versions). The archive's internal directory name is unchanged, so the sparse-checkout and unzip paths still hold. Verified on arm64: make lint is clean, both stages build (Toolshed's own unit tests pass during the build), the banners report Toolshed 2.6.0 and BasTo6809 V5.35, and basto6809todsk still drives BasTo6809 -> lwasm -> decb to produce a DSK that decb dir reads back. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Upgrades two pinned tools to their current upstream releases.
Toolshed
v2_5->v2.6.0Upstream switched to dotted tag names, and v2.6.0 reworked the unix Makefile to
use a standard
prefix/bindir/docdirthat honoursDESTDIRagainst/usr/local, instead of hardcoding$(DESTDIR)/usr/bin.That retires the workaround in the stage. Rather than installing into the real
prefix and then hand-copying ten named binaries plus the share directory into
/staging, the stage now just installs withDESTDIR=/staging, which is whatthe comment there had been apologising for. The installed set is unchanged --
upstream's
APPSlist is exactly the set the old loop copied. (casmexists inthe tree but upstream still doesn't build it, in either version.)
One path moves as a result:
ToolShed.htmlnow lands in/usr/local/share/doc/toolshed/rather than/usr/local/share/toolshed/. Thatis upstream's new
docdir, not a choice made here, and it matches theconvention
basto6809.pdfalready uses. Nothing in the repo referenced the oldlocation.
BASIC-To-6809
v5.33->v5.35The repo has no tags, so it stays pinned by SHA with the version carried in the
zip name. v5.35 is the only release left in
Binary_Versions/-- 5.33 has sincemoved to
Old_Versions/. Confirmed thatManual.pdfand both arch zips existat the new SHA and that the archive's internal directory name is unchanged, so
the sparse-checkout and
unzip/mvpaths still hold.Verification
Run locally on arm64:
make lint-- shellcheck + hadolint clean.decb from Toolshed 2.6.0,BasTo6809 ... V5.35.basto6809todsk HELLO.BASdrivingBasTo6809 ->
lwasm->decb dskini/copy/attr-- producing a DSK thatdecb dirreads back.Only the two changed stages were built, not a full
make build && make test,which pulls in the ~30-minute MAME compile. Worth a CI run for the x86_64 zip
path, since only the arm64 one could be exercised locally.
No version bump here -- those land on
mainseparately.🤖 Generated with Claude Code