From 748c904729701cf24a07ef678496115155fec83a Mon Sep 17 00:00:00 2001 From: Neil McPhail Date: Sat, 8 Aug 2026 11:36:37 +0100 Subject: [PATCH] Update base to Ubuntu 26.04 and minor version bump for Boriel BASIC with higher python dependency --- .devcontainer/Dockerfile | 11 +++++------ .devcontainer/devcontainer.json | 2 +- README.md | 12 ++++++------ 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index b67946b..5d18589 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -3,7 +3,7 @@ # My current workflow is to build this on an M1 MacBook for both amd64 and arm64 using: # docker buildx build --platform linux/arm64/v8,linux/amd64 -t njmcphail/speccydev:tagname . -FROM ubuntu:24.04 AS build +FROM ubuntu:26.04 AS build RUN apt-get update \ && apt-get install -y --no-install-recommends \ autoconf \ @@ -24,8 +24,7 @@ ADD https://github.com/einar-saukas/ZX0.git /zx0 RUN cd /zx0/src/ \ && gcc -O2 -o zx0 zx0.c optimize.c compress.c memory.c \ && gcc -O2 -o dzx0 dzx0.c -ADD https://www.boriel.com/files/zxb/zxbasic-1.18.7-linux64.tar.gz . -RUN tar xf zxbasic* +ADD --unpack https://www.boriel.com/files/zxb/zxbasic-1.19.0-linux64.tar.gz . ADD https://github.com/Mastodon-/inpaws.git /inpaws RUN cd /inpaws/ \ && make -j8 @@ -44,12 +43,12 @@ RUN cd /opt/pasta80 \ && fpc pasta ADD --unpack https://www.seasip.info/ZX/taptools-1.1.3.tar.gz taptools/ RUN cd taptools/taptools* \ - && cp /usr/share/automake-1.16/config.guess . \ + && cp /usr/share/automake-1.18/config.guess . \ && ./configure \ && make -j8 \ && make install -FROM ubuntu:24.04 +FROM ubuntu:26.04 RUN apt-get update \ && apt-get install -y --no-install-recommends \ ca-certificates \ @@ -76,7 +75,7 @@ COPY --from=build /zxbasic/src /opt/zxbasic/src COPY --from=build /zxbasic/tools /opt/zxbasic/tools COPY --from=build /inpaws/inpaws /bin/inpaws COPY --from=build /usr/local/bin/ /usr/local/bin/ -COPY --from=build /usr/local/lib/python3.12/dist-packages/skoolkit/ /usr/local/lib/python3.12/dist-packages/skoolkit/ +COPY --from=build /usr/local/lib/python3.14/dist-packages/skoolkit/ /usr/local/lib/python3.14/dist-packages/skoolkit/ COPY --from=build /opt/pasta80 /opt/pasta80 # z88dk takes a long time to cross compile so I'm keeping this in a separate container diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 1293129..3824082 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "name": "ZX Spectrum dev tools", //"build": { "dockerfile": "Dockerfile" }, // The Dockerfile takes an age to build due to z88dk, so pull from prebuilt: - "image": "njmcphail/speccydev:v8.3", + "image": "njmcphail/speccydev:v9.0", "remoteUser": "ubuntu", "runArgs": [ "--network=host" diff --git a/README.md b/README.md index 6413baa..2deccd0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Development tools for the ZX Spectrum v8.3 +# Development tools for the ZX Spectrum v9.0 The Dockerfile is the basis of the devcontainer and can be changed to add or remove tools. It will take a long time to build locally, so by default the devcontainer will pull a prebuilt version. Edit `.devcontainer/devcontainer.json` if you would rather build your own. @@ -29,7 +29,7 @@ The devcontainer contains: - tzxlist - zx0 (binary compressor) - dzx0 (binary decompressor) -- ZX BASIC (aka Boriel BASIC) version 1.18.7 +- ZX BASIC (aka Boriel BASIC) version 1.19.0 - zxbc (BASIC compiler) - zxbasm (assembler) - zxbpp (preprocessor) @@ -75,13 +75,13 @@ Several useful VSCode extentsions will be installed, including a Z80 assembly la Thanks to the many authors of these wonderful tools and extensions; to think what we could have made with these in 1985! -## Breaking changes from v7.x +## Breaking changes from v8.x -No breaking changes, but this version brings full support for Apple silicon which was not present in previous releases. +The base has been updated from Ubuntu 24.04 to Ubuntu 26.04, largely to bring in python 3.14 which is required for the current release of Boriel BASIC. This may cause some issues, so please report bugs. z88dk is still being built on 24.04 but should be ABI compatible. Again, please report any bugs you find. -## New additions from v8.2 +## New additions from v8.3 -Minor version update for pasta80. +Minor version update for Boriel BASIC. ## Install