diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-16 20:00:31 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-16 20:00:31 -0400 |
| commit | 16bd051459e13bdd38c2282dc7efaaa46a3ae0ad (patch) | |
| tree | 686902992fd9eec56cbcc16dd96fed40ac135fff /Build | |
| parent | c5d3276e5ad286aaa014e434d1664fe6fc7fe52b (diff) | |
add license to windows installer
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/NullSoftInstaller.hs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Build/NullSoftInstaller.hs b/Build/NullSoftInstaller.hs index b9e11fc27..1d2ac1573 100644 --- a/Build/NullSoftInstaller.hs +++ b/Build/NullSoftInstaller.hs @@ -33,7 +33,9 @@ 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
+ let license = tmpdir </> "git-annex-licenses.txt"
+ mustSucceed "sh" [Param "-c", Param "zcat standalone/licences.gz >" ++ license]
+ writeFile nsifile $ makeInstaller gitannex license
mustSucceed "C:\\Program Files\\NSIS\\makensis" [File nsifile]
removeFile nsifile -- left behind if makensis fails
where
@@ -59,8 +61,8 @@ needGit = strConcat , fromString "You can install git from http:////git-scm.com//"
]
-makeInstaller :: FilePath -> String
-makeInstaller gitannex = nsis $ do
+makeInstaller :: FilePath -> FilePath -> String
+makeInstaller gitannex license = nsis $ do
name "git-annex"
outFile $ str installer
{- Installing into the same directory as git avoids needing to modify
@@ -74,13 +76,15 @@ makeInstaller gitannex = nsis $ do -- Pages to display
page Directory -- Pick where to install
+ page License license
page InstFiles -- Give a progress bar while installing
-- Groups of files to install
section "programs" [] $ do
setOutPath "$INSTDIR"
addfile gitannex
+ addfile license
mapM_ addcygfile cygwinPrograms
- section "DLLS" [] $ do
+ section "libraries" [] $ do
setOutPath "$INSTDIR"
mapM_ addcygfile cygwinDlls
where
|