mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

seems windows sh doesn't properly handle set -e in functions

Browse source
This commit is contained in:
Joey Hess 2013-05-19 20:45:54 -04:00
parent 5fbe3bc756
commit 5b09b8d6bf
1 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
standalone/windows/build.sh
View file

@ -35,26 +35,21 @@ cd ..
cabal install --only-dependencies -f"$FLAGS" cabal install --only-dependencies -f"$FLAGS"
runbuild () { if ! -e last-incremental-failed; then
set -e
# 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 cabal clean
runbuild
fi fi
touch last-incremental-failed
# 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
rm -f last-incremental-failed
# Test git-annex # Test git-annex
rm -rf .t rm -rf .t