mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix build and add build example

Browse source
This commit is contained in:
Joey Hess 2020-10-26 13:45:38 -04:00
parent 5e458e8ac6
commit e85be1f4fe
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Build/NullSoftInstaller.hs
View file

@ -9,7 +9,9 @@
- for that. - for that.
- -
- To build the installer, git-annex should already be built to - To build the installer, git-annex should already be built to
- ./git-annex.exe, then run this program. - ./git-annex.exe, then run this program, using eg:
-
- stack ghc --no-haddock --package nsis Build/NullSoftInstaller.hs
- -
- A build of libmagic will also be included in the installer, if its files - A build of libmagic will also be included in the installer, if its files
- are found in the current directory: - are found in the current directory:
@ -46,8 +48,8 @@ main = do
withTmpDir "nsis-build" $ \tmpdir -> do withTmpDir "nsis-build" $ \tmpdir -> do
let gitannex = tmpdir </> gitannexprogram let gitannex = tmpdir </> gitannexprogram
mustSucceed "ln" [File "git-annex.exe", File gitannex] mustSucceed "ln" [File "git-annex.exe", File gitannex]
magicDLLs' <- installwhenpresent magicDLLs magicDLLs' <- installwhenpresent magicDLLs tmpdir
magicShare' <- installwhenpresent magicShare magicShare' <- installwhenpresent magicShare tmpdir
let license = tmpdir </> licensefile let license = tmpdir </> licensefile
mustSucceed "sh" [Param "-c", Param $ "zcat standalone/licences.gz > '" ++ license ++ "'"] mustSucceed "sh" [Param "-c", Param $ "zcat standalone/licences.gz > '" ++ license ++ "'"]
webappscript <- vbsLauncher tmpdir "git-annex-webapp" "git annex webapp" webappscript <- vbsLauncher tmpdir "git-annex-webapp" "git annex webapp"
@ -68,7 +70,7 @@ main = do
case r of case r of
True -> return () True -> return ()
False -> error $ cmd ++ " failed" False -> error $ cmd ++ " failed"
installwhenpresent fs = do installwhenpresent fs tmpdir = do
fs' <- forM fs $ \f -> do fs' <- forM fs $ \f -> do
present <- doesFileExist f present <- doesFileExist f
if present if present