[commit: ghc] wip/nfs-locking: Minor revision, don't copy Hadrian binaries (6d420eb)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/6d420eb40cf4ebe18c4b556b0449972b6500eeb2/ghc

>---------------------------------------------------------------

commit 6d420eb40cf4ebe18c4b556b0449972b6500eeb2
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Wed Nov 2 01:55:16 2016 +0000

    Minor revision, don't copy Hadrian binaries


>---------------------------------------------------------------

6d420eb40cf4ebe18c4b556b0449972b6500eeb2
 src/Rules/SourceDist.hs | 156 +++++++++++++++++++++++++-----------------------
 1 file changed, 80 insertions(+), 76 deletions(-)

diff --git a/src/Rules/SourceDist.hs b/src/Rules/SourceDist.hs
index d56eb38..7a60238 100644
--- a/src/Rules/SourceDist.hs
+++ b/src/Rules/SourceDist.hs
@@ -12,18 +12,18 @@ sourceDistRules = do
     "sdist-ghc" ~> do
         version <- setting ProjectVersion
         need ["sdistprep/ghc-" ++ version ++ "-src.tar.xz"]
-        putSuccess "| Done. "
+        putSuccess "| Done"
     "sdistprep/ghc-*-src.tar.xz" %> \fname -> do
-        let tarName = takeFileName fname
-            treePath = "sdistprep/ghc" -/- dropTarXz tarName
+        let tarName   = takeFileName fname
+            dropTarXz = dropExtension . dropExtension
+            treePath  = "sdistprep/ghc" -/- dropTarXz tarName
         prepareTree treePath
-        runBuilderWith [Cwd "sdistprep/ghc"] Tar ["cJf", ".." -/- tarName, dropTarXz tarName]
+        runBuilderWith [Cwd "sdistprep/ghc"] Tar
+            ["cJf", ".." -/- tarName, dropTarXz tarName]
     "GIT_COMMIT_ID" %> \fname ->
-        setting ProjectGitCommitId >>= writeFileChanged fname
+        writeFileChanged fname =<< setting ProjectGitCommitId
     "VERSION" %> \fname ->
-        setting ProjectVersion >>= writeFileChanged fname
-  where
-    dropTarXz = dropExtension . dropExtension
+        writeFileChanged fname =<< setting ProjectVersion
 
 prepareTree :: FilePath -> Action ()
 prepareTree dest = do
@@ -31,74 +31,78 @@ prepareTree dest = do
     mapM_ cpFile srcFiles
   where
     cpFile a = copyFile a (dest -/- a)
-    cpDir  a = copyDirectoryContents (Not excluded) a (dest -/- takeFileName a)
+    cpDir  a = copyDirectoryContents (Not excluded) a (dest -/- a)
     excluded = Or
-      [ Test "//.*"
-      , Test "//#*"
-      , Test "//*-SAVE"
-      , Test "//*.orig"
-      , Test "//*.rej"
-      , Test "//*~"
-      , Test "//autom4te*"
-      , Test "//dist"
-      , Test "//log"
-      , Test "//stage0"
-      , Test "//stage1"
-      , Test "//stage2"
-      , Test "//stage3"
-      , Test "hadrian/cabal.sandbox.config"
-      , Test "hadrian/cfg/system.config"
-      , Test "hadrian/dist"
-      , Test "hadrian/UserSettings.hs"
-      , Test "libraries//*.buildinfo"
-      , Test "libraries//GNUmakefile"
-      , Test "libraries//config.log"
-      , Test "libraries//config.status"
-      , Test "libraries//configure"
-      , Test "libraries//ghc.mk"
-      , Test "libraries//include/Hs*Config.h"
-      , Test "libraries/dph"
-      , Test "libraries/parallel"
-      , Test "libraries/primitive"
-      , Test "libraries/random"
-      , Test "libraries/stm"
-      , Test "libraries/vector"
-      , Test "mk/build.mk" ]
+        [ Test "//.*"
+        , Test "//#*"
+        , Test "//*-SAVE"
+        , Test "//*.orig"
+        , Test "//*.rej"
+        , Test "//*~"
+        , Test "//autom4te*"
+        , Test "//dist"
+        , Test "//log"
+        , Test "//stage0"
+        , Test "//stage1"
+        , Test "//stage2"
+        , Test "//stage3"
+        , Test "hadrian/.cabal-sandbox"
+        , Test "hadrian/.stack-work"
+        , Test "hadrian/UserSettings.hs"
+        , Test "hadrian/cabal.sandbox.config"
+        , Test "hadrian/cfg/system.config"
+        , Test "hadrian/bin"
+        , Test "hadrian/dist"
+        , Test "hadrian/dist-newstyle"
+        , Test "libraries//*.buildinfo"
+        , Test "libraries//GNUmakefile"
+        , Test "libraries//config.log"
+        , Test "libraries//config.status"
+        , Test "libraries//configure"
+        , Test "libraries//ghc.mk"
+        , Test "libraries//include/Hs*Config.h"
+        , Test "libraries/dph"
+        , Test "libraries/parallel"
+        , Test "libraries/primitive"
+        , Test "libraries/random"
+        , Test "libraries/stm"
+        , Test "libraries/vector"
+        , Test "mk/build.mk" ]
     srcDirs =
-      [ "bindisttest"
-      , "compiler"
-      , "distrib"
-      , "docs"
-      , "docs"
-      , "driver"
-      , "ghc"
-      , "hadrian"
-      , "includes"
-      , "iserv"
-      , "libffi"
-      , "libffi-tarballs"
-      , "libraries"
-      , "mk"
-      , "rts"
-      , "rules"
-      , "utils" ]
+        [ "bindisttest"
+        , "compiler"
+        , "distrib"
+        , "docs"
+        , "docs"
+        , "driver"
+        , "ghc"
+        , "hadrian"
+        , "includes"
+        , "iserv"
+        , "libffi"
+        , "libffi-tarballs"
+        , "libraries"
+        , "mk"
+        , "rts"
+        , "rules"
+        , "utils" ]
     srcFiles =
-      [ "ANNOUNCE"
-      , "GIT_COMMIT_ID"
-      , "HACKING.md"
-      , "INSTALL.md"
-      , "LICENSE"
-      , "MAKEHELP.md"
-      , "Makefile"
-      , "README.md"
-      , "VERSION"
-      , "aclocal.m4"
-      , "boot"
-      , "config.guess"
-      , "config.sub"
-      , "configure"
-      , "configure.ac"
-      , "ghc.mk"
-      , "install-sh"
-      , "packages"
-      , "settings.in" ]
+        [ "ANNOUNCE"
+        , "GIT_COMMIT_ID"
+        , "HACKING.md"
+        , "INSTALL.md"
+        , "LICENSE"
+        , "MAKEHELP.md"
+        , "Makefile"
+        , "README.md"
+        , "VERSION"
+        , "aclocal.m4"
+        , "boot"
+        , "config.guess"
+        , "config.sub"
+        , "configure"
+        , "configure.ac"
+        , "ghc.mk"
+        , "install-sh"
+        , "packages"
+        , "settings.in" ]