diff options
| -rw-r--r-- | doc/install/Windows.mdwn | 5 | ||||
| -rw-r--r-- | git-annex.cabal | 2 | ||||
| -rw-r--r-- | stack-windows.yaml | 30 | ||||
| -rw-r--r-- | stack.yaml | 2 | ||||
| -rwxr-xr-x | standalone/windows/build.sh | 9 |
5 files changed, 8 insertions, 40 deletions
diff --git a/doc/install/Windows.mdwn b/doc/install/Windows.mdwn index 9ae82e4a9..46a92fd6c 100644 --- a/doc/install/Windows.mdwn +++ b/doc/install/Windows.mdwn @@ -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 diff --git a/git-annex.cabal b/git-annex.cabal index 3363d12a8..f6cb10c05 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -381,7 +381,7 @@ Executable git-annex if (os(windows)) Build-Depends: - Win32 (== 2.3.1.1), + Win32 (>= 2.6.1.0), Win32-extras, unix-compat (>= 0.5), setenv, diff --git a/stack-windows.yaml b/stack-windows.yaml deleted file mode 100644 index bdacbec31..000000000 --- a/stack-windows.yaml +++ /dev/null @@ -1,30 +0,0 @@ -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: -- '.' -- location: - git: https://github.com/joeyh/win32 - commit: 9250d2b8cadf5a98ffb3f68d933a6257c1b7e23d - extra-dep: true -extra-deps: -- aws-0.17.1 -- bloomfilter-2.0.1.0 -- torrent-10000.1.1 -- yesod-default-1.2.0 -explicit-setup-deps: - git-annex: true -resolver: lts-9.10 diff --git a/stack.yaml b/stack.yaml index d84c4682e..dc181272b 100644 --- a/stack.yaml +++ b/stack.yaml @@ -23,4 +23,4 @@ extra-deps: - yesod-default-1.2.0 explicit-setup-deps: git-annex: true -resolver: lts-9.9 +resolver: lts-9.10 diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh index b0e6bdd4f..e3be18af0 100755 --- a/standalone/windows/build.sh +++ b/standalone/windows/build.sh @@ -64,17 +64,16 @@ getextra rsync.exe 85cb7a4d16d274fcf8069b39042965ad26abd6aa stack --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 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 # Test git-annex |