diff options
| author |  Joey Hess <id@joeyh.name> | 2014-12-03 13:34:13 -0400 |
|---|---|---|
| committer | Joey Hess <id@joeyh.name> | 2014-12-03 13:34:13 -0400 |
| commit | 09419b04dcf93cc5d2034d5802ebac6428ea0da6 (patch) | |
| tree | 00aca603858ab1c208824fd0e99bea4b4bd2c4c0 /Build | |
| parent | cb032f201e0bb1f9710a81fa2980b6221b0ee041 (diff) | |
Windows: Install ssh and other bundled programs to Git/cmd, instead of Git/bin, since the latter is not in the default msysgit PATH.
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/BundledPrograms.hs | 6 | ||||
| -rw-r--r-- | Build/NullSoftInstaller.hs | 8 |
2 files changed, 4 insertions, 10 deletions
diff --git a/Build/BundledPrograms.hs b/Build/BundledPrograms.hs index 5eb0b1f28..d5cf3ee7b 100644 --- a/Build/BundledPrograms.hs +++ b/Build/BundledPrograms.hs @@ -31,17 +31,15 @@ bundledPrograms = catMaybes , Just "cp" #ifndef mingw32_HOST_OS -- using xargs on windows led to problems, so it's not used there - -- (and msysgit includes a copy anyway) , 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, msysgit provides ssh, but not ssh-keygen. + -- On Windows, msysgit provides ssh, but not in PATH, + -- so we ship our own. , Just "ssh" -#endif , Just "ssh-keygen" #endif #ifndef mingw32_HOST_OS diff --git a/Build/NullSoftInstaller.hs b/Build/NullSoftInstaller.hs index 913472a4e..bc94e60cd 100644 --- a/Build/NullSoftInstaller.hs +++ b/Build/NullSoftInstaller.hs @@ -133,12 +133,9 @@ makeInstaller gitannex license extrabins launchers = nsis $ do , IconIndex 2
, Description "git-annex autostart"
]
- section "bins" [] $ do
- setOutPath "$INSTDIR\\bin"
- mapM_ addfile extrabins
section "cmd" [] $ do
setOutPath "$INSTDIR\\cmd"
- addfile gitannex
+ mapM_ addfile (gitannex:extrabins)
section "meta" [] $ do
setOutPath "$INSTDIR"
addfile license
@@ -147,8 +144,7 @@ makeInstaller gitannex license extrabins launchers = nsis $ do uninstall $ do
delete [RebootOK] $ startMenuItem
delete [RebootOK] $ autoStartItem
- removefilesFrom "$INSTDIR/bin" extrabins
- removefilesFrom "$INSTDIR/cmd" [gitannex]
+ removefilesFrom "$INSTDIR/cmd" (gitannex:extrabins)
removefilesFrom "$INSTDIR" $
launchers ++
[ license
|