update stack.yaml to latest lts and remove stack-windows.yaml

The latter should not be needed as this lts version includes Win32.
This commit is contained in:
Joey Hess 2019-07-09 10:33:21 -04:00
parent 7d7d68f0c6
commit 4b7aea8714
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 7 additions and 38 deletions

View file

@ -39,9 +39,8 @@ for Windows. One way is to download it from
Put it somewhere in PATH.
Then open Git Bash, [[clone git-annex|download]], and in git-annex's source
tree, run "stack build --stack-yaml stack-windows.yaml" to download and
build all dependencies and git-annex. "stack install --stack-yaml
stack-windows.yaml" will install git-annex.
tree, run "stack build" to download and
build all dependencies and git-annex. "stack install" will install git-annex.
(To build the git-annex installer, you also need to install the NullSoft
installer system. The script `standalone/windows/build.sh` is

View file

@ -1,29 +0,0 @@
flags:
git-annex:
production: true
assistant: true
pairing: true
s3: true
webdav: true
torrentparser: true
webapp: true
magicmime: false
dbus: false
debuglocks: false
benchmark: false
networkbsd: false
packages:
- '.'
extra-deps:
- aws-0.17.1
- bloomfilter-2.0.1.0
- torrent-10000.1.1
- Win32-2.6.1.0
- directory-1.3.1.5
- process-1.6.2.0
- http-client-0.5.7.1
- unix-compat-0.5.0.1
allow-newer: true
explicit-setup-deps:
git-annex: true
resolver: lts-9.10

View file

@ -25,4 +25,4 @@ extra-deps:
- http-client-0.5.14
explicit-setup-deps:
git-annex: true
resolver: lts-13.6
resolver: lts-13.27

View file

@ -65,16 +65,15 @@ stack --version
# Update version info for git rev being built.
mkdir -p dist
stack ghc --stack-yaml stack-windows.yaml --no-haddock Build/BuildVersion.hs
stack ghc --no-haddock Build/BuildVersion.hs
./Build/BuildVersion > dist/build-version
# Build git-annex
stack setup --stack-yaml stack-windows.yaml
stack install -j 1 --stack-yaml stack-windows.yaml --no-haddock \
--local-bin-path .
stack setup
stack install -j 1 --no-haddock --local-bin-path .
# Build the installer
withcygpreferred stack ghc --stack-yaml stack-windows.yaml --no-haddock \
withcygpreferred stack ghc --no-haddock \
--package nsis Build/NullSoftInstaller.hs
./Build/NullSoftInstaller