Move programInplacePath to Settings.Path
authorAndrey Mokhov <andrey.mokhov@gmail.com>
Sun, 30 Oct 2016 23:45:21 +0000 (23:45 +0000)
committerAndrey Mokhov <andrey.mokhov@gmail.com>
Sun, 30 Oct 2016 23:45:21 +0000 (23:45 +0000)
src/Base.hs
src/Settings/Path.hs

index cb040d4..eb8685d 100644 (file)
@@ -15,7 +15,7 @@ module Base (
     module Development.Shake.FilePath,
 
     -- * Paths
-    configPath, configFile, sourcePath, programInplacePath,
+    configPath, configFile, sourcePath,
 
     -- * Miscellaneous utilities
     minusOrd, intersectOrd, lookupAll, replaceEq, replaceSeparators, unifyPath,
@@ -58,10 +58,6 @@ configFile = configPath -/- "system.config"
 sourcePath :: FilePath
 sourcePath = hadrianPath -/- "src"
 
--- TODO: move to buildRootPath, see #113
-programInplacePath :: FilePath
-programInplacePath = "inplace/bin"
-
 -- | Find and replace all occurrences of a value in a list.
 replaceEq :: Eq a => a -> a -> [a] -> [a]
 replaceEq from = replaceWhen (== from)
index 9993f9e..6b2e67d 100644 (file)
@@ -3,7 +3,7 @@ module Settings.Path (
     pkgLibraryFile0, pkgGhciLibraryFile, gmpBuildPath, gmpObjects, gmpLibraryH,
     gmpBuildInfoPath, generatedPath, libffiBuildPath, shakeFilesPath, pkgConfFile,
     packageDbDirectory, packageDbStamp, bootPackageConstraints, packageDependencies,
-    objectPath, programInplaceLibPath, installPath
+    objectPath, programInplacePath, programInplaceLibPath, installPath
     ) where
 
 import Base
@@ -36,7 +36,11 @@ stageDirectory :: Stage -> FilePath
 stageDirectory = stageString
 
 -- TODO: Move to buildRootPath, see #113.
--- | Directory for wrapped binaries.
+-- | Directory for binaries that are built "in place".
+programInplacePath :: FilePath
+programInplacePath = "inplace/bin"
+
+-- | Directory for binary wrappers, and auxiliary binaries such as @touchy@.
 programInplaceLibPath :: FilePath
 programInplaceLibPath = "inplace/lib/bin"