diff options
author | Joey Hess <joey@kitenet.net> | 2013-12-05 19:15:23 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2013-12-05 19:15:23 -0400 |
commit | 8f65283d969b2077bae0c22a67364a297168589d (patch) | |
tree | 9ac92710815f0363a666236d45e88cbc8f9bef89 | |
parent | cba098b5cd4688a3f3952b94fa978bdbb59a2de7 (diff) |
temporarily disable webapp on windows; re-enable webdav on windows
The gcc response file should make it build with webdav (fingers crossed).
webapp is waiting on a haskell platform upgrade on the autobuilder.
Current one has a too old version of network for hxt to install.
-rw-r--r-- | git-annex.cabal | 4 | ||||
-rw-r--r-- | standalone/windows/build.sh | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/git-annex.cabal b/git-annex.cabal index 0c065e08d..0549ca026 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) && (! os(windows)) + if flag(WebDAV) Build-Depends: DAV (>= 0.3), http-conduit, xml-conduit, http-types CPP-Options: -DWITH_WEBDAV @@ -163,7 +163,7 @@ Executable git-annex if flag(AndroidSplice) CPP-Options: -DANDROID_SPLICES - if flag(Webapp) + if flag(Webapp) (! os(windows)) Build-Depends: yesod, yesod-default, yesod-static, yesod-form, yesod-core, case-insensitive, http-types, transformers, wai, wai-logger, warp, diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh index d8050b5a3..9b8fcba84 100644 --- a/standalone/windows/build.sh +++ b/standalone/windows/build.sh @@ -6,10 +6,12 @@ set -x set -e +# Path to the Haskell Platform. HP="/c/Program Files (x86)/Haskell Platform/2012.4.0.0" PATH="$HP/bin:$HP/lib/extralibs/bin:/c/Program Files (x86)/NSIS:$PATH" +# This tells git-annex where to upgrade itself from. UPGRADE_LOCATION=http://downloads.kitenet.net/git-annex/windows/current/git-annex-installer.exe # Run a command with the cygwin environment available. |