[Git][ghc/ghc][master] Hadrian: add binary-dist-dir target

[Marge Bot]

 Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
9b142c53 by Sylvain Henry at 2019-04-14T05:14:23Z
Hadrian: add binary-dist-dir target

This patch adds an Hadrian target "binary-dist-dir". Compared to
"binary-dist", it only builds a binary distribution directory without
creating the Tar archive. It makes the use/test of the bindist
installation script easier.

- - - - -


1 changed file:

- hadrian/src/Rules/BinaryDist.hs


Changes:

=====================================
hadrian/src/Rules/BinaryDist.hs
=====================================
@@ -97,7 +97,7 @@ other, the install script:
 bindistRules :: Rules ()
 bindistRules = do
     root <- buildRootRules
-    phony "binary-dist" $ do
+    phony "binary-dist-dir" $ do
         -- We 'need' all binaries and libraries
         targets <- mapM pkgTarget =<< stagePackages Stage1
         need targets
@@ -150,6 +150,16 @@ bindistRules = do
                    , "ghci-script", "haddock", "hpc", "hp2ps", "hsc2hs"
                    , "runghc"]
 
+
+    phony "binary-dist" $ do
+
+        need ["binary-dist-dir"]
+
+        version        <- setting ProjectVersion
+        targetPlatform <- setting TargetPlatformFull
+
+        let ghcVersionPretty = "ghc-" ++ version ++ "-" ++ targetPlatform
+
         -- Finally, we create the archive <root>/bindist/ghc-X.Y.Z-platform.tar.xz
         tarPath <- builderPath (Tar Create)
         cmd [Cwd $ root -/- "bindist"] tarPath



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/commit/9b142c53325ffee6e3eef55daabefe9e2881f9e9

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/commit/9b142c53325ffee6e3eef55daabefe9e2881f9e9
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20190414/c8510e95/attachment.html>