[commit: ghc] wip/nfs-locking: Better tracking of dependence in installation (#353) (d8e1759)

[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/d8e17590fc8efcbd87f97bb1d85a1775b85272d3/ghc

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

commit d8e17590fc8efcbd87f97bb1d85a1775b85272d3
Author: Zhen Zhang <izgzhen at gmail.com>
Date:   Sat Jul 8 21:02:17 2017 +0800

    Better tracking of dependence in installation (#353)


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

d8e17590fc8efcbd87f97bb1d85a1775b85272d3
 src/Rules/Install.hs | 27 ++++++++++++---------------
 src/Util.hs          |  3 +++
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Rules/Install.hs b/src/Rules/Install.hs
index 8530f50..4c91316 100644
--- a/src/Rules/Install.hs
+++ b/src/Rules/Install.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE OverloadedStrings, FlexibleContexts #-}
+{-# LANGUAGE FlexibleContexts #-}
 module Rules.Install (installRules) where
 
 import Base
@@ -39,8 +39,8 @@ XXX (izgzhen): Do we need @INSTALL_OPTS@ in the make scripts?
 installRules :: Rules ()
 installRules = do
     "install" ~> do
-        installPackageConf
         installIncludes
+        installPackageConf
         installCommonLibs
         installLibExecs
         installLibExecScripts
@@ -54,7 +54,6 @@ getLibExecDir = (-/- "bin") <$> installGhcLibDir
 -- ref: ghc.mk
 installLibExecScripts :: Action ()
 installLibExecScripts = do
-    need libExecScripts
     libExecDir <- getLibExecDir
     installDir (destDir ++ libExecDir)
     forM_ libExecScripts $ \script -> do
@@ -74,7 +73,6 @@ installLibExecs = do
         withLatestBuildStage pkg $ \stg -> do
             let context = programContext stg pkg
             let bin = inplaceLibBinPath -/- programName context <.> exe
-            need [bin]
             installProgram bin (destDir ++ libExecDir)
             when (pkg == ghc) $ do
                 moveFile (destDir ++ libExecDir -/- programName context <.> exe)
@@ -111,10 +109,9 @@ installBins = do
                     contents <- interpretInContext context $
                                     wrapper
                                     (WrappedBinary (destDir ++ libDir) symName)
-                    withTempDir $ \tmp -> do
-                        let tmpfile = tmp -/- binName
-                        writeFileChanged tmpfile contents
-                        installProgram tmpfile (destDir ++ binDir)
+                    let wrapperPath = destDir ++ binDir -/- binName
+                    writeFileChanged wrapperPath contents
+                    makeExecutable wrapperPath
                     unlessM windowsHost $
                         linkSymbolic (destDir ++ binDir -/- binName)
                                      (destDir ++ binDir -/- symName)
@@ -135,13 +132,12 @@ installPackageConf = do
     liftIO $ IO.createDirectoryIfMissing True (takeDirectory pkgConfInstallPath)
     build $ Target context HsCpp [ pkgPath rts -/- "package.conf.in" ]
                                  [ pkgConfInstallPath <.> "raw" ]
-    Stdout out <- cmd ("grep" :: String) [ "-v", "^#pragma GCC"
-                                         , pkgConfInstallPath <.> "raw" ]
+    Stdout content <- cmd "grep" [ "-v", "^#pragma GCC"
+                                 , pkgConfInstallPath <.> "raw" ]
     withTempFile $ \tmp -> do
-        liftIO $ writeFile tmp out
-        Stdout out' <- cmd ("sed" :: String)
-                           [ "-e", "s/\"\"//g", "-e", "s/:[   ]*,/: /g", tmp ]
-        liftIO $ writeFile pkgConfInstallPath out'
+        liftIO $ writeFile tmp content
+        Stdout content' <- cmd "sed" [ "-e", "s/\"\"//g", "-e", "s/:[   ]*,/: /g", tmp ]
+        liftIO $ writeFile pkgConfInstallPath content'
 
 -- | Install packages to @prefix/lib@
 -- ref: ghc.mk
@@ -195,6 +191,7 @@ installPackages = do
                 strip <- stripCmdPath context
                 ways <- interpretInContext context getLibraryWays
                 let ghcCabalInplace = inplaceBinPath -/- "ghc-cabal" -- HACK?
+                need [ ghcCabalInplace ]
 
                 -- HACK (#318): copy stuff back to the place favored by ghc-cabal
                 quietly $ copyDirectoryContents (Not excluded)
@@ -250,7 +247,7 @@ installPackages = do
                [ "--force", "--global-package-db"
                , installedPackageConf, "recache" ]
   where
-    createData f = unit $ cmd ("chmod" :: String) [ "644", f ]
+    createData f = unit $ cmd "chmod" [ "644", f ]
     excluded = Or
         [ Test "//haddock-prologue.txt"
         , Test "//package-data.mk"
diff --git a/src/Util.hs b/src/Util.hs
index c2335c2..da12e21 100644
--- a/src/Util.hs
+++ b/src/Util.hs
@@ -184,6 +184,7 @@ installDir dir = do
 installData :: [FilePath] -> FilePath -> Action ()
 installData fs dir = do
     i <- setting InstallData
+    need fs
     forM_ fs $ \f ->
         putBuild $ "| Install data " ++ f ++ " to " ++ dir
     quietly $ cmd i fs dir
@@ -192,6 +193,7 @@ installData fs dir = do
 installProgram :: FilePath -> FilePath -> Action ()
 installProgram f dir = do
     i <- setting InstallProgram
+    need [f]
     putBuild $ "| Install program " ++ f ++ " to " ++ dir
     quietly $ cmd i f dir
 
@@ -199,6 +201,7 @@ installProgram f dir = do
 installScript :: FilePath -> FilePath -> Action ()
 installScript f dir = do
     i <- setting InstallScript
+    need [f]
     putBuild $ "| Install script " ++ f ++ " to " ++ dir
     quietly $ cmd i f dir