diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 586357b..f615a19 100644 --- a/.devcontainer/Dockerfile +++ b/.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/* @@ -21,6 +22,7 @@ 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 RUN apt-get update \ @@ -89,6 +91,8 @@ 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 /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=z88dk /opt/z88dk/bin /opt/z88dk/bin COPY --from=z88dk /opt/z88dk/lib /opt/z88dk/lib COPY --from=z88dk /opt/z88dk/include /opt/z88dk/include diff --git a/README.md b/README.md index 63de35b..44ee299 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,23 @@ The devcontainer contains: - zxbpp (preprocessor) - ttttt (converts binaries into .tap blocks) - inpaws (interactive fiction compiler/extractor for Gilsoft's PAW) +- skoolkit (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) @@ -74,13 +91,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 \ No newline at end of file + +inpaws - copyright "Mastodon" and released under GPL v3 + +skoolkit - copyright Richard Dymond and Philip M Anderson and released under GPL v3 or later \ No newline at end of file