run test suite in cygwin so it can find utilities etc
This commit is contained in:
parent
de3853375e
commit
cbed6fe65f
1 changed files with 9 additions and 8 deletions
|
@ -11,9 +11,10 @@ FLAGS="-Webapp -Assistant -XMPP"
|
||||||
|
|
||||||
PATH="$HP/bin:$HP/lib/extralibs/bin:/c/Program Files (x86)/NSIS:$PATH"
|
PATH="$HP/bin:$HP/lib/extralibs/bin:/c/Program Files (x86)/NSIS:$PATH"
|
||||||
|
|
||||||
# Run a command in the cygwin environment.
|
# Run a command with the cygwin environment available.
|
||||||
incygwin () {
|
# However, programs not from cygwin are preferred.
|
||||||
PATH="/c/cygwin/bin:$PATH" "$@"
|
withcyg () {
|
||||||
|
PATH="$PATH:/c/cygwin/bin" "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
# Don't allow build artifact from a past successfuly build to be extracted
|
# 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
|
rm -rf MissingH-1.2.0.0
|
||||||
cabal unpack MissingH
|
cabal unpack MissingH
|
||||||
cd MissingH-1.2.0.0
|
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
|
cabal install || true
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
cabal install --only-dependencies -f"$FLAGS"
|
cabal install --only-dependencies -f"$FLAGS"
|
||||||
|
|
||||||
# Build git-annex
|
# Build git-annex
|
||||||
incygwin cabal configure -f"$FLAGS"
|
withcyg cabal configure -f"$FLAGS"
|
||||||
incygwin cabal build
|
withcyg cabal build
|
||||||
|
|
||||||
# Build the installer
|
# Build the installer
|
||||||
cabal install nsis
|
cabal install nsis
|
||||||
ghc --make Build/NullSoftInstaller.hs
|
ghc --make Build/NullSoftInstaller.hs
|
||||||
incygwin Build/NullSoftInstaller.exe
|
withcyg Build/NullSoftInstaller.exe
|
||||||
|
|
||||||
# Test git-annex
|
# Test git-annex
|
||||||
dist/build/git-annex/git-annex.exe test
|
withcyg dist/build/git-annex/git-annex.exe test
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue