From 75b69dca5890a7ff434f062a323f95aebe44d509 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 13 Aug 2014 13:02:35 -0400 Subject: [PATCH] work aroud ongong transformers-compat cabal issue --- standalone/windows/build.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh index e95135f098..f4aba966fa 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 -# Test git-annex -# (doesn't currently work well on autobuilder, reason unknown) -rm -rf .t -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 + +# 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