From 3525841aadcbdebc4ace535a2158fa6d78a0688b Mon Sep 17 00:00:00 2001 From: mheyer Date: Mon, 15 Jun 2020 23:10:36 -0700 Subject: [PATCH 01/10] Add Picasso96API to SDK --- sdk/p96.sdk | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 sdk/p96.sdk diff --git a/sdk/p96.sdk b/sdk/p96.sdk new file mode 100644 index 0000000..f9b73a1 --- /dev/null +++ b/sdk/p96.sdk @@ -0,0 +1,13 @@ +Short: Picasso96 retargetable graphics system +Version: 2.3 +Url: http://wiki.icomp.de/w/images/e/e9/Develop.lha + +Picasso96Develop/Include/libraries/Picasso96.i +Picasso96Develop/Include/autodocs/Picasso96API.doc +Picasso96Develop/Include/clib/Picasso96_protos.h +Picasso96Develop/Include/inline/Picasso96.h +Picasso96Develop/Include/pragmas/Picasso96_pragmas.h +Picasso96Develop/Include/proto/Picasso96.h +Picasso96Develop/Include/fd/Picasso96API_lib.fd + + From 91461df4d7e3572104c2d27e7feb66f9af4e07d5 Mon Sep 17 00:00:00 2001 From: mheyer Date: Tue, 16 Jun 2020 17:07:23 -0700 Subject: [PATCH 02/10] fixup P96 install libraries/Picasso96.h was missing We have to do some trickery with the lvo file to make it appear in the lvo/ directory Plus, let the toolchain create a stubs file. --- sdk/p96.sdk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk/p96.sdk b/sdk/p96.sdk index f9b73a1..5a0ae1e 100644 --- a/sdk/p96.sdk +++ b/sdk/p96.sdk @@ -3,11 +3,15 @@ Version: 2.3 Url: http://wiki.icomp.de/w/images/e/e9/Develop.lha Picasso96Develop/Include/libraries/Picasso96.i +Picasso96Develop/Include/libraries/Picasso96.h Picasso96Develop/Include/autodocs/Picasso96API.doc Picasso96Develop/Include/clib/Picasso96_protos.h Picasso96Develop/Include/inline/Picasso96.h Picasso96Develop/Include/pragmas/Picasso96_pragmas.h Picasso96Develop/Include/proto/Picasso96.h Picasso96Develop/Include/fd/Picasso96API_lib.fd +Picasso96Develop/Include/lvo_p96.i = ../lvo/lvo_p96.i +fd2sfd : Picasso96API_lib.fd clib/Picasso96_protos.h +stubs : Picasso96API_lib.sfd From 0f667ed278dd9ddf5c6ffd4c76d358cb0edfabee Mon Sep 17 00:00:00 2001 From: KaiN Date: Sun, 21 Jun 2020 12:53:39 +0200 Subject: [PATCH 03/10] added link to compiled gcc for windows also, instructions for WSL2 are exactly the same as ubuntu/debian --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index bf3dfa8..29707c5 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,8 @@ Right now these tools are build: ## Prerequisites ### Centos `sudo yum install wget gcc gcc-c++ python git perl-Pod-Simple gperf patch autoconf automake make makedepend bison flex ncurses-devel gmp-devel mpfr-devel libmpc-devel gettext-devel texinfo rsync` -### Ubuntu, Debian + +### Ubuntu, Debian, Windows Subsystem for Linux `sudo apt install make wget git gcc g++ lhasa libgmp-dev libmpfr-dev libmpc-dev flex bison gettext texinfo ncurses-dev autoconf rsync` If building with a normal user, the `PREFIX` directory must be writable (default is `/opt/amiga`). You can add the user to an appropriate group. @@ -49,13 +50,13 @@ apt-cyg install gcc-core gcc-g++ python git perl-Pod-Simple gperf patch automake ``` ### Windows with msys2 + +Precompiled suite with installer: http://franke.ms/download/setup-amiga-gcc.exe + ``` pacman -S git base-devel gcc flex gmp-devel mpc-devel mpfr-devel ncurses-devel rsync ``` -### Ubuntu running on the Windows 10 Linux subsystem -tbd - ## Howto Clone and Download All You Need ``` git clone https://github.com/bebbo/amiga-gcc From 4d4571b8b85df4bc234d57cb25761d9556e8725d Mon Sep 17 00:00:00 2001 From: KaiN Date: Sun, 21 Jun 2020 13:00:10 +0200 Subject: [PATCH 04/10] Removed WSL note since it's not needed --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 29707c5..9c79fb2 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Right now these tools are build: ### Centos `sudo yum install wget gcc gcc-c++ python git perl-Pod-Simple gperf patch autoconf automake make makedepend bison flex ncurses-devel gmp-devel mpfr-devel libmpc-devel gettext-devel texinfo rsync` -### Ubuntu, Debian, Windows Subsystem for Linux +### Ubuntu, Debian `sudo apt install make wget git gcc g++ lhasa libgmp-dev libmpfr-dev libmpc-dev flex bison gettext texinfo ncurses-dev autoconf rsync` If building with a normal user, the `PREFIX` directory must be writable (default is `/opt/amiga`). You can add the user to an appropriate group. From ed178ea9b5b20ebe229e834c1beffa160b9304ee Mon Sep 17 00:00:00 2001 From: Per Weijnitz Date: Wed, 22 Jul 2020 18:15:41 +0200 Subject: [PATCH 05/10] Update Dockerfile to working condition --- Dockerfile | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3513ec4..6ac7231 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,24 @@ -FROM centos:7 as builder -RUN yum install -y gcc gcc-c++ python git perl-Pod-Simple gperf patch autoconf automake make makedepend bison flex ncurses-devel gmp-devel mpfr-devel libmpc-devel gettext-devel texinfo wget -# LhA was missing in some of the steps -RUN yum install -y http://ftp.tu-chemnitz.de/pub/linux/dag/redhat/el6/en/x86_64/rpmforge/RPMS/lha-1.14i-19.2.2.el6.rf.x86_64.rpm -RUN git clone https://github.com/bebbo/amiga-gcc && cd amiga-gcc && make update && make all +FROM debian:10.4-slim AS builder + +RUN echo deb http://deb.debian.org/debian/ buster main non-free contrib >/etc/apt/sources.list &&\ + echo deb-src http://deb.debian.org/debian/ buster main non-free contrib >>/etc/apt/sources.list &&\ + echo deb http://security.debian.org/debian-security buster/updates main contrib non-free >>/etc/apt/sources.list &&\ + echo deb-src http://security.debian.org/debian-security buster/updates main contrib non-free >>/etc/apt/sources.list &&\ + echo deb http://deb.debian.org/debian/ buster-updates main contrib non-free >>/etc/apt/sources.list &&\ + echo deb-src http://deb.debian.org/debian/ buster-updates main contrib non-free >>/etc/apt/sources.list + +RUN apt-get -y update &&\ + apt-get -y install make wget git gcc g++ lhasa libgmp-dev libmpfr-dev libmpc-dev flex bison gettext texinfo ncurses-dev autoconf rsync git lhasa + +RUN git clone https://github.com/bebbo/amiga-gcc &&\ + cd amiga-gcc &&\ + make update &&\ + make all -j + + + +FROM debian:10.4-slim -FROM centos:7 -RUN yum install -y make git COPY --from=builder /opt/amiga /opt/amiga + +RUN apt-get -y install make git From 1503302f39030a3ea8f0c510e5eaa001da5506f3 Mon Sep 17 00:00:00 2001 From: Per Weijnitz Date: Wed, 22 Jul 2020 19:21:42 +0200 Subject: [PATCH 06/10] Remove unnecessary repository sections and adjust install target --- Dockerfile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6ac7231..7d9468a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ FROM debian:10.4-slim AS builder -RUN echo deb http://deb.debian.org/debian/ buster main non-free contrib >/etc/apt/sources.list &&\ - echo deb-src http://deb.debian.org/debian/ buster main non-free contrib >>/etc/apt/sources.list &&\ - echo deb http://security.debian.org/debian-security buster/updates main contrib non-free >>/etc/apt/sources.list &&\ - echo deb-src http://security.debian.org/debian-security buster/updates main contrib non-free >>/etc/apt/sources.list &&\ - echo deb http://deb.debian.org/debian/ buster-updates main contrib non-free >>/etc/apt/sources.list &&\ - echo deb-src http://deb.debian.org/debian/ buster-updates main contrib non-free >>/etc/apt/sources.list +RUN echo deb http://deb.debian.org/debian/ buster main >/etc/apt/sources.list &&\ + echo deb-src http://deb.debian.org/debian/ buster main >>/etc/apt/sources.list &&\ + echo deb http://security.debian.org/debian-security buster/updates main >>/etc/apt/sources.list &&\ + echo deb-src http://security.debian.org/debian-security buster/updates main >>/etc/apt/sources.list &&\ + echo deb http://deb.debian.org/debian/ buster-updates main >>/etc/apt/sources.list &&\ + echo deb-src http://deb.debian.org/debian/ buster-updates main >>/etc/apt/sources.list RUN apt-get -y update &&\ apt-get -y install make wget git gcc g++ lhasa libgmp-dev libmpfr-dev libmpc-dev flex bison gettext texinfo ncurses-dev autoconf rsync git lhasa @@ -21,4 +21,6 @@ FROM debian:10.4-slim COPY --from=builder /opt/amiga /opt/amiga -RUN apt-get -y install make git +RUN echo deb http://deb.debian.org/debian/ buster main >/etc/apt/sources.list &&\ + apt-get -y update &&\ + apt-get -y install make git From 78c2b4409138453b95d6d8be96b42f7761676bd2 Mon Sep 17 00:00:00 2001 From: Marlon Beijer Date: Mon, 3 Aug 2020 12:36:24 +0200 Subject: [PATCH 07/10] update sdk/mcc_betterstring.sdk -> 11.34 --- sdk/mcc_betterstring.sdk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/mcc_betterstring.sdk b/sdk/mcc_betterstring.sdk index abc642c..5541bee 100644 --- a/sdk/mcc_betterstring.sdk +++ b/sdk/mcc_betterstring.sdk @@ -1,6 +1,6 @@ Short: BetterString custom class for MUI -Version: 11.33 -Url: http://aminet.net/dev/mui/MCC_BetterString-11.33.lha +Version: 11.34 +Url: http://aminet.net/dev/mui/MCC_BetterString-11.34.lha MCC_BetterString/Developer/Autodocs/MCC/MCC_BetterString.doc MCC_BetterString/Developer/Autodocs/MCC/MCC_HotkeyString.doc From dd0ecb6bb472e3a222a5261765c3d7d559da8474 Mon Sep 17 00:00:00 2001 From: Marlon Beijer Date: Mon, 3 Aug 2020 13:27:21 +0200 Subject: [PATCH 08/10] update sdk/mcc_nlist.sdk -> 0.126 --- sdk/mcc_nlist.sdk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/mcc_nlist.sdk b/sdk/mcc_nlist.sdk index 8efadb1..b5c78ee 100644 --- a/sdk/mcc_nlist.sdk +++ b/sdk/mcc_nlist.sdk @@ -1,6 +1,6 @@ Short: NList custom classes for MUI -Version: 0.125 -Url: http://aminet.net/dev/mui/MCC_NList-0.125.lha +Version: 0.126 +Url: http://aminet.net/dev/mui/MCC_NList-0.126.lha MCC_NList/Developer/Autodocs/MCC/MCC_NBalance.doc MCC_NList/Developer/Autodocs/MCC/MCC_NFloattext.doc From cdf409dfa0943a9ae057ccf7c9e63557462ce3e8 Mon Sep 17 00:00:00 2001 From: Marlon Beijer Date: Mon, 3 Aug 2020 14:04:02 +0200 Subject: [PATCH 09/10] update sdk/mcc_texteditor.sdk -> 15.54 --- sdk/mcc_texteditor.sdk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/mcc_texteditor.sdk b/sdk/mcc_texteditor.sdk index 9a320ad..8c30f95 100644 --- a/sdk/mcc_texteditor.sdk +++ b/sdk/mcc_texteditor.sdk @@ -1,6 +1,6 @@ Short: TextEditor custom class for MUI -Version: 15.53 -Url: http://aminet.net/dev/mui/MCC_TextEditor-15.53.lha +Version: 15.54 +Url: http://aminet.net/dev/mui/MCC_TextEditor-15.54.lha MCC_TextEditor/Developer/Autodocs/MCC/MCC_TextEditor.doc MCC_TextEditor/Developer/C/include/mui/TextEditor_mcc.h From 634b559fff537f7eaf1b764fbeb1b637dcc85696 Mon Sep 17 00:00:00 2001 From: Marlon Beijer Date: Mon, 3 Aug 2020 14:06:03 +0200 Subject: [PATCH 10/10] update sdk/mcc_thebar.sdk -> 26.20 --- sdk/mcc_thebar.sdk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/mcc_thebar.sdk b/sdk/mcc_thebar.sdk index a8d80b7..2c3db9d 100644 --- a/sdk/mcc_thebar.sdk +++ b/sdk/mcc_thebar.sdk @@ -1,6 +1,6 @@ Short: Next Generation Toolbar MUI Custom Class -Version: 26.19 -Url: http://aminet.net/dev/mui/MCC_TheBar-26.19.lha +Version: 26.20 +Url: http://aminet.net/dev/mui/MCC_TheBar-26.20.lha MCC_TheBar/Developer/Autodocs/MCC/MCC_TheBar.doc MCC_TheBar/Developer/C/include/mui/TheBar_mcc.h