windows installer is fully working
This commit is contained in:
parent
6cbca01261
commit
adbbb71ccb
3 changed files with 132 additions and 65 deletions
|
@ -1,7 +1,7 @@
|
|||
{- Generates a NullSoft installer program for git-annex on Windows.
|
||||
-
|
||||
- git-annex should already be built by cabal, and ssh and rsync,
|
||||
- as well as cygwin libraries, already installed.
|
||||
- To build the installer, git-annex should already be built by cabal,
|
||||
- and ssh and rsync, as well as cygwin libraries, already installed.
|
||||
-
|
||||
- This uses the Haskell nsis package (cabal install nsis)
|
||||
- to generate a .nsi file, which is then used to produce
|
||||
|
@ -19,49 +19,96 @@
|
|||
{-# LANGUAGE OverloadedStrings #-}
|
||||
|
||||
import Development.NSIS
|
||||
import System.FilePath
|
||||
import Control.Monad
|
||||
import System.Directory
|
||||
import Data.String
|
||||
|
||||
main = writeFile "git-annex.nsi" $ nsis $ do
|
||||
import Utility.Tmp
|
||||
import Utility.CopyFile
|
||||
import Utility.SafeCommand
|
||||
import Build.BundledPrograms
|
||||
|
||||
main = do
|
||||
withTmpDir "nsis-build" $ \tmpdir -> do
|
||||
let gitannex = tmpdir </> "git-annex.exe"
|
||||
mustSucceed "ln" [File "dist/build/git-annex/git-annex.exe", File gitannex]
|
||||
writeFile nsifile $ makeInstaller gitannex
|
||||
mustSucceed "C:\\Program Files\\NSIS\\makensis" [File nsifile]
|
||||
removeFile nsifile -- left behind if makensis fails
|
||||
where
|
||||
nsifile = "git-annex.nsi"
|
||||
mustSucceed cmd params = do
|
||||
r <- boolSystem cmd params
|
||||
case r of
|
||||
True -> return ()
|
||||
False -> error $ cmd ++ "failed"
|
||||
|
||||
installer :: FilePath
|
||||
installer = "git-annex-installer.exe"
|
||||
|
||||
gitInstallDir :: Exp FilePath
|
||||
gitInstallDir = fromString "$PROGRAMFILES\\Git\\cmd"
|
||||
|
||||
needGit :: Exp String
|
||||
needGit = strConcat
|
||||
[ fromString "You need git installed to use git-annex. Looking at "
|
||||
, gitInstallDir
|
||||
, fromString " , it seems to not be installed, "
|
||||
, fromString "or may be installed in another location. "
|
||||
, fromString "You can install git from http:////git-scm.com//"
|
||||
]
|
||||
|
||||
makeInstaller :: FilePath -> String
|
||||
makeInstaller gitannex = nsis $ do
|
||||
name "git-annex"
|
||||
outFile "git-annex-installer.exe"
|
||||
installDir "$DESKTOP/git-annex"
|
||||
outFile $ str installer
|
||||
{- Installing into the same directory as git avoids needing to modify
|
||||
- path myself, since the git installer already does it. -}
|
||||
installDir gitInstallDir
|
||||
requestExecutionLevel User
|
||||
iff_ (fileExists "$WINDIR/git.exe")
|
||||
(return ()) $ do
|
||||
messageBox [MB_ABORTRETRYIGNORE]
|
||||
"git does not seem to be installed. git-annex can't be used without git!"
|
||||
|
||||
iff (fileExists gitInstallDir)
|
||||
(return ())
|
||||
(alert needGit)
|
||||
|
||||
-- Pages to display
|
||||
page Directory -- Pick where to install
|
||||
page InstFiles -- Give a progress bar while installing
|
||||
-- Groups of files to install
|
||||
section "programs" [] $ do
|
||||
setOutPath "$INSTDIR"
|
||||
file [] "dist/build/git-annex/git-annex.exe"
|
||||
fromcygwin "rsync.exe"
|
||||
fromcygwin "ssh.exe"
|
||||
fromcygwin "sha256.exe"
|
||||
fromcygwin "sha1.exe"
|
||||
fromcygwin "sha512.exe"
|
||||
fromcygwin "sha384.exe"
|
||||
section "DLLS" [] $ mapM_ fromcygwin
|
||||
addfile gitannex
|
||||
mapM_ addcygfile cygwinPrograms
|
||||
section "DLLS" [] $ do
|
||||
setOutPath "$INSTDIR"
|
||||
[ "cygwin1.dll"
|
||||
, "cygasn1-8.dll"
|
||||
, "cygheimbase-1.dll"
|
||||
, "cygroken-18.dll"
|
||||
, "cygcom_err-2.dll"
|
||||
, "cygheimntlm-0.dll"
|
||||
, "cygsqlite3-0.dll"
|
||||
, "cygcrypt-0.dll"
|
||||
, "cyghx509-5.dll"
|
||||
, "cygssp-0.dll"
|
||||
, "cygcrypto-1.0.0.dll"
|
||||
, "cygiconv-2.dll"
|
||||
, "cyggcc_s-1.dll"
|
||||
, "cygintl-8.dll"
|
||||
, "cygwind-0.dll"
|
||||
, "cyggssapi-3.dll"
|
||||
, "cygkrb5-26.dll"
|
||||
, "cygz.dll"
|
||||
]
|
||||
mapM_ addcygfile cygwinDlls
|
||||
where
|
||||
fromcygwin f = file [] (str $ "/bin/" ++ f)
|
||||
addfile f = file [] (str f)
|
||||
addcygfile f = addfile $ "C:\\cygwin\\bin" </> f
|
||||
|
||||
cygwinPrograms :: [FilePath]
|
||||
cygwinPrograms = map (\p -> p ++ ".exe") bundledPrograms
|
||||
|
||||
-- These are the dlls needed by Cygwin's rsync, ssh, etc.
|
||||
cygwinDlls :: [FilePath]
|
||||
cygwinDlls =
|
||||
[ "cygwin1.dll"
|
||||
, "cygasn1-8.dll"
|
||||
, "cygheimbase-1.dll"
|
||||
, "cygroken-18.dll"
|
||||
, "cygcom_err-2.dll"
|
||||
, "cygheimntlm-0.dll"
|
||||
, "cygsqlite3-0.dll"
|
||||
, "cygcrypt-0.dll"
|
||||
, "cyghx509-5.dll"
|
||||
, "cygssp-0.dll"
|
||||
, "cygcrypto-1.0.0.dll"
|
||||
, "cygiconv-2.dll"
|
||||
, "cyggcc_s-1.dll"
|
||||
, "cygintl-8.dll"
|
||||
, "cygwind-0.dll"
|
||||
, "cyggssapi-3.dll"
|
||||
, "cygkrb5-26.dll"
|
||||
, "cygz.dll"
|
||||
]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue