mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

explicitly disable WebDAV on Windows

Browse source 
For reasons suspiciously similar to 342d508e -- ie, building with it
enabled crashes the compiler, at least in my development VM.. dunno why.
This commit is contained in:
Joey Hess 2013-12-04 17:11:49 -04:00
parent aef1d7e76d
commit 4ebb35dc59
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
git-annex.cabal
View file

@ -124,7 +124,7 @@ Executable git-annex
Build-Depends: hS3 Build-Depends: hS3
CPP-Options: -DWITH_S3 CPP-Options: -DWITH_S3
if flag(WebDAV) if flag(WebDAV) && (! os(windows))
Build-Depends: DAV (>= 0.3), http-conduit, xml-conduit, http-types Build-Depends: DAV (>= 0.3), http-conduit, xml-conduit, http-types
CPP-Options: -DWITH_WEBDAV CPP-Options: -DWITH_WEBDAV

5
standalone/windows/build.sh
View file

@ -7,7 +7,9 @@ set -x
set -e set -e
HP="/c/Program Files (x86)/Haskell Platform/2012.4.0.0" 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" 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 rm -f last-incremental-failed
# Test git-annex # Test git-annex
# (doesn't currently work well on autobuilder, reason unknown)
rm -rf .t rm -rf .t
withcyg dist/build/git-annex/git-annex.exe test || true withcyg dist/build/git-annex/git-annex.exe test || true