From b7c790f8cf9ee1aacfcface9eca64db3184e48c5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 20 Apr 2015 15:33:13 -0400 Subject: avoid needing mingw to build on windows It was only used for its shell; cygwin has a shell. --- build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.bat') 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 -- cgit v1.2.3 From 7db17702a6d43edad5e2b1523c0fbf768ac0079a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 21 Apr 2015 01:01:16 -0400 Subject: fix windows simple build script --- build.bat | 2 +- standalone/windows/build-simple.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'build.bat') diff --git a/build.bat b/build.bat index 52d03e0e2..268a02835 100644 --- a/build.bat +++ b/build.bat @@ -1 +1 @@ -C:\CYGWIN\BIN\SH.EXE standalone/windows/build-simple.sh +SH.EXE standalone/windows/build-simple.sh diff --git a/standalone/windows/build-simple.sh b/standalone/windows/build-simple.sh index ade21ce6d..2c9aeb915 100755 --- a/standalone/windows/build-simple.sh +++ b/standalone/windows/build-simple.sh @@ -4,10 +4,10 @@ set -e set -x -# Path to the Haskell Platform. -HP="/c/Program Files/Haskell Platform/2013.2.0.0" +# Path to the Haskell Platform. (As mingw sh sees it) +HP="/c/Program Files/Haskell Platform/2014.2.0.0" -PATH="$HP/bin:$HP/lib/extralibs/bin:$PATH" +PATH="$HP/bin:$HP/mingw/bin:$HP/lib/extralibs/bin:$PATH" # Run a command with the cygwin environment available. # However, programs not from cygwin are preferred. -- cgit v1.2.3 From ba93e7589dcfee73cb852bdbaeb344346f418454 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 21 Apr 2015 14:11:06 -0400 Subject: let build.bat also be run from cygwin terminal --- build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.bat') diff --git a/build.bat b/build.bat index 268a02835..c2ccfac5f 100644 --- a/build.bat +++ b/build.bat @@ -1 +1 @@ -SH.EXE standalone/windows/build-simple.sh +sh standalone/windows/build-simple.sh -- cgit v1.2.3