summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-04-20 15:33:13 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-04-20 15:33:13 -0400
commitb7c790f8cf9ee1aacfcface9eca64db3184e48c5 (patch)
tree6226b35c821b1c632771dcf4776596dac7b08437
parent59e6f34864b7004836e01ead3d41c41ac28d9265 (diff)
avoid needing mingw to build on windows
It was only used for its shell; cygwin has a shell.
-rw-r--r--build.bat2
-rw-r--r--doc/install/Windows.mdwn5
2 files changed, 5 insertions, 2 deletions
diff --git a/build.bat b/build.bat
index 66a7e1f06..52d03e0e2 100644
--- a/build.bat
+++ b/build.bat
@@ -1 +1 @@
-C:\MINGW\MSYS\1.0\BIN\SH.EXE standalone/windows/build-simple.sh
+C:\CYGWIN\BIN\SH.EXE standalone/windows/build-simple.sh
diff --git a/doc/install/Windows.mdwn b/doc/install/Windows.mdwn
index 5080fc9cb..3d4b7a073 100644
--- a/doc/install/Windows.mdwn
+++ b/doc/install/Windows.mdwn
@@ -25,7 +25,7 @@ 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, Mingw, and Cygwin. Use Cygwin to install:
+the Haskell Platform and Cygwin. Use Cygwin to install these packages:
gcc rsync git wget ssh gnupg
Once the prerequisites are installed, run:
@@ -35,5 +35,8 @@ Once the prerequisites are installed, run:
cd gitannex
build
+Note that git from Cygwin is able to clone git-annex's git repository;
+Msysgit cannot due to some characters in filenames.
+
(To build the git-annex installer, you also need to install the NullSoft
installer system.)