From ae1515f19426daf13b55089e1c7da5f49f62b7eb Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 25 Oct 2017 14:45:23 -0400
Subject: build for windows with forked win32 package that has
 terminateProcessId

Get ugly reversion out of CHANGELOG.

Also, relocated the windows stack.yaml to top, and updated windows build
instructions.

This commit was sponsored by Henrik Riomar on Patreon.
---
 standalone/windows/build.sh   | 11 +++++------
 standalone/windows/stack.yaml | 26 --------------------------
 2 files changed, 5 insertions(+), 32 deletions(-)
 delete mode 100644 standalone/windows/stack.yaml

(limited to 'standalone')

diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh
index 481d2be7d..5240e6be3 100755
--- a/standalone/windows/build.sh
+++ b/standalone/windows/build.sh
@@ -59,21 +59,20 @@ getextra rsync.exe 85cb7a4d16d274fcf8069b39042965ad26abd6aa
 # Deps are not built with cygwin environment, because we don't want
 # configure scripts for haskell libraries to link them with the cygwin
 # libraries.
-stack setup --stack-yaml standalone/windows/stack.yaml
-stack build -j 1 --stack-yaml standalone/windows/stack.yaml --no-haddock --dependencies-only 
+stack setup --stack-yaml stack-windows.yaml
+stack build -j 1 --stack-yaml stack-windows.yaml --no-haddock --dependencies-only 
   
 # Build git-annex
-withcyg stack build --stack-yaml standalone/windows/stack.yaml
+withcyg stack build --stack-yaml stack-windows.yaml
 
 # Build the installer
-withcygpreferred stack ghc --stack-yaml standalone/windows/stack.yaml --no-haddock \
+withcygpreferred stack ghc --stack-yaml stack-windows.yaml --no-haddock \
 	--package nsis Build/NullSoftInstaller.hs
 ./Build/NullSoftInstaller
 
 rm -f dist/build-version
 mkdir -p dist
-stack ghc --stack-yaml standalone/windows/stack.yaml --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
diff --git a/standalone/windows/stack.yaml b/standalone/windows/stack.yaml
deleted file mode 100644
index 54b8fe920..000000000
--- a/standalone/windows/stack.yaml
+++ /dev/null
@@ -1,26 +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:
-- '../..'
-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
-- 
cgit v1.2.3