Un-overload the "targetDir" target

If a FilePath matches a so-called "phony" target, Shake will
count this as satisfying the phony target and skip its steps.
Currently, the target called targetDir is overloaded, being
used in a "~>" rule (for defining a "phony" target) but it is
also used for contructing file paths, and it appears as a
dependency in some rules (e.g., "need [targetDir]"). When it
is a dependency, it actually should be upon a phony target,
not the actual directory.  Due to how dependencies are
constructed for the Windows HP build, this problem has
plagued it.

This change needs to be tested for the other build environments.

* hptool/src/Main.hs
* hptool/src/OS/Internal.hs
* hptool/src/OS/Mac.hs
* hptool/src/OS/Posix.hs
* hptool/src/OS/Win.hs
* hptool/src/OS/Win/WinNsis.hs
  * change the dependency upon targetDir to phonyTargetDir
* hptool/src/Paths.hs
  * define and export phonyTargetDir
* hptool/src/Target.hs
  * Change rule from targetDir to phonyTargetDir

Author: randen

hptool/src/Main.hs

@@ -110,7 +110,7 @@ whatIsIncluded rel = ("-- Minimal Platform:":minimalIncludes) ++ ("-- Full Platf
 buildRules :: Release -> FilePath -> BuildConfig -> Rules()
 buildRules hpRelease srcTarFile bc = do
     "build-source" ~> need [srcTarFile]
-    "build-target" ~> need [targetDir]
+    "build-target" ~> need [phonyTargetDir]
     "build-product" ~> need [osProduct]
     "build-local" ~> need [dir ghcLocalDir]
     "build-website" ~> need [dir websiteDir]

hptool/src/OS/Internal.hs

@@ -124,7 +124,7 @@ genericOS BuildConfig{..} = OS{..}
     osProduct = productDir </> "generic.tar.gz"
     osRules _hpRelease _bc =
         osProduct %> \out -> do
-            need [targetDir, vdir ghcVirtualTarget]
+            need [phonyTargetDir, vdir ghcVirtualTarget]
             command_ [Cwd buildRoot]
                 "tar" ["czf", out `relativeToDir` buildRoot, targetDir `relativeToDir` buildRoot]
 

hptool/src/OS/Mac.hs

@@ -139,7 +139,7 @@ macOsFromConfig BuildConfig{..} = OS{..}
                 ]
 
         hpPkgFile %> \out -> do
-            need [targetDir, dir extrasDir]  -- FIXME(mzero): could be more specific
+            need [phonyTargetDir, dir extrasDir]  -- FIXME(mzero): could be more specific
             command_ []
                 "pkgbuild"
                 [ "--identifier", "org.haskell.HaskellPlatform.Libraries."

hptool/src/OS/Posix.hs

@@ -97,7 +97,7 @@ posixOS BuildConfig{..} = OS{..}
                 ]
 
         usrLocalTar %> \out -> do
-            need [targetDir, vdir ghcVirtualTarget]
+            need [phonyTargetDir, vdir ghcVirtualTarget]
             command_ [Cwd targetDir]
                 "tar" ["czf", out `relativeToDir` targetDir, hpTargetDir `relativeToDir` targetDir]
 

hptool/src/OS/Win.hs

@@ -137,7 +137,7 @@ winOsFromConfig BuildConfig{..} = os
         winRules
 
         osProduct %> \_ -> do
-            need $ [dir ghcLocalDir, targetDir, vdir ghcVirtualTarget]
+            need $ [dir ghcLocalDir, phonyTargetDir, vdir ghcVirtualTarget]
                    ++ winNeeds
 
             copyWinTargetExtras bc

hptool/src/OS/Win/WinNsis.hs

@@ -13,7 +13,7 @@ import Text.Hastache.Context (mkStrContext)
 import Config
 import OS.Win.WinPaths
 import OS.Win.WinUtils
-import Paths ( installerPartsDir, targetDir )
+import Paths ( installerPartsDir, phonyTargetDir )
 import Templates
 import Types
 import Utils
@@ -22,11 +22,11 @@ import Utils
 genNsisData :: Rules ()
 genNsisData = do
     nsisInstDat %> \dFile -> do
-        need [targetDir]
+        need [phonyTargetDir]
         dirs <- getDirsFiles filterEmptyDirs
         genData nsisInstDatTmpl dFile dirs
     nsisUninstDat %> \uFile -> do
-        need [targetDir]
+        need [phonyTargetDir]
         dirs <- getDirsFiles sortByDirRev
         genData nsisUninstDatTmpl uFile dirs
   where

hptool/src/Paths.hs

@@ -18,7 +18,7 @@ module Paths
     , listBuild, listCore, listSource
     , hpCabalFile
 
-    , targetDir
+    , targetDir, phonyTargetDir
     , ghcVirtualTarget, hpVirtualTarget
 
     , installerPartsDir, extrasDir
@@ -111,6 +111,9 @@ hpCabalFile = buildRoot </> "haskell-platform.cabal"
 targetDir :: FilePath
 targetDir = buildRoot </> "target"
 
+phonyTargetDir :: FilePath
+phonyTargetDir = "PHONYtargetdir"
+
 ghcVirtualTarget :: String
 ghcVirtualTarget = "target-ghc"
 

hptool/src/Target.hs

@@ -25,7 +25,7 @@ targetRules :: BuildConfig -> Rules ()
 targetRules bc = do
     buildRules
     installRules bc
-    targetDir ~> do
+    phonyTargetDir ~> do
         hpRel <- askHpRelease
         bc' <- askBuildConfig
         let OS{..} = osFromConfig bc'