Add all of z88dk and m4 to allow next-3d demo to work

.devcontainer/Dockerfile

@@ -5,6 +5,7 @@ RUN apt-get update \
 	&& apt-get install -y --no-install-recommends \
 	build-essential \
 	make \
+	python3-pip \
 	unzip \
 	&& rm -rf /var/lib/apt/lists/*
 
@@ -16,16 +17,18 @@ 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.1-linux64.tar.gz .
+ADD https://www.boriel.com/files/zxb/zxbasic-v1.18.3-beta5-linux64.tar.gz .
 RUN tar xf zxbasic*
 ADD https://github.com/Mastodon-/inpaws.git /inpaws
 RUN cd /inpaws/ \
 	&& make -j8
+RUN python3 -m pip install --break-system-packages skoolkit
 
-FROM build AS z88dk
+FROM ubuntu:24.04 AS z88dk
 RUN apt-get update \
 	&& apt-get install -y --no-install-recommends \
 	bison \
+	build-essential \
 	ca-certificates \
 	ccache \
 	cpanminus \
@@ -48,6 +51,7 @@ RUN apt-get update \
 	libxml2-dev \
 	libyaml-perl \
 	m4 \
+	make \
 	perl \
 	pkg-config \
 	ragel \
@@ -62,8 +66,7 @@ RUN cpanm -l $HOME/perl5 --no-wget local::lib Template::Plugin::YAML \
 	&& cd ${Z88DK_PATH} \ 
 	&& eval "$(perl -I$HOME/perl5/lib/perl5 -Mlocal::lib)" \
 	&& chmod 777 build.sh \
-	&& sed -i -e "s/make/make -j8/g" build.sh \
+	&& BUILD_SDCC=1 BUILD_SDCC_HTTP=1 MAKE_CONCURRENCY=-j8 ./build.sh \
-	&& BUILD_SDCC=1 BUILD_SDCC_HTTP=1 ./build.sh \
 	&& make install-clean bins-clean 
 
 FROM ubuntu:24.04
@@ -72,6 +75,7 @@ RUN apt-get update \
 	ca-certificates \
 	fuse-emulator-utils \
 	git \
+	m4 \
 	make \
 	openssh-client \
 	pasmo \
@@ -88,12 +92,11 @@ COPY --from=build /zxbasic/zxbasm.py /opt/zxbasic/zxbasm
 COPY --from=build /zxbasic/zxbc.py /opt/zxbasic/zxbc
 COPY --from=build /zxbasic/zxbpp.py /opt/zxbasic/zxbpp
 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=z88dk /opt/z88dk/bin /opt/z88dk/bin
+COPY --from=build /usr/local/bin/ /usr/local/bin/
-COPY --from=z88dk /opt/z88dk/lib /opt/z88dk/lib
+COPY --from=build /usr/local/lib/python3.12/dist-packages/skoolkit/ /usr/local/lib/python3.12/dist-packages/skoolkit/
-COPY --from=z88dk /opt/z88dk/include /opt/z88dk/include
+COPY --from=z88dk /opt/z88dk/ /opt/z88dk/
-ENV PATH="${PATH}:/opt/z88dk/bin:/opt/zxbasic"
+ENV PATH="${PATH}:/opt/z88dk/bin:/opt/zxbasic:/opt/zxbasic/tools"
 ENV ZCCCFG="/opt/z88dk/lib/config"
 USER ubuntu
-RUN echo "PATH=$PATH:/opt/z88dk/bin:/opt/zxbasic" >> ~/.profile
-RUN echo "export ZCCCFG=/opt/z88dk/lib/config/" >> ~/.profile

.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": "boarstone.mcphail.uk/mcphail/speccydev:stable",
+	"image": "boarstone.mcphail.uk/mcphail/speccydev:v1.0",
 	"remoteUser": "ubuntu",
 	"runArgs": [
 		"--network=host"

Makefile

@@ -29,8 +29,7 @@ clean:
 	rm -f *.zx0
 	rm -rf .tmp/
 
-start_new_project:
+start_new_project: clean
-	make clean
 	rm -rf .git
 	git init -b main
 	git add .devcontainer/ .vscode/ .gitignore

README.md

@@ -1,15 +1,15 @@
-# Development tools for the ZX Spectrum
+# Development tools for the ZX Spectrum v1.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 devcontainer contains:
-- pasmo (assembler)
+- pasmo version 0.5.3 (assembler)
-- sjasmplus (assembler)
+- sjasmplus version 1.21.0 (assembler)
-- z80asm (assembler)
+- z80asm version 1.8 (assembler)
-- z80dasm (disassembler)
+- z80dasm version 1.1.6 (disassembler)
-- zmakebas (creates BASIC programs)
+- zmakebas version 1.2b (creates BASIC programs)
-- z88dk (C compiler and other utilities including assembler)
+- z88dk version 2.3 (C compiler and other utilities including assembler)
-- utilities from the FUSE emulator:
+- utilities from the FUSE emulator version 1.4.3:
     - audio2tape
     - createhdf
     - fmfconv
@@ -29,12 +29,30 @@ The devcontainer contains:
     - tzxlist
 - zx0 (binary compressor)
 - dzx0 (binary decompressor)
-- ZX BASIC (aka Boriel BASIC)
+- ZX BASIC (aka Boriel BASIC) version 1.18.2
     - zxbc (BASIC compiler)
     - zxbasm (assembler)
     - zxbpp (preprocessor)
+    - various tools including nextcreator.py to build .nex files
 - ttttt (converts binaries into .tap blocks)
-- inpaws (interactive fiction compiler/extractor for Gilsoft's PAW)
+- inpaws version 1.0.2 (interactive fiction compiler/extractor for Gilsoft's PAW)
+- skoolkit version 9.6 (tools for creating browseable disassemblies of Spectrum games)
+    - sna2ctl.py
+    - sna2skool.py
+    - skool2html.py
+    - skool2asm.py
+    - skool2ctl.py
+    - skool2bin.py
+    - tap2sna.py
+    - snapinfo.py
+    - trace.py
+    - rzxplay.py
+    - tapinfo.py
+    - rzxinfo.py
+    - bin2tap.py
+    - bin2sna.py
+    - snapmod.py
+    - sna2img.py
 - git (version control)
 - make (build control)
 
@@ -65,6 +83,12 @@ Open the bottom bar in vscode to expose the terminal or select "Terminal -> New
 
 When you are ready to start your own project, run `make start_new_project` to wipe out the example code and start afresh.
 
+## Versions
+
+This `main` branch of this repository will always point to the latest numbered release of the devcontainer image. This image will contain specific, numbered releases of the various tools as documented above. If the devcontainer is updated with non-breaking changes, the minor version number will be incremented. This gives reassurance that, say, a v1.7 devcontainer will contain tools which can compile programs made with a v1.2 devcontainer without issue.
+
+If there is a breaking change in the tools, the major version number will be incremented. So a v2.0 devcontainer may not build projects made in a v1.7 devcontainer correctly. Please ensure all your collaborators are using appropriate devcontainer versions.
+
 ## Debugging
 
 Debug in the built in simulator or in CSpect externally (example CSpect invocation on Windows would be `CSpect.exe -w2 -debug -remote`). The simulator is set up to expect a binary called `myprog.sna` and a map file called `myprog.sld` but this can be configured in the `.vscode/launch.json` file.
@@ -74,13 +98,25 @@ Debug in the built in simulator or in CSpect externally (example CSpect invocati
 ## Licences
 
 pamso - copyright Julián Albo and released under the GPL
+
 sjasmplus - copyright aprisobal and released under BSD 3-clause
+
 z80asm - copyright Bas Wijnen and released under GPL v3 or later
+
 z80dasm - copyright Jan Panteltje and Tomaz Solc and released under GPL v2
+
 zmakebas - placed under Public Domain by Russell Marks
+
 z88dk - copyright the z88dk authors and released under the Clarified Artistic License
+
 FUSE utilities - copyright Philip Kendall and contributors and released under GPL v2
+
 zx0 and dzx0 - copyright Einar Saukas and released under BSD 3-clause
+
 Boriel BASIC - copyleft Jose Rodriguez-Rosa and released under AGPL v3 and portions under MIT
+
 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