diff options
| -rw-r--r-- | standalone/windows/build.sh | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh index 81e66f292..230ffd246 100644 --- a/standalone/windows/build.sh +++ b/standalone/windows/build.sh @@ -35,14 +35,24 @@ cd .. cabal install --only-dependencies -f"$FLAGS" -# Build git-annex -withcyg cabal configure -f"$FLAGS" -withcyg cabal build - -# Build the installer -cabal install nsis -ghc --make Build/NullSoftInstaller.hs -withcyg Build/NullSoftInstaller.exe +runbuild () { + # Build git-annex + withcyg cabal configure -f"$FLAGS" + withcyg cabal build + + # Build the installer + cabal install nsis + ghc --make Build/NullSoftInstaller.hs + withcyg Build/NullSoftInstaller.exe +} + +# Incremental build sometimes may fail, possibly because the configure +# script has changed but cabal neglects to re-build it on Windows +if ! runbuild; then + echo "Retrying after cabal clean" + cabal clean + runbuild +fi # Test git-annex rm -rf .t |