diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-08-13 13:02:35 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-13 13:02:35 -0400 |
| commit | 28031c16c5f07260f17ddc11234f414dc1795939 (patch) | |
| tree | 178d51643da5eaa7b96b0056733ea7d9a7ed0b42 | |
| parent | 7d91ff4d5b9827c01f068b884b8e6f192212f223 (diff) | |
work aroud ongong transformers-compat cabal issue
| -rwxr-xr-x | standalone/windows/build.sh | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh index e95135f09..f4aba966f 100755 --- a/standalone/windows/build.sh +++ b/standalone/windows/build.sh @@ -7,7 +7,7 @@ set -x set -e # Path to the Haskell Platform. -#HP="/c/haskell/2014.2.0.0" +#HP="/c/haskell/2014.2.0.0" # now in the default PATH PATH="/c/Program Files (x86)/NSIS:/c/msysgit/cmd:$PATH" @@ -35,6 +35,10 @@ rm -f git-annex-installer.exe # for haskell libraries to link them with the cygwin library. cabal update || true +cabal transformers-compat -fthree +cabal install mtl-2.1.3.1 +cabal install DAV-1.0 + cabal install --only-dependencies || true # Detect when the last build was an incremental build and failed, @@ -64,11 +68,12 @@ withcygpreferred Build/NullSoftInstaller.exe rm -f last-incremental-failed +rm -f dist/build-version +ghc --make Build/BuildVersion.hs +Build/BuildVersion > dist/build-version + # Test git-annex # (doesn't currently work well on autobuilder, reason unknown) rm -rf .t +PATH=dist/build/git-annex/:$PATH withcyg dist/build/git-annex/git-annex.exe test || true - -rm -f dist/build-version -ghc --make Build/BuildVersion.hs -Build/BuildVersion > dist/build-version |