Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
748c904729 | ||
|
|
22a10706ca | ||
|
|
ae84c32404 |
@@ -3,7 +3,7 @@
|
|||||||
# My current workflow is to build this on an M1 MacBook for both amd64 and arm64 using:
|
# 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 .
|
# 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 \
|
RUN apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends \
|
&& apt-get install -y --no-install-recommends \
|
||||||
autoconf \
|
autoconf \
|
||||||
@@ -24,8 +24,7 @@ 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.7-linux64.tar.gz .
|
ADD --unpack https://www.boriel.com/files/zxb/zxbasic-1.19.0-linux64.tar.gz .
|
||||||
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
|
||||||
@@ -39,17 +38,17 @@ RUN cd /hdfmonkey/ \
|
|||||||
&& ./configure \
|
&& ./configure \
|
||||||
&& make -j16 \
|
&& make -j16 \
|
||||||
&& make install
|
&& make install
|
||||||
ADD https://github.com/pleumann/pasta80.git#v0.98 /opt/pasta80
|
ADD https://github.com/pleumann/pasta80.git#v0.99 /opt/pasta80
|
||||||
RUN cd /opt/pasta80 \
|
RUN cd /opt/pasta80 \
|
||||||
&& fpc pasta
|
&& fpc pasta
|
||||||
ADD --unpack https://www.seasip.info/ZX/taptools-1.1.3.tar.gz taptools/
|
ADD --unpack https://www.seasip.info/ZX/taptools-1.1.3.tar.gz taptools/
|
||||||
RUN cd taptools/taptools* \
|
RUN cd taptools/taptools* \
|
||||||
&& cp /usr/share/automake-1.16/config.guess . \
|
&& cp /usr/share/automake-1.18/config.guess . \
|
||||||
&& ./configure \
|
&& ./configure \
|
||||||
&& make -j8 \
|
&& make -j8 \
|
||||||
&& make install
|
&& make install
|
||||||
|
|
||||||
FROM ubuntu:24.04
|
FROM ubuntu:26.04
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends \
|
&& apt-get install -y --no-install-recommends \
|
||||||
ca-certificates \
|
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 /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.14/dist-packages/skoolkit/ /usr/local/lib/python3.14/dist-packages/skoolkit/
|
||||||
COPY --from=build /opt/pasta80 /opt/pasta80
|
COPY --from=build /opt/pasta80 /opt/pasta80
|
||||||
|
|
||||||
# z88dk takes a long time to cross compile so I'm keeping this in a separate container
|
# z88dk takes a long time to cross compile so I'm keeping this in a separate container
|
||||||
|
|||||||
@@ -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": "njmcphail/speccydev:v8.2",
|
"image": "njmcphail/speccydev:v9.0",
|
||||||
"remoteUser": "ubuntu",
|
"remoteUser": "ubuntu",
|
||||||
"runArgs": [
|
"runArgs": [
|
||||||
"--network=host"
|
"--network=host"
|
||||||
|
|||||||
+2
-1
@@ -5,4 +5,5 @@
|
|||||||
*.tzx
|
*.tzx
|
||||||
*.block
|
*.block
|
||||||
*.zx0
|
*.zx0
|
||||||
*.bin
|
*.bin
|
||||||
|
.DS_Store
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
# Development tools for the ZX Spectrum v8.2
|
# 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.
|
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.7
|
- ZX BASIC (aka Boriel BASIC) version 1.19.0
|
||||||
- zxbc (BASIC compiler)
|
- zxbc (BASIC compiler)
|
||||||
- zxbasm (assembler)
|
- zxbasm (assembler)
|
||||||
- zxbpp (preprocessor)
|
- zxbpp (preprocessor)
|
||||||
@@ -53,7 +53,7 @@ The devcontainer contains:
|
|||||||
- bin2sna.py
|
- bin2sna.py
|
||||||
- snapmod.py
|
- snapmod.py
|
||||||
- sna2img.py
|
- sna2img.py
|
||||||
- pasta80 version 0.98 (PASCAL compiler)
|
- pasta80 version 0.99 (PASCAL compiler)
|
||||||
- hdfmonkey version 0.4 (for manipulating sdcard files for the Spectrum Next)
|
- hdfmonkey version 0.4 (for manipulating sdcard files for the Spectrum Next)
|
||||||
- git (version control)
|
- git (version control)
|
||||||
- make (build control)
|
- make (build control)
|
||||||
@@ -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!
|
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.1
|
## New additions from v8.3
|
||||||
|
|
||||||
Minor version update for sjasmplus.
|
Minor version update for Boriel BASIC.
|
||||||
|
|
||||||
## Install
|
## Install
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user