From e85be1f4fe37b6ac385de03b02a19421c0611eaf Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 26 Oct 2020 13:45:38 -0400 Subject: [PATCH] fix build and add build example --- Build/NullSoftInstaller.hs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Build/NullSoftInstaller.hs b/Build/NullSoftInstaller.hs index b214809487..9733592214 100644 --- a/Build/NullSoftInstaller.hs +++ b/Build/NullSoftInstaller.hs @@ -9,7 +9,9 @@ - for that. - - 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 - are found in the current directory: @@ -46,8 +48,8 @@ main = do withTmpDir "nsis-build" $ \tmpdir -> do let gitannex = tmpdir gitannexprogram mustSucceed "ln" [File "git-annex.exe", File gitannex] - magicDLLs' <- installwhenpresent magicDLLs - magicShare' <- installwhenpresent magicShare + magicDLLs' <- installwhenpresent magicDLLs tmpdir + magicShare' <- installwhenpresent magicShare tmpdir let license = tmpdir licensefile mustSucceed "sh" [Param "-c", Param $ "zcat standalone/licences.gz > '" ++ license ++ "'"] webappscript <- vbsLauncher tmpdir "git-annex-webapp" "git annex webapp" @@ -68,7 +70,7 @@ main = do case r of True -> return () False -> error $ cmd ++ " failed" - installwhenpresent fs = do + installwhenpresent fs tmpdir = do fs' <- forM fs $ \f -> do present <- doesFileExist f if present