diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-17 16:56:00 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-17 16:58:36 -0400 |
| commit | 5198ce5258438efff0dee031f5cdd06ca1b11982 (patch) | |
| tree | abf38bf6e6ff69c3eadfd8f122a4695bc2609951 /standalone | |
| parent | 8f261acb5716f751e9785b7d01658901dd61a09e (diff) | |
run test suite in cygwin so it can find utilities etc
Diffstat (limited to 'standalone')
| -rw-r--r-- | standalone/windows/build.sh | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh index 93ee1a6e3..cae8d7832 100644 --- a/standalone/windows/build.sh +++ b/standalone/windows/build.sh @@ -11,9 +11,10 @@ FLAGS="-Webapp -Assistant -XMPP" PATH="$HP/bin:$HP/lib/extralibs/bin:/c/Program Files (x86)/NSIS:$PATH" -# Run a command in the cygwin environment. -incygwin () { - PATH="/c/cygwin/bin:$PATH" "$@" +# Run a command with the cygwin environment available. +# However, programs not from cygwin are preferred. +withcyg () { + PATH="$PATH:/c/cygwin/bin" "$@" } # Don't allow build artifact from a past successfuly build to be extracted @@ -28,20 +29,20 @@ cabal update rm -rf MissingH-1.2.0.0 cabal unpack MissingH cd MissingH-1.2.0.0 -incygwin patch -p1 <../standalone/windows/haskell-patches/MissingH_1.2.0.0-0001-hack-around-strange-build-problem-in-jenkins-autobui.patch +withcyg patch -p1 <../standalone/windows/haskell-patches/MissingH_1.2.0.0-0001-hack-around-strange-build-problem-in-jenkins-autobui.patch cabal install || true cd .. cabal install --only-dependencies -f"$FLAGS" # Build git-annex -incygwin cabal configure -f"$FLAGS" -incygwin cabal build +withcyg cabal configure -f"$FLAGS" +withcyg cabal build # Build the installer cabal install nsis ghc --make Build/NullSoftInstaller.hs -incygwin Build/NullSoftInstaller.exe +withcyg Build/NullSoftInstaller.exe # Test git-annex -dist/build/git-annex/git-annex.exe test +withcyg dist/build/git-annex/git-annex.exe test |