From cb0f9a9fdd40ed8b582e2a1bbb9e26ee0cd9f999 Mon Sep 17 00:00:00 2001 From: George Sokianos Date: Sun, 30 Apr 2023 19:09:36 +0100 Subject: [PATCH] updated vasm and amissl, added SDI headers --- CHANGELOG.md | 8 ++++++++ README.md | 12 ++++++------ m68k/Dockerfile | 50 ++++++++++++++++++++++++++++++------------------- mos/Dockerfile | 31 +++++++++++++++++++----------- ppc/Dockerfile | 11 +++++++---- 5 files changed, 72 insertions(+), 40 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08849cf..9facc12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ # Changelog All notable changes to this project will be documented in this file. +## v1.14 - 2023-04-30 +### Added +- Added SDI headers in both NDK 3.2 and 3.9 + +### Changed +- Updated vasm to v1.9d (24-Apr-2023) +- Updated AmiSSL SDK to latest released v5.8 + ## v1.13 - 2023-04-08 ### Changed - Added MUI 5.0 SDK into the MOS image diff --git a/README.md b/README.md index 256d8ce..54123da 100644 --- a/README.md +++ b/README.md @@ -15,10 +15,10 @@ The **docker4amigavbcc:latest-m68k** image contains the following software, incl | app | version | source |-------------------|-----------------------|-----------------------------------| | vbcc | 0.9h p2 (23-Mar-2022) | http://sun.hasenbraten.de/vbcc/ -| vasm | 1.9a (02-Oct-2022) | http://phoenix.owl.de/tags/ +| vasm | v1.9d (24-Apr-2023) | http://phoenix.owl.de/tags/ | NDK | 3.9 | http://www.haage-partner.de/download/AmigaOS/ | NDK | 3.2R4 | https://aminet.net/package/dev/misc/NDK3.2R3 -| AmiSSL SDK | 5.5 | https://github.com/jens-maus/amissl/releases/download/4.11 +| AmiSSL SDK | 5.8 | https://github.com/jens-maus/amissl/releases/tag/5.8 | MUI 3.x dev | 3.8 | https://github.com/amiga-mui/muidev/releases/tag/3.8 | MUI 5.x dev | MUI 5.0-20210831 | https://github.com/amiga-mui/muidev/releases/tag/MUI-5.0-20210831 | MCC_GuiGfx | 19.2 (only on MUI3SDK)| http://aminet.net/package/dev/mui/MCC_Guigfx @@ -33,8 +33,8 @@ The **docker4amigavbcc:latest-ppc** image contains the following software, inclu | app | version | source |-------------------|-----------------------|-----------------------------------| | vbcc | 0.9h p2 (23-Mar-2022) | http://sun.hasenbraten.de/vbcc/ -| vasm | 1.9a (02-Oct-2022) | http://phoenix.owl.de/tags/ -| AmiSSL SDK | 5.5 | https://github.com/jens-maus/amissl/releases/download/4.11 +| vasm | v1.9d (24-Apr-2023) | http://phoenix.owl.de/tags/ +| AmiSSL SDK | 5.8 | https://github.com/jens-maus/amissl/releases/tag/5.8 | AmigaOS 4 SDK | 53.30 | http://www.hyperion-entertainment.com/ | MUI 5.x dev | MUI 5.0-20210831 | https://github.com/amiga-mui/muidev/releases/tag/MUI-5.0-20210831 | MCC_GuiGfx | | Since MUI 5.0-2020R2 this is included in MUI @@ -46,8 +46,8 @@ The **docker4amigavbcc:latest-mos** image contains the following software, inclu | app | version | source |-------------------|-----------------------|-----------------------------------| | vbcc | 0.9h p2 (23-Mar-2022) | http://sun.hasenbraten.de/vbcc/ -| vasm | 1.9a (02-Oct-2022) | http://phoenix.owl.de/tags/ -| AmiSSL SDK | 5.5 | https://github.com/jens-maus/amissl/releases/download/4.11 +| vasm | v1.9d (24-Apr-2023) | http://phoenix.owl.de/tags/ +| AmiSSL SDK | 5.8 | https://github.com/jens-maus/amissl/releases/tag/5.8 | MUI 3.x dev | 3.8 | https://github.com/amiga-mui/muidev/releases/tag/3.8 | MUI 5.x dev | MUI 5.0-20210831 | https://github.com/amiga-mui/muidev/releases/tag/MUI-5.0-20210831 | MCC_GuiGfx | 19.2 (only on MUI3SDK)| http://aminet.net/package/dev/mui/MCC_Guigfx diff --git a/m68k/Dockerfile b/m68k/Dockerfile index 765a051..409f01f 100644 --- a/m68k/Dockerfile +++ b/m68k/Dockerfile @@ -5,8 +5,8 @@ LABEL maintainer="Georgios Sokianos " WORKDIR /tmp # Install vasm -RUN curl -fsSL "http://phoenix.owl.de/tags/vasm1_9a.tar.gz" -o /tmp/vasm_1.9a.tar.gz || exit $?; \ - tar xvfz vasm_1.9a.tar.gz; \ +RUN curl -fsSL "http://phoenix.owl.de/tags/vasm1_9d.tar.gz" -o /tmp/vasm_1.9d.tar.gz || exit $?; \ + tar xvfz vasm_1.9d.tar.gz; \ make -C vasm CPU=m68k SYNTAX=mot; \ cp ./vasm/vasmm68k_mot ./vasm/vobjdump /opt/vbcc/bin; \ rm -rf /tmp/*; @@ -37,16 +37,18 @@ RUN curl -fsSL "http://hp.alinea-computer.de/AmigaOS/NDK39.lha" -o /tmp/NDK39.lh lha -xfq2 NDK39.lha; \ mv ./NDK_3.9 /opt/sdk/; \ rm -rf /tmp/*; -ENV NDK_INC="/opt/sdk/NDK_3.9/Include/include_h" -ENV NDK_LIB="/opt/sdk/NDK_3.9/Include/linker_libs" +ENV NDK39_PATH="/opt/sdk/NDK_3.9" +ENV NDK_INC="${NDK39_PATH}/Include/include_h" +ENV NDK_LIB="${NDK39_PATH}/Include/linker_libs" # Install NDK32 RUN curl -fsSL "http://aminet.net/dev/misc/NDK3.2.lha" -o /tmp/ndk32.lha || exit $?; \ lha -xfq2w=NDK3.2 ndk32.lha; \ mv ./NDK3.2 /opt/sdk/; \ rm -rf /tmp/*; -ENV NDK32_INC="/opt/sdk/NDK3.2/Include_H" -ENV NDK32_LIB="/opt/sdk/NDK3.2/lib" +ENV NDK32_PATH="/opt/sdk/NDK3.2" +ENV NDK32_INC="${NDK32_PATH}/Include_H" +ENV NDK32_LIB="${NDK32_PATH}/lib" # Install MUI 3.8 dev RUN curl -fsSL "https://github.com/amiga-mui/muidev/releases/download/3.8/mui38dev.lha" -o /tmp/mui38dev.lha || exit $?; \ @@ -103,20 +105,30 @@ RUN curl -fsSL --retry 5 "http://aminet.net/biz/dbase/sqlite-3.34.0-amiga.lha" - ENV SQLITE_INC="/opt/sdk/sqlite/include" # Install AMISSL SDK -RUN curl -fsSL "https://github.com/jens-maus/amissl/releases/download/5.5/AmiSSL-5.5-SDK.lha" -o /tmp/AmiSSL.lha && \ +RUN curl -fsSL "https://github.com/jens-maus/amissl/releases/download/5.8/AmiSSL-5.8-SDK.lha" -o /tmp/AmiSSL.lha && \ lha -xfq2 AmiSSL.lha && \ - cp ./AmiSSL/Developer/include/* /opt/sdk/NDK3.2/Include_H/ -r && \ - cp ./AmiSSL/Developer/Autodocs/* /opt/sdk/NDK3.2/Autodocs/ && \ - cp ./AmiSSL/Developer/Examples/*.c /opt/sdk/NDK3.2/Examples/ && \ - cp ./AmiSSL/Developer/fd/* /opt/sdk/NDK3.2/FD/ && \ - cp ./AmiSSL/Developer/lib/AmigaOS3/* /opt/sdk/NDK3.2/lib/ && \ - cp ./AmiSSL/Developer/sfd/* /opt/sdk/NDK3.2/SFD/ && \ - cp ./AmiSSL/Developer/include/* /opt/sdk/NDK_3.9/Include/include_h/ -r && \ - cp ./AmiSSL/Developer/Autodocs/* /opt/sdk/NDK_3.9/Documentation/Autodocs/ && \ - cp ./AmiSSL/Developer/Examples/*.c /opt/sdk/NDK_3.9/Examples/ && \ - cp ./AmiSSL/Developer/fd/* /opt/sdk/NDK_3.9/Include/fd/ && \ - cp ./AmiSSL/Developer/lib/AmigaOS3/* /opt/sdk/NDK_3.9/Include/linker_libs/ && \ - cp ./AmiSSL/Developer/sfd/* /opt/sdk/NDK_3.9/Include/sfd/ && \ + cp ./AmiSSL/Developer/include/* ${NDK32_PATH}/Include_H/ -r && \ + cp ./AmiSSL/Developer/Autodocs/* ${NDK32_PATH}/Autodocs/ && \ + cp ./AmiSSL/Developer/Examples/*.c ${NDK32_PATH}/Examples/ && \ + cp ./AmiSSL/Developer/fd/* ${NDK32_PATH}/FD/ && \ + cp ./AmiSSL/Developer/lib/AmigaOS3/* ${NDK32_PATH}/lib/ && \ + cp ./AmiSSL/Developer/sfd/* ${NDK32_PATH}/SFD/ && \ + cp ./AmiSSL/Developer/include/* ${NDK39_PATH}/Include/include_h/ -r && \ + cp ./AmiSSL/Developer/Autodocs/* ${NDK39_PATH}/Documentation/Autodocs/ && \ + cp ./AmiSSL/Developer/Examples/*.c ${NDK39_PATH}/Examples/ && \ + cp ./AmiSSL/Developer/fd/* ${NDK39_PATH}/Include/fd/ && \ + cp ./AmiSSL/Developer/lib/AmigaOS3/* ${NDK39_PATH}/Include/linker_libs/ && \ + cp ./AmiSSL/Developer/sfd/* ${NDK39_PATH}/Include/sfd/ && \ + rm -rf /tmp/*; + +# Install SDI headers +RUN curl -fsSL "http://aminet.net/dev/c/SDI_headers.lha" -o /tmp/SDI_headers.lha || exit $?; \ + lha -xfq2 SDI_headers.lha && \ + mkdir ${NDK32_PATH}/Examples/SDI ${NDK39_PATH}/Examples/SDI && \ + cp -r ./SDI/includes/* ${NDK32_PATH}/Include_H/ && \ + cp -r ./SDI/examples/* ${NDK32_PATH}/Examples/SDI/ && \ + cp -r ./SDI/includes/* ${NDK39_PATH}/Include/include_h/ && \ + cp -r ./SDI/examples/* ${NDK39_PATH}/Examples/SDI/ && \ rm -rf /tmp/*; USER amidev diff --git a/mos/Dockerfile b/mos/Dockerfile index 5a8fc11..56a6198 100644 --- a/mos/Dockerfile +++ b/mos/Dockerfile @@ -5,8 +5,8 @@ LABEL maintainer="Georgios Sokianos " WORKDIR /tmp # Install vasm -RUN curl -fsSL "http://phoenix.owl.de/tags/vasm1_9a.tar.gz" -o /tmp/vasm_1.9a.tar.gz || exit $?; \ - tar xvfz vasm_1.9a.tar.gz; \ +RUN curl -fsSL "http://phoenix.owl.de/tags/vasm1_9d.tar.gz" -o /tmp/vasm_1.9d.tar.gz || exit $?; \ + tar xvfz vasm_1.9d.tar.gz; \ make -C vasm CPU=ppc SYNTAX=std; \ cp ./vasm/vasmppc_std ./vasm/vobjdump /opt/vbcc/bin; \ rm -rf /tmp/*; @@ -37,8 +37,9 @@ RUN curl -fsSL "http://hp.alinea-computer.de/AmigaOS/NDK39.lha" -o /tmp/NDK39.lh lha -xfq2 NDK39.lha; \ mv ./NDK_3.9 /opt/sdk/; \ rm -rf /tmp/*; -ENV NDK_INC="/opt/sdk/NDK_3.9/Include/include_h" -ENV NDK_LIB="/opt/sdk/NDK_3.9/Include/linker_libs" +ENV NDK39_PATH="/opt/sdk/NDK_3.9" +ENV NDK_INC="${NDK39_PATH}/Include/include_h" +ENV NDK_LIB="${NDK39_PATH}/Include/linker_libs" # Install MorphOS SDK # RUN curl -fksSL "https://www.morphos-team.net/files/sdk-20200422.lha" -o /tmp/MorphOS-SDK.lha || exit $?; \ @@ -97,14 +98,22 @@ RUN curl -fsSL "http://aminet.net/biz/dbase/sqlite-3.34.0-amiga.lha" -o /tmp/sql ENV SQLITE_INC="/opt/sdk/sqlite/include" # Install AMISSL SDK -RUN curl -fsSL "https://github.com/jens-maus/amissl/releases/download/5.5/AmiSSL-5.5-SDK.lha" -o /tmp/AmiSSL.lha && \ +RUN curl -fsSL "https://github.com/jens-maus/amissl/releases/download/5.8/AmiSSL-5.8-SDK.lha" -o /tmp/AmiSSL.lha && \ lha -xfq2 AmiSSL.lha && \ - cp ./AmiSSL/Developer/include/* /opt/sdk/NDK_3.9/Include/include_h/ -r && \ - cp ./AmiSSL/Developer/Autodocs/* /opt/sdk/NDK_3.9/Documentation/Autodocs/ && \ - cp ./AmiSSL/Developer/Examples/*.c /opt/sdk/NDK_3.9/Examples/ && \ - cp ./AmiSSL/Developer/fd/* /opt/sdk/NDK_3.9/Include/fd/ && \ - cp ./AmiSSL/Developer/lib/AmigaOS3/* /opt/sdk/NDK_3.9/Include/linker_libs/ && \ - cp ./AmiSSL/Developer/sfd/* /opt/sdk/NDK_3.9/Include/sfd/ && \ + cp ./AmiSSL/Developer/include/* ${NDK39_PATH}/Include/include_h/ -r && \ + cp ./AmiSSL/Developer/Autodocs/* ${NDK39_PATH}/Documentation/Autodocs/ && \ + cp ./AmiSSL/Developer/Examples/*.c ${NDK39_PATH}/Examples/ && \ + cp ./AmiSSL/Developer/fd/* ${NDK39_PATH}/Include/fd/ && \ + cp ./AmiSSL/Developer/lib/AmigaOS3/* ${NDK39_PATH}/Include/linker_libs/ && \ + cp ./AmiSSL/Developer/sfd/* ${NDK39_PATH}/Include/sfd/ && \ + rm -rf /tmp/*; + +# Install SDI headers +RUN curl -fsSL "http://aminet.net/dev/c/SDI_headers.lha" -o /tmp/SDI_headers.lha || exit $?; \ + lha -xfq2 SDI_headers.lha && \ + mkdir ${NDK39_PATH}/Examples/SDI && \ + cp -r ./SDI/includes/* ${NDK39_PATH}/Include/include_h/ && \ + cp -r ./SDI/examples/* ${NDK39_PATH}/Examples/SDI/ && \ rm -rf /tmp/*; USER amidev diff --git a/ppc/Dockerfile b/ppc/Dockerfile index 51b5a7a..1d3bf37 100644 --- a/ppc/Dockerfile +++ b/ppc/Dockerfile @@ -7,8 +7,8 @@ ENV OS4_SDK="/opt/sdk/ppc-amigaos" WORKDIR /tmp # Install vasm -RUN curl -fsSL "http://phoenix.owl.de/tags/vasm1_9a.tar.gz" -o /tmp/vasm_1.9a.tar.gz || exit $?; \ - tar xvfz vasm_1.9a.tar.gz; \ +RUN curl -fsSL "http://phoenix.owl.de/tags/vasm1_9d.tar.gz" -o /tmp/vasm_1.9d.tar.gz || exit $?; \ + tar xvfz vasm_1.9d.tar.gz; \ make -C vasm CPU=ppc SYNTAX=std; \ cp ./vasm/vasmppc_std ./vasm/vobjdump /opt/vbcc/bin; \ rm -rf /tmp/*; @@ -40,7 +40,10 @@ RUN curl -fksSL "https://www.hyperion-entertainment.biz/index.php?option=com_reg lha -xfq2w=${OS4_SDK} SDK_Install/exec*.lha && \ lha -xfq2w=${OS4_SDK} SDK_Install/newlib*.lha && \ lha -xfq2w=${OS4_SDK} SDK_Install/base.lha && \ - rm -rf /tmp/* ${OS4_SDK}/C ${OS4_SDK}/Data ${OS4_SDK}/S ${OS4_SDK}/Tools; + lha -xfq2w=${OS4_SDK} SDK_Install/SDI-*.lha && \ + \cp -r ${OS4_SDK}/Local/* ${OS4_SDK}/local/ && \ + rm -rf /tmp/* ${OS4_SDK}/C ${OS4_SDK}/Data ${OS4_SDK}/S \ + ${OS4_SDK}/Tools ${OS4_SDK}/Local; ENV AOS4_SDK_INC="${OS4_SDK}/Include/include_h" \ AOS4_NET_INC="${OS4_SDK}/Include/netinclude" \ AOS4_NLIB="${OS4_SDK}/newlib" \ @@ -71,7 +74,7 @@ RUN curl -fsSL "http://aminet.net/biz/dbase/sqlite-3.34.0-amiga.lha" -o /tmp/sql rm -rf /tmp/*; # # Install AMISSL SDK -RUN curl -fsSL "https://github.com/jens-maus/amissl/releases/download/5.5/AmiSSL-5.5-SDK.lha" -o /tmp/AmiSSL.lha && \ +RUN curl -fsSL "https://github.com/jens-maus/amissl/releases/download/5.8/AmiSSL-5.8-SDK.lha" -o /tmp/AmiSSL.lha && \ lha -xfq2 AmiSSL.lha && \ cp ./AmiSSL/Developer/include/* ${OS4_SDK}/Include/include_h/ -r && \ cp ./AmiSSL/Developer/Autodocs/* ${OS4_SDK}/Documentation/AutoDocs/ && \