Compare commits

4 Commits

Author SHA1 Message Date
faa40d9f58 New release v3.0 2025-10-18 09:13:42 +00:00
856c40cc59 Update to Boriel v1.18.3 2025-10-18 09:13:24 +00:00
23512a7b4e Add pasta80 PASCAL compiler 2025-10-18 08:56:55 +00:00
00c8691af8 Add hdfmonkey 2025-10-18 08:33:15 +00:00
3 changed files with 36 additions and 7 deletions

View File

@@ -3,7 +3,10 @@
FROM ubuntu:24.04 AS build FROM ubuntu:24.04 AS build
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
autoconf \
automake \
build-essential \ build-essential \
fpc \
make \ make \
python3-pip \ python3-pip \
unzip \ unzip \
@@ -17,12 +20,24 @@ ADD https://github.com/einar-saukas/ZX0.git /zx0
RUN cd /zx0/src/ \ RUN cd /zx0/src/ \
&& gcc -O2 -o zx0 zx0.c optimize.c compress.c memory.c \ && gcc -O2 -o zx0 zx0.c optimize.c compress.c memory.c \
&& gcc -O2 -o dzx0 dzx0.c && gcc -O2 -o dzx0 dzx0.c
ADD https://www.boriel.com/files/zxb/zxbasic-1.18.2-linux64.tar.gz . ADD https://www.boriel.com/files/zxb/zxbasic-1.18.3-linux64.tar.gz .
RUN tar xf zxbasic* RUN tar xf zxbasic*
ADD https://github.com/Mastodon-/inpaws.git /inpaws ADD https://github.com/Mastodon-/inpaws.git /inpaws
RUN cd /inpaws/ \ RUN cd /inpaws/ \
&& make -j8 && make -j8
RUN python3 -m pip install --break-system-packages skoolkit RUN python3 -m pip install --break-system-packages skoolkit
ADD https://github.com/gasman/hdfmonkey.git /hdfmonkey
RUN cd /hdfmonkey/ \
&& autoheader \
&& aclocal \
&& autoconf \
&& automake -a \
&& ./configure \
&& make -j16 \
&& make install
ADD https://github.com/pleumann/pasta80.git#v0.96 /opt/pasta80
RUN cd /opt/pasta80 \
&& fpc pasta
FROM ubuntu:24.04 AS z88dk FROM ubuntu:24.04 AS z88dk
RUN apt-get update \ RUN apt-get update \
@@ -96,7 +111,9 @@ COPY --from=build /zxbasic/tools /opt/zxbasic/tools
COPY --from=build /inpaws/inpaws /bin/inpaws COPY --from=build /inpaws/inpaws /bin/inpaws
COPY --from=build /usr/local/bin/ /usr/local/bin/ 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.12/dist-packages/skoolkit/ /usr/local/lib/python3.12/dist-packages/skoolkit/
COPY --from=build /usr/local/bin/hdfmonkey /bin/hdfmonkey
COPY --from=build /opt/pasta80 /opt/pasta80
COPY --from=z88dk /opt/z88dk/ /opt/z88dk/ COPY --from=z88dk /opt/z88dk/ /opt/z88dk/
ENV PATH="${PATH}:/opt/z88dk/bin:/opt/zxbasic:/opt/zxbasic/tools" ENV PATH="${PATH}:/opt/z88dk/bin:/opt/zxbasic:/opt/zxbasic/tools:/opt/pasta80"
ENV ZCCCFG="/opt/z88dk/lib/config" ENV ZCCCFG="/opt/z88dk/lib/config"
USER ubuntu USER ubuntu

View File

@@ -2,7 +2,7 @@
"name": "ZX Spectrum dev tools", "name": "ZX Spectrum dev tools",
//"build": { "dockerfile": "Dockerfile" }, //"build": { "dockerfile": "Dockerfile" },
// The Dockerfile takes an age to build due to z88dk, so pull from prebuilt: // The Dockerfile takes an age to build due to z88dk, so pull from prebuilt:
"image": "boarstone.mcphail.uk/mcphail/speccydev:v2.0", "image": "boarstone.mcphail.uk/mcphail/speccydev:v3.0",
"remoteUser": "ubuntu", "remoteUser": "ubuntu",
"runArgs": [ "runArgs": [
"--network=host" "--network=host"

View File

@@ -1,4 +1,4 @@
# Development tools for the ZX Spectrum v2.0 # Development tools for the ZX Spectrum v3.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. 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 - tzxlist
- zx0 (binary compressor) - zx0 (binary compressor)
- dzx0 (binary decompressor) - dzx0 (binary decompressor)
- ZX BASIC (aka Boriel BASIC) version 1.18.2 - ZX BASIC (aka Boriel BASIC) version 1.18.3
- zxbc (BASIC compiler) - zxbc (BASIC compiler)
- zxbasm (assembler) - zxbasm (assembler)
- zxbpp (preprocessor) - zxbpp (preprocessor)
@@ -53,6 +53,8 @@ The devcontainer contains:
- bin2sna.py - bin2sna.py
- snapmod.py - snapmod.py
- sna2img.py - sna2img.py
- pasta80 version 0.96 (PASCAL compiler)
- hdfmonkey version 0.4 (for manipulating sdcard files for the Spectrum Next)
- git (version control) - git (version control)
- make (build control) - make (build control)
@@ -60,9 +62,15 @@ 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! 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 v1.x ## Breaking changes from v2.x
The newest release of z88dk has been included. This brings substantial improvements over v2.3, but I cannot guarantee it will compile your code in the same way. If this causes problems, please use an older version of the devcontainer. Boriel BASIC (zxbasic) has been updated. This version corrects a bug when referencing array data from assembly language. Code reliant on the old, faulty, behaviour may break.
## New additions from v2.x
The `pasta80` PASCAL compiler has been added. Example code is in `/opt/pasta80/examples`. Invoke the compiler by running `pasta`. A fun feature is that it can run in an IDE mode with vscode integration by running `pasta --ide`!
`hdfmonkey` is a useful tool for manipulating the sdcard images needed for the Spectrum Next and its emulators.
## Install ## Install
@@ -124,3 +132,7 @@ ttttt - placed under Public Domain by Neil McPhail
inpaws - copyright "Mastodon" and released under GPL v3 inpaws - copyright "Mastodon" and released under GPL v3
skoolkit - copyright Richard Dymond and Philip M Anderson and released under GPL v3 or later skoolkit - copyright Richard Dymond and Philip M Anderson and released under GPL v3 or later
hdfmonkey - copyright Matt Westcott and released under GPL v3
PASTA/80 - copyright Jörg Pleumann and released under GPL v3 with linking exception