Merge branch 'master' into 0.9-dev

Author: lennart

.travis.yml

@@ -32,8 +32,6 @@ before_install:
  - unset CC
  - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
 
-# We install tidal-0.9-dev from git
-# and build it in a sandbox
 install:
  - cabal --version
  - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
@@ -44,7 +42,33 @@ install:
    fi
  - travis_retry cabal update -v
  - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
- - cabal install --only-dependencies
+ - cabal install --only-dependencies --enable-tests --enable-benchmarks --dry -v > installplan.txt
+ - sed -i -e '1,/^Resolving /d' installplan.txt
+ - cat installplan.txt
+
+# check whether current requested install-plan matches cached package-db snapshot
+ - if diff -u installplan.txt $HOME/.cabsnap/installplan.txt;
+   then
+     echo "cabal build-cache HIT";
+     rm -rfv .ghc;
+     cp -a $HOME/.cabsnap/ghc $HOME/.ghc;
+     cp -a $HOME/.cabsnap/lib $HOME/.cabsnap/share $HOME/.cabsnap/bin $HOME/.cabal/;
+   else
+     echo "cabal build-cache MISS";
+     rm -rf $HOME/.cabsnap;
+     mkdir -p $HOME/.ghc $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin;
+     cabal install --only-dependencies --enable-tests --enable-benchmarks;
+   fi
+
+# snapshot package-db on cache miss
+ - if [ ! -d $HOME/.cabsnap ];
+   then
+      echo "snapshotting package-db to build-cache";
+      mkdir $HOME/.cabsnap;
+      cp -a $HOME/.ghc $HOME/.cabsnap/ghc;
+      cp -a $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin installplan.txt $HOME/.cabsnap/;
+   fi
+
 # Here starts the actual work to be performed for the package under test;
 # any command which exits with a non-zero exit code causes the build to fail.
 script:
@@ -54,6 +78,7 @@ script:
  - cabal test
  - cabal check
  - cabal sdist   # tests that a source-distribution can be generated
+
 # Check that the resulting source distribution can be built & installed.
 # If there are no other `.tar.gz` files in `dist`, this can be even simpler:
 # `cabal install --force-reinstalls dist/*-*.tar.gz`

README.md

@@ -1,4 +1,5 @@
 #tidal-midi [![Build Status](https://travis-ci.org/tidalcycles/tidal-midi.svg?branch=0.9-dev)](https://travis-ci.org/tidalcycles/tidal-midi)
+
 A [TidalCycles](http://tidalcycles.org) module for sending patterns over MIDI.
 
 __PortMIDI__ variant. Should work on OS X, Linux and Windows.

tidal-midi.cabal

@@ -19,23 +19,25 @@ Description: MIDI support for Tidal. Supports Volca Keys, Bass and Beats and oth
 
 library
   Exposed-modules: Sound.Tidal.MIDI.Context
-                   Sound.Tidal.MIDI.MiniAtmegatron
-                   Sound.Tidal.MIDI.VolcaBeats
-                   Sound.Tidal.MIDI.VolcaBass
-                   Sound.Tidal.MIDI.VolcaKeys
-                   Sound.Tidal.MIDI.VolcaFM
                    Sound.Tidal.MIDI.Control
-                   Sound.Tidal.MIDI.Device
+                   Sound.Tidal.MIDI.Device              
                    Sound.Tidal.MIDI.Stream
+                   Sound.Tidal.MIDI.Output
+                   Sound.Tidal.MIDI.SynthParams
+                   Sound.Tidal.MIDI.CC
+                   Sound.Tidal.MIDI.GMPerc
                    Sound.Tidal.MIDI.Synth
                    Sound.Tidal.MIDI.Synthino
-                   Sound.Tidal.MIDI.MBase01
-                   Sound.Tidal.MIDI.GMPerc
+                   Sound.Tidal.MIDI.MBase01                   
                    Sound.Tidal.MIDI.Tetra
                    Sound.Tidal.MIDI.Ambika
-                   Sound.Tidal.MIDI.SynthParams
-                   Sound.Tidal.MIDI.Output
-                   Sound.Tidal.MIDI.CC
+                   Sound.Tidal.MIDI.MiniAtmegatron
+                   Sound.Tidal.MIDI.VolcaBeats
+                   Sound.Tidal.MIDI.VolcaBass
+                   Sound.Tidal.MIDI.VolcaKeys
+                   Sound.Tidal.MIDI.VolcaFM
+                   Sound.Tidal.MIDI.System1M
+                   Sound.Tidal.MIDI.KorgKP3
 
   Build-depends: base < 5, tidal == 0.9, PortMidi == 0.1.6.0, time, containers, transformers