6158036e23
Using msysgit with git-annex is no longer supported. At the same time, I'm updating the rsync.exe in my downloads repository with the one from msys2. Note that rsync is currently still being ldded and installed in Git/cmd/ like the other cygwin programs. The ldd fails and this failure is ignored. It would be better to special case it to go in Git/usr/bin/, so that the user can't run rsync in a dos prompt window, which doesn't work, as it needs additional libs. However, as far as git-annex running rsync running ssh, it works ok in this location. Removed the ssh.cmd and ssh-keygen.cmd; these are not needed with git for windows. Keeping them would let ssh be run manually from a dos prompt window, but that's not really a goal.
78 lines
1.9 KiB
Haskell
78 lines
1.9 KiB
Haskell
{- Bundled programs
|
|
-
|
|
- Copyright 2013 Joey Hess <id@joeyh.name>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
{-# LANGUAGE CPP #-}
|
|
|
|
module Build.BundledPrograms where
|
|
|
|
import Data.Maybe
|
|
|
|
import Build.SysConfig as SysConfig
|
|
|
|
{- Programs that git-annex uses, to include in the bundle.
|
|
-
|
|
- These may be just the command name, or the full path to it. -}
|
|
bundledPrograms :: [FilePath]
|
|
bundledPrograms = catMaybes
|
|
[ Nothing
|
|
#ifndef mingw32_HOST_OS
|
|
-- git is not included in the windows bundle; git for windows is used
|
|
, Just "git"
|
|
-- Not strictly needed in PATH by git-annex, but called
|
|
-- by git when it sshes to a remote.
|
|
, Just "git-upload-pack"
|
|
, Just "git-receive-pack"
|
|
, Just "git-shell"
|
|
#endif
|
|
#ifndef mingw32_HOST_OS
|
|
-- using xargs on windows led to problems, so it's not used there
|
|
, Just "xargs"
|
|
#endif
|
|
, Just "rsync"
|
|
#ifndef darwin_HOST_OS
|
|
#ifndef mingw32_HOST_OS
|
|
-- OS X has ssh installed by default.
|
|
-- Linux probably has ssh, but not guaranteed.
|
|
-- On Windows, git provides ssh.
|
|
, Just "ssh"
|
|
, Just "ssh-keygen"
|
|
#endif
|
|
#endif
|
|
#ifndef mingw32_HOST_OS
|
|
, Just "sh"
|
|
#endif
|
|
, ifset SysConfig.curl "curl"
|
|
#ifndef darwin_HOST_OS
|
|
-- wget on OSX has been problimatic, looking for certs in the wrong
|
|
-- places. Don't ship it, use curl or the OSX's own wget if it has
|
|
-- one.
|
|
, ifset SysConfig.wget "wget"
|
|
#endif
|
|
, SysConfig.lsof
|
|
, SysConfig.gcrypt
|
|
#ifndef mingw32_HOST_OS
|
|
-- All these utilities are included in git for Windows
|
|
, SysConfig.gpg
|
|
, SysConfig.sha1
|
|
, SysConfig.sha256
|
|
, SysConfig.sha512
|
|
, SysConfig.sha224
|
|
, SysConfig.sha384
|
|
, Just "cp"
|
|
#endif
|
|
#ifdef linux_HOST_OS
|
|
-- used to unpack the tarball when upgrading
|
|
, Just "gunzip"
|
|
, Just "tar"
|
|
#endif
|
|
-- nice, ionice, and nocache are not included in the bundle;
|
|
-- we rely on the system's own version, which may better match
|
|
-- its kernel, and avoid using them if not available.
|
|
]
|
|
where
|
|
ifset True s = Just s
|
|
ifset False _ = Nothing
|