From d88f0ed6101dcc27e4e7042db3e932aeddc7f4c9 Mon Sep 17 00:00:00 2001
From: "Achim D. Brucker" <adbrucker@0x5f.org>
Date: Tue, 18 Jun 2019 07:39:43 +0100
Subject: [PATCH] Added support for Isabelle 2019.

---
 .ci/Jenkinsfile     |  2 ++
 build.sh            | 15 +++++++++++----
 isabelle/Dockerfile |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
index 3e5dac3..9ceb5d9 100644
--- a/.ci/Jenkinsfile
+++ b/.ci/Jenkinsfile
@@ -8,6 +8,8 @@ pipeline {
 		sh './build.sh 2017 Functional-Automata'
                 echo 'Building Isabelle 2018'
 		sh './build.sh 2018 Functional-Automata'
+                echo 'Building Isabelle 2019'
+		sh './build.sh 2019 Functional-Automata'
             }
         }
     }
diff --git a/build.sh b/build.sh
index 3801d8e..42601a6 100755
--- a/build.sh
+++ b/build.sh
@@ -27,17 +27,24 @@
 
 set -e 
 
-VERSION=${1:-2018}
+VERSION=${1:-2019}
 SESSIONS=${2:-"HOL"}
 DOCKERUID=${3:-`id -u`}
 
+LATEST="2019"
+
 # Generate base image
 docker build -t logicalhacking:debian4isabelle debian4isabelle
 
 # Generate Isabelle image
-ISA_URL="https://isabelle.in.tum.de/website-Isabelle"$VERSION"/dist/Isabelle"$VERSION"_app.tar.gz"
-AFP_URL="https://sourceforge.net/projects/afp/files/afp-Isabelle$VERSION/"
-AFP_TAR=`w3m -dump  $AFP_URL | grep ^afp- | head -1 | awk -e '{print $1}'`
+ISA_URL="https://isabelle.in.tum.de/website-Isabelle"$VERSION"/dist/Isabelle"$VERSION"_linux.tar.gz"
+if [ "$LATEST" -eq "$VERSION" ]; then
+  AFP_URL="https://www.isa-afp.org/release/"
+  AFP_TAR=`w3m -dump  $AFP_URL | grep "afp-[0-9]" | awk -e '{print $3}' | sort -r | head -1`
+else
+  AFP_URL="https://sourceforge.net/projects/afp/files/afp-Isabelle$VERSION/"
+  AFP_TAR=`w3m -dump  $AFP_URL | grep ^afp- | head -1 | awk -e '{print $1}'`
+fi
 
 for url in $ISA_URL $AFP_URL/$AFP_TAR; do
   if curl --output /dev/null --silent --head --fail "$url"; then
diff --git a/isabelle/Dockerfile b/isabelle/Dockerfile
index c4951f1..0eca317 100644
--- a/isabelle/Dockerfile
+++ b/isabelle/Dockerfile
@@ -53,6 +53,6 @@ RUN curl -L -o "Isabelle.tar.gz" "$isabelle" && \
   mkdir .isabelle && \
   echo `pwd`/afp/thys > .isabelle/ROOTS && \
   perl -pi -e 's,ISABELLE_HOME_USER=.*,ISABELLE_HOME_USER="\$USER_HOME/.isabelle",g;' Isabelle/etc/settings && \
-  Isabelle/bin/isabelle build -s -b $sessions
+  Isabelle/bin/isabelle build -b $sessions
 
 ENV PATH="/home/isabelle/Isabelle/bin:${PATH}"