From 23140adfddf1af72bf3214f0254d3abe716a5297 Mon Sep 17 00:00:00 2001
From: Raphael Bahuau <raphael.bahuau@externalgcp.ds.airbus.com>
Date: Fri, 4 Sep 2020 12:00:36 +0200
Subject: [PATCH] Update to match new gint v2

---
 Dockerfile | 12 ++++++------
 README.md  | 24 +++++++++++++++---------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 20f036a..1cc58b8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,8 @@ FROM alpine
 
 # set up environment variables for the compiler
 ENV TARGET="sh3eb-elf" \
-    COMPILER="/opt/sh-elf-2.31.1-8.2.0" \
-    PATH="$PATH:/opt/sh-elf-2.31.1-8.2.0/bin"
+    COMPILER="/opt/sh-elf-2.35-10.2.0" \
+    PATH="$PATH:/opt/sh-elf-2.35-10.2.0/bin"
 
 # dependencies
 RUN apk update && apk add --update --no-cache \
@@ -21,21 +21,21 @@ RUN apk update && apk add --update --no-cache \
     flex
 
 # extract archives (binutils & gcc)
-ADD binutils-2.31.1.tar.xz gcc-8.2.0.tar.xz $COMPILER/
+ADD binutils-2.35.tar.xz gcc-10.2.0.tar.xz $COMPILER/
 
 # binutils
 RUN cd $COMPILER && mkdir build-binutils && cd build-binutils && \
-    ../binutils-2.31.1/configure --prefix=$COMPILER --target=$TARGET --with-multilib-list=m3,m4-nofpu --disable-nls --program-prefix=sh-elf- && \
+    ../binutils-2.35/configure --prefix=$COMPILER --target=$TARGET --with-multilib-list=m3,m4-nofpu --disable-nls --program-prefix=sh-elf- && \
     make && make install
 
 # gcc
 RUN cd $COMPILER && mkdir build-gcc && cd build-gcc && \
-    ../gcc-8.2.0/configure --prefix=$COMPILER --target=$TARGET --with-multilib-list=m3,m4-nofpu --enable-languages=c,c++ --without-headers --with-newlib --disable-nls --program-prefix=sh-elf- && \
+    ../gcc-10.2.0/configure --prefix=$COMPILER --target=$TARGET --with-multilib-list=m3,m4-nofpu --enable-languages=c,c++ --without-headers --with-newlib --disable-nls --program-prefix=sh-elf- && \
     make all-gcc && make install-gcc
 
 # link gcc with libgcc
 # need to fix the contrib/dl script : https://www.mail-archive.com/gcc-bugs@gcc.gnu.org/msg549371.html
-RUN cd $COMPILER/gcc-8.2.0 && \
+RUN cd $COMPILER/gcc-10.2.0 && \
     sed -i 's/sha512sum --check/sha512sum -c/g' ./contrib/download_prerequisites && \
     ./contrib/download_prerequisites && \
     cd $COMPILER/build-gcc && \
diff --git a/README.md b/README.md
index 8dc2b64..98f96ec 100644
--- a/README.md
+++ b/README.md
@@ -2,29 +2,35 @@
 
 A docker for casio developpment on linux, with gint and fxsdk from Lephenixnoir.
 
-## Docker
+## Setup
 
-Download archives (in the casio-docker folder)
+Download archives *(in the casio-docker folder)*
 
-- ftp://gcc.gnu.org/pub/gcc/releases/gcc-8.2.0/gcc-8.2.0.tar.xz
-- ftp://ftp.gnu.org/gnu/binutils/binutils-2.31.1.tar.xz
+- ftp://gcc.gnu.org/pub/gcc/releases/gcc-10.2.0/gcc-10.2.0.tar.xz
+- ftp://ftp.gnu.org/gnu/binutils/binutils-2.35.tar.xz
 - https://p7.planet-casio.com/pub/libp7-3.0.tar.gz
 - https://p7.planet-casio.com/pub/p7utils-3.0.tar.gz
 - `git clone https://gitea.planet-casio.com/Lephenixnoir/fxsdk.git`
-- `git clone --single-branch --branch compat https://gitea.planet-casio.com/Lephenixnoir/gint.git`
+- `git clone https://gitea.planet-casio.com/Lephenixnoir/gint.git`
 
-Build (also in the casio-docker folder)
+Build *(also in the casio-docker folder)*
 
 - `docker build -t casio .`
 
-Run (in your add-in project folder)
+## Development
+
+Run *(in your add-in project folder)*
 
 - Linux `docker run -u 0 -it --rm -v $(pwd):/casio casio`
 - Windows `docker run -u 0 -it --rm -v "/$(pwd)":/casio casio`
 
-Update fxsdk & gint version (in the casio-docker/fxsdk and in casio-docker/gint folder)
+## Update build
 
-- `git pull`
+Update fxsdk & gint version *(in the casio-docker folder)*
+
+- `git -C fxsdk pull origin master`
+- `git -C gint pull origin master`
+- then re-build docker image
 
 ## Useful links