diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-12-05 21:02:27 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-12-05 21:02:27 -0400 |
| commit | 2e85ef862fcffd135e3578a7bde7165ae30e1a6b (patch) | |
| tree | ab0aaef541dcf6566150dd2cb680944535e4719f | |
| parent | b282d6c1af00ea37d3694fae3e4c1f4e3c97297a (diff) | |
fixes
| -rw-r--r-- | standalone/windows/build-simple.sh | 11 | ||||
| -rwxr-xr-x[-rw-r--r--] | standalone/windows/build.sh | 0 |
2 files changed, 7 insertions, 4 deletions
diff --git a/standalone/windows/build-simple.sh b/standalone/windows/build-simple.sh index 93dfa2952..3011884c9 100644 --- a/standalone/windows/build-simple.sh +++ b/standalone/windows/build-simple.sh @@ -1,12 +1,15 @@ #!/bin/sh # Script to build git-annex on windows. Run by build.bat +# Does not currently build the NSIS installer. See build.sh for how to do +# that. set -e +set -x # Path to the Haskell Platform. -HP="/c/Program Files (x86)/Haskell Platform/2012.4.0.0" +HP="/c/Program Files/Haskell Platform/2013.2.0.0" -PATH="$HP/bin:$HP/lib/extralibs/bin:/c/Program Files (x86)/NSIS:$PATH" +PATH="$HP/bin:$HP/lib/extralibs/bin:$PATH" # Run a command with the cygwin environment available. # However, programs not from cygwin are preferred. @@ -25,7 +28,7 @@ withcyg cabal build || true # Works around link failure https://ghc.haskell.org/trac/ghc/ticket/8596 # using a response file. -rm -f build.log gcc.opt +withcyg rm -f build.log gcc.opt withcyg cabal build --ghc-options='-v -keep-tmp-files' > build.log 2>&1 -grep '"dist\\build\\git-annex\\git-annex.exe"' build.log | sed -e 's/^"[^"]*" //' -e 's/\\/\//g' > gcc.opt +withcyg grep '"dist\\build\\git-annex\\git-annex.exe"' build.log | sed -e 's/^"[^"]*" //' -e 's/\\/\//g' > gcc.opt "$HP/mingw/bin/gcc.exe" @gcc.opt diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh index 9b8fcba84..9b8fcba84 100644..100755 --- a/standalone/windows/build.sh +++ b/standalone/windows/build.sh |