mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

build for windows with forked win32 package that has terminateProcessId

Browse source 
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.
This commit is contained in:
Joey Hess 2017-10-25 14:45:23 -04:00
parent 9f2b7dfc3e
commit 833b3f06cd
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
9 changed files with 22 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Assistant/Restart.hs
View file

@ -27,7 +27,7 @@ import Control.Concurrent
#ifndef mingw32_HOST_OS
import System.Posix (signalProcess, sigTERM)
#else
import Utility.WinProcess
import System.Win32.Process (terminateProcessId)
#endif
import Network.URI
@ -59,7 +59,7 @@ terminateSelf =
#ifndef mingw32_HOST_OS
signalProcess sigTERM =<< getPID
#else
terminatePID =<< getPID
terminateProcessId =<< getPID
#endif
runRestart :: Assistant URLString

4
Assistant/TransferSlots.hs
View file

@ -41,7 +41,7 @@ import qualified Control.Concurrent.MSemN as MSemN
import System.Posix.Process (getProcessGroupIDOf)
import System.Posix.Signals (signalProcessGroup, sigTERM, sigKILL)
#else
import Utility.WinProcess
import System.Win32.Process (terminateProcessId)
#endif
type TransferGenerator = Assistant (Maybe (Transfer, TransferInfo, Transferrer -> Assistant ()))
@ -270,7 +270,7 @@ cancelTransfer pause t = do
threadDelay 50000 -- 0.05 second grace period
signal sigKILL
#else
terminatePID pid
terminateProcessId pid
#endif
{- Start or resume a transfer. -}