4 files changed, 83 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml
index aef289aaa..82ada814f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,10 @@ matrix:
 
 install: true
 
+cache:
+  directories:
+    - gnat
+
 script:
 - ./dist/linux/travis-ci.sh
 
diff --git a/dist/linux/docker-buildtest.sh b/dist/linux/docker-buildtest.sh
index a3f38a32c..f34fc246d 100755
--- a/dist/linux/docker-buildtest.sh
+++ b/dist/linux/docker-buildtest.sh
@@ -53,7 +53,7 @@ if [ -n "$GRAB_SRCS" ]; then
   p="$p && mv ghdl-master/* ./ && rm -rf ghdl-master"
 
   set +e
-  docker run --name ghdl_cmp -t "$DOCKER_IMG" sh -c "$p &&./dist/linux/buildtest.sh $ENABLECOLOR-t $TASK -b $BLD -f $PKG_FILE"
+  docker run --name ghdl_cmp -t "$DOCKER_IMG" sh -c "$p &&./dist/linux/buildtest.sh $ENABLECOLOR -t $TASK -b $BLD -f $PKG_FILE"
   docker cp "ghdl_cmp:/work/log.log" "./log.log"
   set -e
   docker cp "ghdl_cmp:/work/$PKG_FILE" ./
@@ -61,6 +61,6 @@ if [ -n "$GRAB_SRCS" ]; then
 
 else
 
-  docker run --rm -tv $(pwd):/work:Z -w="/work" "$DOCKER_IMG" sh -c "./dist/linux/buildtest.sh $ENABLECOLOR-t $TASK -b $BLD -f $PKG_FILE"
+  docker run --rm -tv $(pwd):/work:Z -w="/work" "$DOCKER_IMG" sh -c "./dist/linux/buildtest.sh $ENABLECOLOR -t $TASK -b $BLD -f $PKG_FILE"
 
 fi
diff --git a/dist/linux/travis-ci.sh b/dist/linux/travis-ci.sh
index c79ef222b..55f30d270 100755
--- a/dist/linux/travis-ci.sh
+++ b/dist/linux/travis-ci.sh
@@ -1,8 +1,28 @@
 #! /bin/bash
 # This script is executed in the travis-ci environment.
 
+. dist/ansi_color.sh
+#disable_color
+
+# Display env (to debug)
+printf "$ANSI_YELLOW[TRAVIS] Travis environment $ANSI_NOCOLOR\n"
+env | grep TRAVIS
+
+PKG_SHORTCOMMIT="$(printf $TRAVIS_COMMIT | cut -c1-10)"
+PKG_VER=`grep Ghdl_Ver src/version.in | sed -e 's/.*"\(.*\)";/\1/'`
+PKG_TAG="$TRAVIS_TAG"
+if [ -z "$TRAVIS_TAG" ]; then
+    PKG_TAG="$(date -u +%Y%m%d)-$PKG_SHORTCOMMIT";
+fi
+
+# OS-X
+
 if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-    echo "OS X build not yet supported"
+    ./dist/macosx/install-ada.sh
+    PATH=$PWD/gnat/bin:$PATH
+    DBLD=mcode
+    DDIST=macosx
+    ./dist/linux/buildtest.sh $ENABLE_COLOR -t 0 -b "$DBLD" -f "ghdl-$PKG_TAG-$DBLD-$DDIST.tgz"
     exit
 fi
 
@@ -24,20 +44,6 @@ thismatrix=regular
 
 #---
 
-. dist/ansi_color.sh
-#disable_color
-
-# Display env (to debug)
-printf "$ANSI_YELLOW[TRAVIS] Travis environment $ANSI_NOCOLOR\n"
-env | grep TRAVIS
-
-PKG_SHORTCOMMIT="$(printf $TRAVIS_COMMIT | cut -c1-10)"
-PKG_VER=`grep Ghdl_Ver src/version.in | sed -e 's/.*"\(.*\)";/\1/'`
-PKG_TAG="$TRAVIS_TAG"
-if [ -z "$TRAVIS_TAG" ]; then
-    PKG_TAG="$(date -u +%Y%m%d)-$PKG_SHORTCOMMIT";
-fi
-
 cloned=$(pwd)
 
 #### Per build function
diff --git a/dist/macosx/install-ada.sh b/dist/macosx/install-ada.sh
new file mode 100755
index 000000000..eb1d2607f
--- /dev/null
+++ b/dist/macosx/install-ada.sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+set -e
+
+if [ -e gnat/etc/install_ok ]; then
+    echo "gnatgpl already installed"
+    exit 0
+fi
+
+# Download from libre.adacore.com
+tarfile=gnat-gpl-2017-x86_64-darwin-bin.tar.gz
+#curl -o $tarfile http://mirrors.cdn.adacore.com/art/591c9045c7a447af2deed24e
+
+# un tar
+#tar xf $tarfile
+
+# Direct install
+#mv gnat-gpl-2017-x86_64-darwin-bin gnat
+
+# Cleanup: remove components not needed
+rm -rf gnat/share/{themes,icons}
+rm -rf gnat/share/{man,info,doc,examples,gpr,gprconfig,gnatcoll}
+rm -rf gnat/share/gps
+rm -rf gnat/share/gdb* gnat/share/glib* gnat/share/gcc-*/python
+rm -rf gnat/etc/fonts gnat/etc/gtk*
+
+rm -f gnat/bin/aws* gnat/bin/gps* gnat/bin/gcov*
+rm -f gnat/bin/gnat2* gnat/bin/xml2* gnat/bin/gnatcoll*
+rm -f gnat/bin/gnat{doc,metric,pp,stub,prep,test,check,elim,inspect,find,kr}
+rm -f gnat/bin/gnat{xref,name}
+rm -f gnat/bin/gpr* gnat/bin/templates* gnat/bin/web* gnat/bin/wsdl*
+rm -f gnat/bin/{gdb,cpp,c++,g++} gnat/bin/x86_64-*
+
+rm -rf gnat/include/{asis,aunit,gnat_util,gnatcoll,gpr,xmlada}
+rm -rf gnat/include/aws* gnat/include/pycairo gnat/include/python*
+rm -rf gnat/include/pygobject* gnat/include/gdb
+rm -rf gnat/include/c++
+
+rm -f gnat/lib/libcc1* gnat/lib/libgomp* gnat/lib/libitm* gnat/lib/libasan*
+rm -f gnat/lib/libatomic* gnat/lib/libobjc* gnat/lib/libssp*
+rm -f gnat/lib/libstdc++* gnat/lib/libubsan* gnat/lib/libsupc++*
+rm -f gnat/lib/libxmlada*
+rm -rf gnat/lib/{aunit,gnat,gnat_util,gnatcoll,gpr,gps,xmlada}
+rm -rf gnat/lib/aws* gnat/lib/girepository* gnat/lib/gtk*
+rm -rf gnat/lib/python*
+rm -rf gnat/lib/gcc/x86*/*/{gcc-include,plugin,install-tools}
+rm -rf gnat/lib/gcc/x86*/*/rts-ios-simulator
+rm -rf gnat/lib/gcc/x86*/*/rts-native/adalib/lib*.dSYM
+rm -rf gnat/lib/gcc/x86*/*/rts-native/adalib/*.dylib
+rm -rf gnat/lib/gcc/x86*/*/rts-native/adalib/lib*_pic.a
+
+rm -rf gnat/libexec/gprbuild
+rm -rf gnat/libexec/gcc/x86*/*/{plugin,install-tools}
+rm -f gnat/libexec/gcc/x86*/*/{cc1obj,cc1plus,lto1}
+
+touch gnat/etc/install_ok