From 7a14f45fcd70439c33e764f63aeba312dfc7a033 Mon Sep 17 00:00:00 2001
From: Adam Sapek <adamsap@microsoft.com>
Date: Thu, 2 Apr 2015 03:00:09 -0700
Subject: [PATCH] Update CI configuration files

AppVeyor:
1. Work around memory limitations in Haskell build
2. Run subset of C# test matrix if the sandbox wasn't in cache

Travis CI
1. Change project type to C++
2. Install Mono manually in Linux
3. Use Clang as C++ compiler
4. cabal install happy
---
 .travis.yml                | 16 +++++++++-------
 README.md                  |  5 ++++-
 appveyor.yml               | 27 ++++++++++++++++++++-------
 compiler/cabal_build.cmake | 16 +++++++++++++---
 doc/CMakeLists.txt         |  2 +-
 5 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index edf725c6..e6d109f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,16 @@
-language: csharp
+language: cpp
+compiler: clang
 os:
     - linux
     - osx
 
 before_install:
-    - echo $TRAVIS_OS_NAME
-    - export CC=clang
     #linux prereqisite packages
+    - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF; fi
+    - if [ "$TRAVIS_OS_NAME" == "linux" ]; then echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list; fi
+    - if [ "$TRAVIS_OS_NAME" == "linux" ]; then echo "deb http://download.mono-project.com/repo/debian wheezy-libtiff-compat main" | sudo tee -a /etc/apt/sources.list.d/mono-xamarin.list; fi
+    - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update -qq; fi
+    - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -y mono-complete referenceassemblies-pcl; fi
     - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository ppa:smspillaz/cmake-2.8.12 -y; fi
     - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository ppa:boost-latest/ppa -y; fi
     - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository ppa:hvr/ghc -y; fi
@@ -18,15 +22,13 @@ before_install:
     - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install ghc cabal-install; fi
     - if [ "$TRAVIS_OS_NAME" == "osx" ]; then curl -s -o mono.pkg http://download.mono-project.com/archive/3.12.0/macos-10-x86/MonoFramework-MDK-3.12.0.macos10.xamarin.x86.pkg; fi
     - if [ "$TRAVIS_OS_NAME" == "osx" ]; then sudo installer -pkg "mono.pkg" -target /; fi
-    #show versions of cmake and clang
-    - cmake --version && clang --version
     #nuget installation
     - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install nuget && export NUGET=nuget; fi
     - if [ "$TRAVIS_OS_NAME" == "osx" ]; then curl -s -o "cs/nuget/nuget.exe" -L "http://www.nuget.org/nuget.exe" && export NUGET="mono cs/nuget/nuget.exe"; fi
     #nunit installation
     - $NUGET install NUnit.Runners -version 2.6.4
-    #cabal-install from ppa is installed into /opt
-    - if [ "$TRAVIS_OS_NAME" == "linux" ]; then /opt/cabal/1.22/bin/cabal update; else cabal update; fi
+    - if [ "$TRAVIS_OS_NAME" == "linux" ]; then $CABAL_PATH/cabal update; else cabal update; fi
+    - if [ "$TRAVIS_OS_NAME" == "linux" ]; then $CABAL_PATH/cabal install happy; else cabal install happy; fi
 
 before_script:
     #restore nuget packages for solution
diff --git a/README.md b/README.md
index fb5b9353..d9be7151 100644
--- a/README.md
+++ b/README.md
@@ -70,6 +70,8 @@ packages are needed:
         libboost-test-dev \
         libboost-python-dev
 
+    cabal install happy
+
 Running the following command in the build directory will build and execute all 
 the tests and examples:
 
@@ -92,9 +94,10 @@ using Homebrew ([http://brew.sh/](http://brew.sh/)):
 
 (boost-python is optional and only needed for Python support)
 
-Update cabal package database:
+Update cabal package database and install `happy` (only needed for tests): 
 
     cabal update
+    cabal install happy
 
 Bond can be built on OS X using either standard *nix makefiles or XCode. In 
 order to generate and build makefiles, in the root `bond` directory run:
diff --git a/appveyor.yml b/appveyor.yml
index 5cd0a449..f377175c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,6 +6,12 @@ install:
 - ps: >-
     if ($env:APPVEYOR_REPO_BRANCH -ne "fsharp") {
 
+        if (Test-Path compiler\.cabal-sandbox) {
+
+            $env:SandboxCache = "restored"
+
+        }
+
         #choco install 7zip
 
         #$env:Path += ";${env:ProgramFiles}\7-Zip"
@@ -24,7 +30,7 @@ install:
 
         #$env:BOOST_ROOT = "${env:APPVEYOR_BUILD_FOLDER}\boost_1_57_0"
 
-        choco install haskellplatform -version 2014.2.0.0
+        choco install haskellplatform -version 2014.2.0.0 -y
 
         # Haskell Platfrom package doesn't update PATH for the current shell instance
 
@@ -94,15 +100,22 @@ test_script:
 
     if ($env:APPVEYOR_REPO_BRANCH -ne "fsharp") {
 
-        nunit-console-x86 /framework:net-4.0 /labels cs\test\core\bin\debug\net40\Properties\Bond.UnitTest.dll cs\test\core\bin\debug\net40\Fields\Bond.UnitTest.dll cs\test\internal\bin\debug\net40\Bond.InternalTest.dll
-        
-        nunit-console-x86 /framework:net-4.5 /labels cs\test\core\bin\debug\net45\Properties\Bond.UnitTest.dll cs\test\core\bin\debug\net45\Fields\Bond.UnitTest.dll cs\test\internal\bin\debug\net45\Bond.InternalTest.dll
+        if ($env:SandboxCache -ne "restored") {
 
-        #cd build
+            nunit-console-x86 /framework:net-4.5 /labels cs\test\core\bin\debug\net45\Properties\Bond.UnitTest.dll cs\test\internal\bin\debug\net45\Bond.InternalTest.dll
 
-        #ctest -C Release -R compatibility --output-on-failure
+        } else {
 
-        #cd ..
+            nunit-console-x86 /framework:net-4.0 /labels cs\test\core\bin\debug\net40\Properties\Bond.UnitTest.dll cs\test\core\bin\debug\net40\Fields\Bond.UnitTest.dll cs\test\internal\bin\debug\net40\Bond.InternalTest.dll
+
+            nunit-console-x86 /framework:net-4.5 /labels cs\test\core\bin\debug\net45\Properties\Bond.UnitTest.dll cs\test\core\bin\debug\net45\Fields\Bond.UnitTest.dll cs\test\internal\bin\debug\net45\Bond.InternalTest.dll
+
+            #cd build
+
+            #ctest -C Release -R compatibility --output-on-failure
+
+            #cd ..
+        }
 
     } else {
 
diff --git a/compiler/cabal_build.cmake b/compiler/cabal_build.cmake
index 802dc35e..32c856fd 100644
--- a/compiler/cabal_build.cmake
+++ b/compiler/cabal_build.cmake
@@ -10,12 +10,22 @@
 cmake_policy (SET CMP0012 NEW)
 
 if ($ENV{APPVEYOR})
-    # AppVeyor Azure VMs have limited memory, limit ghc heap to 192 MB
-    set (GHC_OPTIONS --ghc-option=+RTS --ghc-option=-M192m --ghc-option=-RTS)
+    # AppVeyor Azure VMs have limited memory and shakespeare package doesn't
+    # install as a dependency of the Bond compiler. As a workaround we install
+    # shakespeare explicitly when running under AppVeyor and we limit the heap
+    # used by ghc to 400 MB.
+    execute_process (
+        COMMAND ${Haskell_CABAL_EXECUTABLE} install shakespeare --with-compiler=${Haskell_GHC_EXECUTABLE} --jobs --ghc-option=+RTS --ghc-option=-M400m --ghc-option=-RTS
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        RESULT_VARIABLE error)
+    
+    if (error)
+        message (FATAL_ERROR)
+    endif()
 endif()
 
 execute_process (
-    COMMAND ${Haskell_CABAL_EXECUTABLE} install   ${cabal_options} --with-compiler=${Haskell_GHC_EXECUTABLE} --only-dependencies --jobs ${GHC_OPTIONS}
+    COMMAND ${Haskell_CABAL_EXECUTABLE} install   ${cabal_options} --with-compiler=${Haskell_GHC_EXECUTABLE} --extra-prog-path=$ENV{HOME}/.cabal/bin --only-dependencies --jobs
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     RESULT_VARIABLE error)
 
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 1b71392b..af091e94 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -85,7 +85,7 @@ if (Haskell_PANDOC_EXECUTABLE)
         OUTPUT_NAME index
         OUTPUT_DIR reference)
 
-    add_pandoc_markdown (../readme.md
+    add_pandoc_markdown (../README.md
         TEMPLATE index.html
         OUTPUT_NAME index
         CODE python)