Added FlexCat 2.18 in both m68k and PPC images

walkero-gr · Mar 26, 2020 · 8975742 · 8975742
1 parent f26f120
commit 8975742
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
 ### Added
 - Added on PPC image the clib2 includes
 - Added MCC_GuiGfx installation at the PPC image
+- Added FlexCat 2.18 on both images, m68k and ppc
 
 ### Changed
 - Fixes on m68k image on MCC_GuiGfx copy

diff --git a/README.md b/README.md
@@ -19,6 +19,7 @@ The **docker4amigavbcc:latest-m68k** image contains the following:
 | Roadshow SDK      | 1.4 (15.3.2019)       | https://www.amigafuture.de/app.php/dlext/?view=detail&df_id=3658
 | AmiSSL SDK        | 4.4                   | https://github.com/jens-maus/amissl/releases/tag/4.4
 | Posix Lib         | 2.6                   | http://aminet.net/package/dev/c/vbcc_PosixLib
+| FlexCat           | 2.18                  | https://github.com/adtools/flexcat/releases/tag/2.18
 
 ## PPC development image
 The **docker4amigavbcc:latest-ppc** image contains the following:
@@ -31,6 +32,7 @@ The **docker4amigavbcc:latest-ppc** image contains the following:
 | AmigaOS 4 SDK     | 53.30                 | http://www.hyperion-entertainment.com/
 | MUI 5.x dev       | 5.0-2019R4            | http://muidev.de/downloads
 | AmiSSL SDK        | 4.4                   | https://github.com/jens-maus/amissl/releases/tag/4.4
+| FlexCat           | 2.18                  | https://github.com/adtools/flexcat/releases/tag/2.18
 
 ## How to create a docker container
 

diff --git a/m68k/Dockerfile b/m68k/Dockerfile
@@ -23,7 +23,7 @@ RUN curl -fSL "http://sun.hasenbraten.de/vasm/release/vasm.tar.gz" -o /tmp/vasm.
     tar xvfz vasm.tar.gz; \
     cd /tmp/vasm; \
     make CPU=m68k SYNTAX=mot; \
-    cp vasmm68k_mot vobjdump /opt/vbcc/bin; 
+    cp ./vasmm68k_mot ./vobjdump /opt/vbcc/bin; 
 
 ENV VBCC="/opt/vbcc"
 
@@ -33,7 +33,7 @@ RUN curl -fSL "http://sun.hasenbraten.de/vlink/release/vlink.tar.gz" -o /tmp/vli
     tar xvfz vlink.tar.gz; \
     cd /tmp/vlink; \
     make; \
-    cp vlink /opt/vbcc/bin;
+    cp ./vlink /opt/vbcc/bin;
 
 # Install vbcc
 RUN curl -fSL "http://www.ibaug.de/vbcc/vbcc.tar.gz" -o /tmp/vbcc.tar.gz; \
@@ -45,23 +45,23 @@ RUN curl -fSL "http://www.ibaug.de/vbcc/vbcc.tar.gz" -o /tmp/vbcc.tar.gz; \
 ' | make TARGET=m68k; \
     yes '\
 ' | make TARGET=m68ks; \
-    cp bin/vbcc* bin/vc bin/vprof /opt/vbcc/bin;
+    cp ./bin/vbcc* ./bin/vc ./bin/vprof /opt/vbcc/bin;
 
 RUN curl -fSL "http://server.owl.de/~frank/vbcc/2019-10-04/vbcc_target_m68k-amigaos.lha" -o /tmp/vbcc_target_m68k-amigaos.lha; \
     curl -fSL "http://server.owl.de/~frank/vbcc/2019-10-04/vbcc_unix_config.tar.gz" -o /tmp/vbcc_unix_config.tar.gz; \
     cd /tmp; \
     lhasa -xfq2 vbcc_target_m68k-amigaos.lha; \
     tar xvfz vbcc_unix_config.tar.gz; \
-    mv config $VBCC/; \
-    mv vbcc_target_m68k-amigaos/targets $VBCC/;
+    mv ./config $VBCC/; \
+    mv ./vbcc_target_m68k-amigaos/targets $VBCC/;
 
 ENV PATH="$VBCC/bin:$PATH"
 
 # Install NDK39
 RUN curl -fSL "http://www.haage-partner.de/download/AmigaOS/NDK39.lha" -o /tmp/NDK39.lha; \
     cd /tmp; \
     lhasa -xfq2 NDK39.lha; \
-    mv NDK_3.9 /opt/sdk/;
+    mv ./NDK_3.9 /opt/sdk/;
 
 ENV NDK_INC="/opt/sdk/NDK_3.9/Include/include_h"
 ENV NDK_LIB="/opt/sdk/NDK_3.9/Include/linker_libs"
@@ -70,7 +70,7 @@ ENV NDK_LIB="/opt/sdk/NDK_3.9/Include/linker_libs"
 RUN curl -fSL "http://muidev.de/download/MUI%203.8%20-%20AmigaOS3-m68k/mui38dev.lha" -o /tmp/mui38dev.lha; \
     cd /tmp; \
     lhasa -xfq2 mui38dev.lha; \
-    mv MUI/Developer /opt/sdk/MUI_3.8; \
+    mv ./MUI/Developer /opt/sdk/MUI_3.8; \
     mkdir -p /opt/sdk/MUI_3.8/C/Include/mui;
 
 ENV MUI38_INC="/opt/sdk/MUI_3.8/C/Include"
@@ -81,28 +81,28 @@ RUN curl -fSL "http://muidev.de/download/MUI%205.0%20-%20Release/MUI-5.0-2019R4-
     cd /tmp; \
     lhasa -xfq2 MUI-5.0-os3.lha; \
     lhasa -xfq2 MUI-5.0-os3-contrib.lha; \
-    mv SDK/MUI /opt/sdk/MUI_5.0;
+    mv ./SDK/MUI /opt/sdk/MUI_5.0;
 
 ENV MUI50_INC="/opt/sdk/MUI_5.0/C/include"
 
 # Install MCC_GuiGfx
 RUN curl -fSL "http://aminet.net/dev/mui/MCC_Guigfx.lha" -o /tmp/MCC_Guigfx.lha; \
     cd /tmp; \
     lhasa -xfq2 MCC_Guigfx.lha; \
-    cp MCC_Guigfx/Developer/C/Include/MUI/* /opt/sdk/MUI_3.8/C/Include/mui; \
-    cp MCC_Guigfx/Developer/C/Include/MUI/* /opt/sdk/MUI_5.0/C/include/mui;
+    cp ./MCC_Guigfx/Developer/C/Include/MUI/* /opt/sdk/MUI_3.8/C/Include/mui; \
+    cp ./MCC_Guigfx/Developer/C/Include/MUI/* /opt/sdk/MUI_5.0/C/include/mui;
 
 # Install MCC_TextEditor
 RUN curl -fSL "http://aminet.net/dev/mui/MCC_TextEditor-15.53.lha" -o /tmp/MCC_TextEditor.lha; \
     cd /tmp; \
     lhasa -xfq2 MCC_TextEditor.lha; \
-    cp MCC_TextEditor/Developer/C/include/mui/* /opt/sdk/MUI_3.8/C/Include/mui;
+    cp ./MCC_TextEditor/Developer/C/include/mui/* /opt/sdk/MUI_3.8/C/Include/mui;
 
 # Install Roadshow SDK
 RUN curl -fSL "http://amiga-projects.net/Roadshow-SDK.lha" -o /tmp/Roadshow-SDK.lha; \
     cd /tmp; \
     lhasa -xfq2w=Roadshow-SDK Roadshow-SDK.lha; \
-    mv Roadshow-SDK /opt/sdk/Roadshow-SDK;
+    mv ./Roadshow-SDK /opt/sdk/Roadshow-SDK;
 
 ENV TCP_INC="/opt/sdk/Roadshow-SDK/include"
 ENV NET_INC="/opt/sdk/Roadshow-SDK/netinclude"
@@ -111,7 +111,7 @@ ENV NET_INC="/opt/sdk/Roadshow-SDK/netinclude"
 RUN curl -fSL "https://github.com/jens-maus/amissl/releases/download/4.4/AmiSSL-4.4.lha" -o /tmp/AmiSSL.lha; \
     cd /tmp; \
     lhasa -xfq2 AmiSSL.lha; \
-    mv AmiSSL/Developer /opt/sdk/AmiSSL;
+    mv ./AmiSSL/Developer /opt/sdk/AmiSSL;
 
 ENV AMISSL_INC="/opt/sdk/AmiSSL/include"
 
@@ -120,10 +120,16 @@ RUN curl -fSL "http://aminet.net/dev/c/vbcc_PosixLib.lha" -o /tmp/vbcc_PosixLib.
     cd /tmp; \
     lhasa -xfq2 vbcc_PosixLib.lha; \
     mkdir -p /opt/sdk/PosixLib/; \
-    mv PosixLib/include/ /opt/sdk/PosixLib/;
+    mv ./PosixLib/include/ /opt/sdk/PosixLib/;
 
 ENV POSIXLIB_INC="/opt/sdk/PosixLib/include"
 
+# Install FlexCat
+RUN curl -fSL "https://github.com/adtools/flexcat/releases/download/2.18/FlexCat-2.18.lha" -o /tmp/FlexCat.lha; \
+    cd /tmp; \
+    lhasa -xfq2 FlexCat.lha; \
+    cp ./FlexCat/Linux-i386/flexcat /usr/bin/;
+
 WORKDIR /opt/code
 
 # Clean up APT when done.

diff --git a/ppc/Dockerfile b/ppc/Dockerfile
@@ -23,7 +23,7 @@ RUN curl -fSL "http://sun.hasenbraten.de/vasm/release/vasm.tar.gz" -o /tmp/vasm.
     tar xvfz vasm.tar.gz; \
     cd /tmp/vasm; \
     make CPU=ppc SYNTAX=std; \
-    cp vasmppc_std vobjdump /opt/vbcc/bin; 
+    cp ./vasmppc_std ./vobjdump /opt/vbcc/bin; 
 
 ENV VBCC="/opt/vbcc"
 
@@ -33,7 +33,7 @@ RUN curl -fSL "http://sun.hasenbraten.de/vlink/release/vlink.tar.gz" -o /tmp/vli
     tar xvfz vlink.tar.gz; \
     cd /tmp/vlink; \
     make; \
-    cp vlink /opt/vbcc/bin;
+    cp ./vlink /opt/vbcc/bin;
 
 # Install vbcc
 RUN curl -fSL "http://www.ibaug.de/vbcc/vbcc.tar.gz" -o /tmp/vbcc.tar.gz; \
@@ -44,7 +44,7 @@ RUN curl -fSL "http://www.ibaug.de/vbcc/vbcc.tar.gz" -o /tmp/vbcc.tar.gz; \
     yes '\
 ' | make TARGET=ppc; \
     make TARGET=ppc bin/vscppc; \
-    cp bin/vbcc* bin/vscppc bin/vc bin/vprof /opt/vbcc/bin;
+    cp ./bin/vbcc* ./bin/vscppc ./bin/vc ./bin/vprof /opt/vbcc/bin;
 
 RUN curl -fSL "https://server.owl.de/~frank/vbcc/2019-10-04/vbcc_target_ppc-amigaos.lha" -o /tmp/vbcc_target_ppc-amigaos.lha; \
     # curl -fSL "https://server.owl.de/~frank/vbcc/2019-10-04/vbcc_target_ppc-morphos.lha" -o /tmp/vbcc_target_ppc-morphos.lha; \
@@ -53,8 +53,8 @@ RUN curl -fSL "https://server.owl.de/~frank/vbcc/2019-10-04/vbcc_target_ppc-amig
     lhasa -xfq2 vbcc_target_ppc-amigaos.lha; \
     # lhasa x vbcc_target_ppc-morphos.lha; \
     tar xvfz vbcc_unix_config.tar.gz; \
-    mv config $VBCC/; \
-    mv vbcc_target_ppc-amigaos/targets $VBCC/; 
+    mv ./config $VBCC/; \
+    mv ./vbcc_target_ppc-amigaos/targets $VBCC/; 
     # cp vbcc_target_ppc-morphos/targets/* $VBCC/targets/ -r;
 
 ENV PATH="$VBCC/bin:$PATH"
@@ -67,11 +67,11 @@ RUN curl -fkSL "https://www.hyperion-entertainment.biz/index.php?option=com_regi
     lhasa -xfq2 clib2*.lha; \
     lhasa -xfq2 newlib*.lha; \
     lhasa -xfq2 base.lha; \
-    mv Documentation /opt/sdk/ppc-amigaos; \
-    mv Examples /opt/sdk/ppc-amigaos; \
-    mv Include /opt/sdk/ppc-amigaos; \
-    mv newlib /opt/sdk/ppc-amigaos; \
-    mv clib2 /opt/sdk/ppc-amigaos;
+    mv ./Documentation /opt/sdk/ppc-amigaos; \
+    mv ./Examples /opt/sdk/ppc-amigaos; \
+    mv ./Include /opt/sdk/ppc-amigaos; \
+    mv ./newlib /opt/sdk/ppc-amigaos; \
+    mv ./clib2 /opt/sdk/ppc-amigaos;
 
 ENV AOS4_SDK_INC="/opt/sdk/ppc-amigaos/Include/include_h"
 ENV AOS4_NET_INC="/opt/sdk/ppc-amigaos/Include/netinclude"
@@ -84,21 +84,21 @@ RUN curl -fSL "http://muidev.de/download/MUI%205.0%20-%20Release/MUI-5.0-2019R4-
     cd /tmp; \
     lhasa -xfq2 MUI-5.0.lha; \
     lhasa -xfq2 MUI-5.0-contrib.lha; \
-    mv SDK/MUI /opt/sdk/MUI_5.0;
+    mv ./SDK/MUI /opt/sdk/MUI_5.0;
 
 ENV MUI50_INC="/opt/sdk/MUI_5.0/C/include"
 
 # Install MCC_GuiGfx
 RUN curl -fSL "http://aminet.net/dev/mui/MCC_Guigfx.lha" -o /tmp/MCC_Guigfx.lha; \
     cd /tmp; \
     lhasa -xfq2 MCC_Guigfx.lha; \
-    cp MCC_Guigfx/Developer/C/Include/MUI/* /opt/sdk/MUI_5.0/C/include/mui;
+    cp ./MCC_Guigfx/Developer/C/Include/MUI/* /opt/sdk/MUI_5.0/C/include/mui;
 
 # Install AMISSL SDK
 RUN curl -fSL "https://github.com/jens-maus/amissl/releases/download/4.4/AmiSSL-4.4.lha" -o /tmp/AmiSSL.lha; \
     cd /tmp; \
     lhasa -xfq2 AmiSSL.lha; \
-    mv AmiSSL/Developer /opt/sdk/AmiSSL;
+    mv ./AmiSSL/Developer /opt/sdk/AmiSSL;
 
 ENV AMISSL_INC="/opt/sdk/AmiSSL/include"
 
@@ -110,6 +110,12 @@ ENV AMISSL_INC="/opt/sdk/AmiSSL/include"
 
 # ENV GL4ES_INC="/opt/sdk/GL4ES/include"
 
+# Install FlexCat
+RUN curl -fSL "https://github.com/adtools/flexcat/releases/download/2.18/FlexCat-2.18.lha" -o /tmp/FlexCat.lha; \
+    cd /tmp; \
+    lhasa -xfq2 FlexCat.lha; \
+    cp ./FlexCat/Linux-i386/flexcat /usr/bin/;
+
 WORKDIR /opt/code
 
 # Clean up APT when done.