summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-05-05 15:47:01 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-05-05 15:47:01 -0400
commit7b744df198d3f24d646608f396fcebd73509e781 (patch)
treebccc524bcbf04a7b661429a243959763cdc798b1
parent46c7a156017a79f9b3b7eacf745ef42f207f3212 (diff)
new simpler windows build environment using stack and git for windows and no cygwin
-rw-r--r--debian/changelog1
-rw-r--r--doc/install/Windows.mdwn22
2 files changed, 14 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog
index 23c246bd4..2db35bccb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ git-annex (6.20160420) UNRELEASED; urgency=medium
Thanks, freewheelinfranks.
* Added DIRHASH-LOWER to external special remote protocol.
* git-annex.cabal: Add Setup-Depends.
+ * stack.yaml: Enable explicit-setup-deps.
* Windows: Fix several bugs in propigation of changes from the adjusted
branch back to the master branch.
* map: Hide dead repositories that are not connected to the graph.
diff --git a/doc/install/Windows.mdwn b/doc/install/Windows.mdwn
index d32a790b4..7ea667a10 100644
--- a/doc/install/Windows.mdwn
+++ b/doc/install/Windows.mdwn
@@ -1,6 +1,6 @@
git-annex now does Windows!
-* First, [install git for Windows](http://git-scm.com/downloads)
+* First, [install Git for Windows](http://git-scm.com/downloads)
Important: **Get the 32 bit version not the 64 bit version.**
(Note that msysgit is no longer supported.)
* Then, [install git-annex](https://downloads.kitenet.net/git-annex/windows/current/)
@@ -25,15 +25,19 @@ A daily build is also available, thanks to Yury V. Zaytsev and
## building it yourself
To build git-annex from source on Windows, you need to install
-the Haskell Platform and Cygwin. Use Cygwin to install these packages:
-gcc rsync git wget ssh gnupg
+[Git for Windows](http://git-scm.com/downloads), and
+[Stack](http://haskellstack.org/).
-Once the prerequisites are installed, run:
+You also need to install rsync and wget for windows.
+They need to be linked with the same MINGW32 libraries that come with Git
+for Windows. One way is to download them from
+<https://downloads.kitenet.net/git-annex/windows/assets/>.
+Put them somewhere in PATH.
- cabal update
- git clone git://git-annex.branchable.com/ gitannex
- cd gitannex
- build
+Then open Git Bash, [[clone git-annex|download]], and in
+git-annex's source tree, run "stack build" to download and build
+all dependencies and git-annex. "stack install" will install git-annex.
(To build the git-annex installer, you also need to install the NullSoft
-installer system.)
+installer system. The script `standalone/windows/build.sh` is
+used to make the builds linked to above.)