diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-12-04 17:11:49 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-12-04 17:14:24 -0400 |
| commit | f7e1ff6082094e3b1e94f8df3d62ede9ac8e8172 (patch) | |
| tree | 0f20c70d8c985b0e447857ee13317ed28af941f4 | |
| parent | 9f32f5a8c8265574b21491dcfd5565270530b505 (diff) | |
explicitly disable WebDAV on Windows
For reasons suspiciously similar to 58972e05 -- ie, building with it
enabled crashes the compiler, at least in my development VM.. dunno why.
| -rw-r--r-- | git-annex.cabal | 2 | ||||
| -rw-r--r-- | standalone/windows/build.sh | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/git-annex.cabal b/git-annex.cabal index fa9ea062c..862847179 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -124,7 +124,7 @@ Executable git-annex Build-Depends: hS3 CPP-Options: -DWITH_S3 - if flag(WebDAV) + if flag(WebDAV) && (! os(windows)) Build-Depends: DAV (>= 0.3), http-conduit, xml-conduit, http-types CPP-Options: -DWITH_WEBDAV diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh index 74148dfe5..3e4f6bde1 100644 --- a/standalone/windows/build.sh +++ b/standalone/windows/build.sh @@ -7,7 +7,9 @@ set -x set -e HP="/c/Program Files (x86)/Haskell Platform/2012.4.0.0" -FLAGS="-Webapp -Assistant -XMPP" + +# Any cabal build flags go here. +FLAGS="" PATH="$HP/bin:$HP/lib/extralibs/bin:/c/Program Files (x86)/NSIS:$PATH" @@ -52,5 +54,6 @@ withcyg 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 |