From f14a35cc1231ceb3d5af4377594696fae18f0520 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 26 Oct 2017 10:10:02 -0400 Subject: unify stack build and stack install For some reason, when stack install is run separately, it seems to be installing a previous build from a different temp dir. WTF? --- Build/NullSoftInstaller.hs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Build') diff --git a/Build/NullSoftInstaller.hs b/Build/NullSoftInstaller.hs index 1bdee0880..4b32c4698 100644 --- a/Build/NullSoftInstaller.hs +++ b/Build/NullSoftInstaller.hs @@ -8,9 +8,9 @@ - The user needs to install git separately, and the installer checks - for that. - - - To build the installer, git-annex should already be built using - - stack and the necessary utility programs (rsync and wget) already - - installed in PATH from msys32. + - To build the installer, git-annex should already be built to + - ./git-annex.exe and the necessary utility programs (rsync and wget) + - already installed in PATH from msys32. - - Copyright 2013-2015 Joey Hess - @@ -40,7 +40,6 @@ import Build.BundledPrograms main = do withTmpDir "nsis-build" $ \tmpdir -> do let gitannex = tmpdir gitannexprogram - mustSucceed "stack" [Param "--local-bin-path", File ".", Param "install"] mustSucceed "ln" [File "git-annex.exe", File gitannex] let license = tmpdir licensefile mustSucceed "sh" [Param "-c", Param $ "zcat standalone/licences.gz > '" ++ license ++ "'"] -- cgit v1.2.3