From 35edfa5e6d197360583f6801a5f5692493c6808a Mon Sep 17 00:00:00 2001
From: Raphael Bahuau <raphael.bahuau@externalgcp.ds.airbus.com>
Date: Wed, 18 Sep 2019 09:46:04 +0200
Subject: [PATCH] Update Dockerfile to support fxsdk & gint MAJ

---
 .gitignore |  4 +++-
 Dockerfile | 10 ++++------
 README.md  | 12 +++++++++---
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index e86a508..8bd7230 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-*.tar*
\ No newline at end of file
+fxsdk
+gint
+*.tar*
diff --git a/Dockerfile b/Dockerfile
index 846e0d2..788c9f2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,14 +44,12 @@ RUN cd $PREFIX/gcc-8.2.0 && \
 # TODO git clone with commit number (or find a better way to rebuild from this)
 
 # fxsdk
-RUN cd $PREFIX && \
-    git clone https://gitea.planet-casio.com/Lephenixnoir/fxsdk.git && \
-    cd fxsdk && bash configure --prefix=$PREFIX && make && make install
+ADD fxsdk $PREFIX/fxsdk
+RUN cd $PREFIX/fxsdk && bash configure --prefix=$PREFIX && make && make install
 
 # gint
-RUN cd $PREFIX && \
-    git clone --single-branch --branch compat https://gitea.planet-casio.com/Lephenixnoir/gint.git && \
-    cd gint && mkdir build.fx && cd build.fx && \
+ADD gint $PREFIX/gint
+RUN cd $PREFIX/gint && mkdir build.fx && cd build.fx && \
     ../configure --target=fx9860g && make && make install
 
 WORKDIR /casio
diff --git a/README.md b/README.md
index 5d3775e..8dc2b64 100644
--- a/README.md
+++ b/README.md
@@ -4,22 +4,28 @@ A docker for casio developpment on linux, with gint and fxsdk from Lephenixnoir.
 
 ## Docker
 
-Download archives :
+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
 - 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`
 
-Build
+Build (also in the casio-docker folder)
 
 - `docker build -t casio .`
 
-Run (execute in your project folder)
+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)
+
+- `git pull`
+
 ## Useful links
 
 Planète Casio