windows installer is fully working

Build/Standalone.hs

@@ -18,7 +18,7 @@ import System.Directory
 import System.IO
 import Control.Monad
 import Data.List
-import Build.SysConfig as SysConfig
+import Build.BundledPrograms
 
 import Utility.PartialPrelude
 import Utility.Directory
@@ -27,32 +27,6 @@ import Utility.Monad
 import Utility.SafeCommand
 import Utility.Path
 
-{- Programs that git-annex uses, to include in the bundle.
- -
- - These may be just the command name, or the full path to it. -}
-thirdpartyProgs :: [FilePath]
-thirdpartyProgs = catMaybes
-	[ Just "git"
-	, Just "cp"
-	, Just "xargs"
-	, Just "gpg"
-	, Just "rsync"
-	, Just "ssh"
-	, Just "sh"
-	, ifset SysConfig.curl "curl"
-	, ifset SysConfig.wget "wget"
-	, ifset SysConfig.bup "bup"
-	, SysConfig.lsof
-	, SysConfig.sha1
-	, SysConfig.sha256
-	, SysConfig.sha512
-	, SysConfig.sha224
-	, SysConfig.sha384
-	]
-  where
-	ifset True s = Just s
-	ifset False _ = Nothing
-
 progDir :: FilePath -> FilePath
 #ifdef darwin_HOST_OS
 progDir topdir = topdir
@@ -76,5 +50,5 @@ main = getArgs >>= go
         go (topdir:_) = do
 		let dir = progDir topdir
 		createDirectoryIfMissing True dir
-		installed <- forM thirdpartyProgs $ installProg dir
+		installed <- forM bundledPrograms $ installProg dir
 		writeFile "tmp/standalone-installed" (show installed)