diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-10-26 10:10:02 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-10-26 10:10:02 -0400 |
| commit | f14a35cc1231ceb3d5af4377594696fae18f0520 (patch) | |
| tree | c51c28ec42bb726e4e8c5c95f463f75d070370c9 | |
| parent | df08389cfde6f59c0aa725a303d5d1a9fe61e98c (diff) | |
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?
| -rw-r--r-- | Build/NullSoftInstaller.hs | 7 | ||||
| -rwxr-xr-x | standalone/windows/build.sh | 3 |
2 files changed, 5 insertions, 5 deletions
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 <id@joeyh.name>
-
@@ -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 ++ "'"]
diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh index f9c53a7b2..895b74525 100755 --- a/standalone/windows/build.sh +++ b/standalone/windows/build.sh @@ -58,7 +58,8 @@ getextra rsync.exe 85cb7a4d16d274fcf8069b39042965ad26abd6aa # Build git-annex stack setup --stack-yaml stack-windows.yaml -stack build -j 1 --stack-yaml stack-windows.yaml --no-haddock +stack install -j 1 --stack-yaml stack-windows.yaml --no-haddock \ + --local-bin-path . # Build the installer withcygpreferred stack ghc --stack-yaml stack-windows.yaml --no-haddock \ |