still need stack-windows.yaml to specify newer versions of Win32 and unix-compat

This commit is contained in:
Joey Hess 2017-11-09 13:54:05 -04:00
parent f953f19e68
commit 25854c73db
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
5 changed files with 38 additions and 8 deletions

View file

@ -39,8 +39,9 @@ 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" to download and
build all dependencies and git-annex. "stack install" will install git-annex.
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.
(To build the git-annex installer, you also need to install the NullSoft
installer system. The script `standalone/windows/build.sh` is

View file

@ -381,7 +381,7 @@ Executable git-annex
if (os(windows))
Build-Depends:
Win32 (>= 2.6.1.0),
Win32 (== 2.3.1.1),
Win32-extras,
unix-compat (>= 0.5),
setenv,

28
stack-windows.yaml Normal file
View file

@ -0,0 +1,28 @@
flags:
git-annex:
concurrentoutput: true
production: true
assistant: true
pairing: true
network-uri: true
s3: true
testsuite: true
webdav: true
torrentparser: true
webapp: true
magicmime: false
dbus: false
android: false
androidsplice: false
packages:
- '.'
extra-deps:
- aws-0.17.1
- bloomfilter-2.0.1.0
- torrent-10000.1.1
- yesod-default-1.2.0
- Win32-2.6.1.0
- unix-compat-0.5
explicit-setup-deps:
git-annex: true
resolver: lts-9.10

View file

@ -23,4 +23,4 @@ extra-deps:
- yesod-default-1.2.0
explicit-setup-deps:
git-annex: true
resolver: lts-9.10
resolver: lts-9.9

View file

@ -64,16 +64,17 @@ getextra rsync.exe 85cb7a4d16d274fcf8069b39042965ad26abd6aa
stack --version
# Build git-annex
stack setup
stack install -j 1 --no-haddock --local-bin-path .
stack setup --stack-yaml stack-windows.yaml
stack install -j 1 --stack-yaml stack-windows.yaml --no-haddock \
--local-bin-path .
# Build the installer
withcygpreferred stack ghc --no-haddock \
withcygpreferred stack ghc --stack-yaml stack-windows.yaml --no-haddock \
--package nsis Build/NullSoftInstaller.hs
./Build/NullSoftInstaller
mkdir -p dist
stack ghc --no-haddock Build/BuildVersion.hs
stack ghc --stack-yaml stack-windows.yaml --no-haddock Build/BuildVersion.hs
./Build/BuildVersion > dist/build-version
# Test git-annex