refactor(cabal-install): seprate build directories and drop -inplace

Author: andreabedini

cabal-install/src/Distribution/Client/DistDirLayout.hs

@@ -48,15 +48,16 @@ import Distribution.Simple.Compiler
   )
 import Distribution.System
 import Distribution.Types.ComponentName
-import Distribution.Types.LibraryName
+import Distribution.Client.Toolchain (Stage)
 
 -- | Information which can be used to construct the path to
 -- the build directory of a build.  This is LESS fine-grained
 -- than what goes into the hashed 'InstalledPackageId',
 -- and for good reason: we don't want this path to change if
 -- the user, say, adds a dependency to their project.
 data DistDirParams = DistDirParams
-  { distParamUnitId :: UnitId
+  { distParamStage :: Stage
+  , distParamUnitId :: UnitId
   , distParamPackageId :: PackageId
   , distParamComponentId :: ComponentId
   , distParamComponentName :: Maybe ComponentName
@@ -194,29 +195,11 @@ defaultDistDirLayout projectRoot mdistDirectory haddockOutputDir =
     distBuildDirectory :: DistDirParams -> FilePath
     distBuildDirectory params =
       distBuildRootDirectory
+        </> prettyShow (distParamStage params)
         </> prettyShow (distParamPlatform params)
         </> prettyShow (distParamCompilerId params)
-        </> prettyShow (distParamPackageId params)
-        </> ( case distParamComponentName params of
-                Nothing -> ""
-                Just (CLibName LMainLibName) -> ""
-                Just (CLibName (LSubLibName name)) -> "l" </> prettyShow name
-                Just (CFLibName name) -> "f" </> prettyShow name
-                Just (CExeName name) -> "x" </> prettyShow name
-                Just (CTestName name) -> "t" </> prettyShow name
-                Just (CBenchName name) -> "b" </> prettyShow name
-            )
-        </> ( case distParamOptimization params of
-                NoOptimisation -> "noopt"
-                NormalOptimisation -> ""
-                MaximumOptimisation -> "opt"
-            )
-        </> ( let uid_str = prettyShow (distParamUnitId params)
-               in if uid_str == prettyShow (distParamComponentId params)
-                    then ""
-                    else uid_str
-            )
-
+        </> prettyShow (distParamUnitId params)
+ 
     distUnpackedSrcRootDirectory :: FilePath
     distUnpackedSrcRootDirectory = distDirectory </> "src"
 

cabal-install/src/Distribution/Client/ProjectPlanning.hs

@@ -1941,21 +1941,21 @@ elaborateInstallPlan
                       elab0
                         { elabPkgOrComp = ElabComponent elab_comp
                         }
+
+                    -- This is where the component id is computed.
                     cid = case elabBuildStyle elab0 of
                       BuildInplaceOnly{} ->
                         mkComponentId $
-                          prettyShow pkgid
-                            ++ "-inplace"
-                            ++ ( case Cabal.componentNameString cname of
-                                  Nothing -> ""
-                                  Just s -> "-" ++ prettyShow s
-                               )
+                          case Cabal.componentNameString cname of
+                            Nothing -> prettyShow pkgid
+                            Just n -> prettyShow pkgid ++ "-" ++ prettyShow n
                       BuildAndInstall ->
                         hashedInstalledPackageId
                           ( packageHashInputs
                               elaboratedSharedConfig
                               elab1 -- knot tied
                           )
+
                     cc = cc0{cc_ann_id = fmap (const cid) (cc_ann_id cc0)}
 
                 infoProgress $ hang (text "configured component:") 4 (dispConfiguredComponent cc)
@@ -2171,7 +2171,7 @@ elaborateInstallPlan
 
             pkgInstalledId
               | shouldBuildInplaceOnly pkg =
-                  mkComponentId (prettyShow srcpkgPackageId ++ "-inplace")
+                  mkComponentId (prettyShow srcpkgPackageId)
               | otherwise =
                   assert (isJust elabPkgSourceHash) $
                     hashedInstalledPackageId

cabal-install/src/Distribution/Client/ProjectPlanning/Types.hs

@@ -565,7 +565,8 @@ elabConfiguredName verbosity elab
 elabDistDirParams :: ElaboratedSharedConfig -> ElaboratedConfiguredPackage -> DistDirParams
 elabDistDirParams shared elab =
   DistDirParams
-    { distParamUnitId = installedUnitId elab
+    { distParamStage = elabStage elab
+    , distParamUnitId = installedUnitId elab
     , distParamComponentId = elabComponentId elab
     , distParamPackageId = elabPkgSourceId elab
     , distParamComponentName = case elabPkgOrComp elab of

cabal-install/src/Distribution/Client/ScriptUtils.hs

@@ -431,7 +431,8 @@ scriptExeFileName scriptPath = "cabal-script-" ++ takeFileName scriptPath
 scriptDistDirParams :: FilePath -> ProjectBaseContext -> Compiler -> Platform -> DistDirParams
 scriptDistDirParams scriptPath ctx compiler platform =
   DistDirParams
-    { distParamUnitId = newSimpleUnitId cid
+    { distParamStage = Host
+    , distParamUnitId = newSimpleUnitId cid
     , distParamPackageId = fakePackageId
     , distParamComponentId = cid
     , distParamComponentName = Just $ CExeName cn