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:
parent
7d7d68f0c6
commit
4b7aea8714
4 changed files with 7 additions and 38 deletions
|
@ -39,9 +39,8 @@ for Windows. One way is to download it from
|
||||||
Put it somewhere in PATH.
|
Put it somewhere in PATH.
|
||||||
|
|
||||||
Then open Git Bash, [[clone git-annex|download]], and in git-annex's source
|
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
|
tree, run "stack build" to download and
|
||||||
build all dependencies and git-annex. "stack install --stack-yaml
|
build all dependencies and git-annex. "stack install" will install git-annex.
|
||||||
stack-windows.yaml" will install git-annex.
|
|
||||||
|
|
||||||
(To build the git-annex installer, you also need to install the NullSoft
|
(To build the git-annex installer, you also need to install the NullSoft
|
||||||
installer system. The script `standalone/windows/build.sh` is
|
installer system. The script `standalone/windows/build.sh` is
|
||||||
|
|
|
@ -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
|
|
|
@ -25,4 +25,4 @@ extra-deps:
|
||||||
- http-client-0.5.14
|
- http-client-0.5.14
|
||||||
explicit-setup-deps:
|
explicit-setup-deps:
|
||||||
git-annex: true
|
git-annex: true
|
||||||
resolver: lts-13.6
|
resolver: lts-13.27
|
||||||
|
|
|
@ -65,16 +65,15 @@ stack --version
|
||||||
|
|
||||||
# Update version info for git rev being built.
|
# Update version info for git rev being built.
|
||||||
mkdir -p dist
|
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/BuildVersion > dist/build-version
|
||||||
|
|
||||||
# Build git-annex
|
# Build git-annex
|
||||||
stack setup --stack-yaml stack-windows.yaml
|
stack setup
|
||||||
stack install -j 1 --stack-yaml stack-windows.yaml --no-haddock \
|
stack install -j 1 --no-haddock --local-bin-path .
|
||||||
--local-bin-path .
|
|
||||||
|
|
||||||
# Build the installer
|
# Build the installer
|
||||||
withcygpreferred stack ghc --stack-yaml stack-windows.yaml --no-haddock \
|
withcygpreferred stack ghc --no-haddock \
|
||||||
--package nsis Build/NullSoftInstaller.hs
|
--package nsis Build/NullSoftInstaller.hs
|
||||||
./Build/NullSoftInstaller
|
./Build/NullSoftInstaller
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue