diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-08-13 13:21:22 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-13 13:21:22 -0400 |
| commit | 1b6379865c9637d1f10d34f7d38c58cc02512359 (patch) | |
| tree | 22f8bb76e116c7e0f42029510c4d2264a27e3d42 /standalone | |
| parent | 3d19b937a3e267f94631481de4ff0b52f5ac6549 (diff) | |
clean up
Diffstat (limited to 'standalone')
| -rwxr-xr-x | standalone/windows/build.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh index 34825931a..41e44d7c4 100755 --- a/standalone/windows/build.sh +++ b/standalone/windows/build.sh @@ -24,7 +24,7 @@ withcygpreferred () { UPGRADE_LOCATION=http://downloads.kitenet.net/git-annex/windows/current/git-annex-installer.exe # Uncomment to get rid of cabal installed libraries. -rm -rf /c/Users/jenkins/AppData/Roaming/cabal /c/Users/jenkins/AppData/Roaming/ghc +#rm -rf /c/Users/jenkins/AppData/Roaming/cabal /c/Users/jenkins/AppData/Roaming/ghc # Don't allow build artifact from a past successful build to be extracted # if we fail. @@ -35,9 +35,9 @@ rm -f git-annex-installer.exe # for haskell libraries to link them with the cygwin library. cabal update || true -cabal install transformers-compat -fthree -cabal install mtl-2.1.3.1 -cabal install DAV-1.0 +# This workaround is still needed, it seems. +#cabal install transformers-compat -fthree +#cabal install DAV-1.0 cabal install --only-dependencies || true @@ -76,4 +76,5 @@ Build/BuildVersion > dist/build-version # (doesn't currently work well on autobuilder, reason unknown) rm -rf .t PATH=dist/build/git-annex/:$PATH +export PATH withcyg dist/build/git-annex/git-annex.exe test || true |