diff options
Diffstat (limited to 'standalone')
| -rw-r--r-- | standalone/windows/build.sh | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh index e0b72b4e5..36ececfdb 100644 --- a/standalone/windows/build.sh +++ b/standalone/windows/build.sh @@ -35,26 +35,21 @@ cd .. cabal install --only-dependencies -f"$FLAGS" -runbuild () { - set -e +if ! -e last-incremental-failed; then + cabal clean +fi +touch last-incremental-failed - # Build git-annex - withcyg cabal configure -f"$FLAGS" - withcyg cabal build +# 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 -} +# 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 +rm -f last-incremental-failed # Test git-annex rm -rf .t |