Update to version 10.0 with major release of z88dk and minor release of skoolkit
This commit is contained in:
1 parent
80b0e83b1e
commit
e8bdc1c581
4 files changed
+11
-11
No files matched your search
@@ -28,7 +28,7 @@ ADD --unpack https://www.boriel.com/files/zxb/zxbasic-1.19.0-linux64.tar.gz .
|
|||||||
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 --force-reinstall --break-system-packages skoolkit==10.1
|
RUN python3 -m pip install --force-reinstall --break-system-packages skoolkit==10.2
|
||||||
ADD https://github.com/gasman/hdfmonkey.git /hdfmonkey
|
ADD https://github.com/gasman/hdfmonkey.git /hdfmonkey
|
||||||
RUN cd /hdfmonkey/ \
|
RUN cd /hdfmonkey/ \
|
||||||
&& autoheader \
|
&& autoheader \
|
||||||
@@ -83,7 +83,7 @@ COPY --from=build /opt/pasta80 /opt/pasta80
|
|||||||
# is in a subdirectory of this one. If you're building the container yourself you may
|
# is in a subdirectory of this one. If you're building the container yourself you may
|
||||||
# want to alter the next line to your own tagged build of z88dk but you're welcome to
|
# want to alter the next line to your own tagged build of z88dk but you're welcome to
|
||||||
# use mine.
|
# use mine.
|
||||||
COPY --from=njmcphail/z88dk:v2.4 /opt/z88dk/ /opt/z88dk/
|
COPY --from=njmcphail/z88dk:2.5 /opt/z88dk/ /opt/z88dk/
|
||||||
ENV PATH="${PATH}:/opt/z88dk/bin:/opt/zxbasic:/opt/zxbasic/tools:/opt/pasta80"
|
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
|
||||||
@@ -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:v9.2",
|
"image": "njmcphail/speccydev:v10.0",
|
||||||
"remoteUser": "ubuntu",
|
"remoteUser": "ubuntu",
|
||||||
"runArgs": [
|
"runArgs": [
|
||||||
"--network=host"
|
"--network=host"
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ RUN apt-get update \
|
|||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
ENV Z88DK_PATH="/opt/z88dk"
|
ENV Z88DK_PATH="/opt/z88dk"
|
||||||
RUN cpanm -l $HOME/perl5 --no-wget local::lib Template::Plugin::YAML \
|
RUN cpanm -l $HOME/perl5 --no-wget local::lib Template::Plugin::YAML \
|
||||||
&& git clone --depth 1 --branch v2.4 --recursive https://github.com/z88dk/z88dk.git ${Z88DK_PATH} \
|
&& git clone --depth 1 --branch v2.5 --recursive https://github.com/z88dk/z88dk.git ${Z88DK_PATH} \
|
||||||
&& cd ${Z88DK_PATH} \
|
&& cd ${Z88DK_PATH} \
|
||||||
&& eval "$(perl -I$HOME/perl5/lib/perl5 -Mlocal::lib)" \
|
&& eval "$(perl -I$HOME/perl5/lib/perl5 -Mlocal::lib)" \
|
||||||
&& chmod 777 build.sh \
|
&& chmod 777 build.sh \
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# Development tools for the ZX Spectrum v9.2
|
# Development tools for the ZX Spectrum v10.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.
|
||||||
|
|
||||||
@@ -8,7 +8,7 @@ The devcontainer contains:
|
|||||||
- z80asm version 1.8 (assembler)
|
- z80asm version 1.8 (assembler)
|
||||||
- z80dasm version 1.1.6 (disassembler)
|
- z80dasm version 1.1.6 (disassembler)
|
||||||
- zmakebas version 1.2b (creates BASIC programs)
|
- zmakebas version 1.2b (creates BASIC programs)
|
||||||
- z88dk version 2.4 (C compiler and other utilities including assembler)
|
- z88dk version 2.5 (C compiler and other utilities including assembler)
|
||||||
- utilities from the FUSE emulator version 1.4.3:
|
- utilities from the FUSE emulator version 1.4.3:
|
||||||
- audio2tape
|
- audio2tape
|
||||||
- createhdf
|
- createhdf
|
||||||
@@ -36,7 +36,7 @@ The devcontainer contains:
|
|||||||
- various tools including nextcreator.py to build .nex files
|
- various tools including nextcreator.py to build .nex files
|
||||||
- ttttt (converts binaries into .tap blocks)
|
- ttttt (converts binaries into .tap blocks)
|
||||||
- inpaws version 1.0.2 (interactive fiction compiler/extractor for Gilsoft's PAW)
|
- inpaws version 1.0.2 (interactive fiction compiler/extractor for Gilsoft's PAW)
|
||||||
- skoolkit version 10.1 (tools for creating browseable disassemblies of Spectrum games)
|
- skoolkit version 10.2 (tools for creating browseable disassemblies of Spectrum games)
|
||||||
- sna2ctl.py
|
- sna2ctl.py
|
||||||
- sna2skool.py
|
- sna2skool.py
|
||||||
- skool2html.py
|
- skool2html.py
|
||||||
@@ -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 v8.x
|
## Breaking changes from v9.x
|
||||||
|
|
||||||
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.
|
There has been a new release of z88dk with many thousands of changes, including new compiler frontends and altered configuration syntax. Expect existing projects to break! This is a large release so please let me know in a GitHub issue if I have broken anything in my build.
|
||||||
|
|
||||||
## New additions from v9.1
|
## New additions from v9.2
|
||||||
|
|
||||||
Minor version update for sjasmplus.
|
New releases of z88dk and skoolkit.
|
||||||
|
|
||||||
## Install
|
## Install
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user