Merge pull request #6108 from commercialhaskell/refactor

package.yaml

@@ -265,6 +265,7 @@ library:
   - Stack.Types.ApplyGhcOptions
   - Stack.Types.ApplyProgOptions
   - Stack.Types.Build
+  - Stack.Types.Build.Exception
   - Stack.Types.BuildConfig
   - Stack.Types.BuildOpts
   - Stack.Types.CabalConfigKey
@@ -275,6 +276,7 @@ library:
   - Stack.Types.Config
   - Stack.Types.Config.Exception
   - Stack.Types.ConfigMonoid
+  - Stack.Types.ConfigureOpts
   - Stack.Types.Curator
   - Stack.Types.Docker
   - Stack.Types.DockerEntrypoint
@@ -291,11 +293,13 @@ library:
   - Stack.Types.GhcPkgId
   - Stack.Types.GlobalOpts
   - Stack.Types.GlobalOptsMonoid
+  - Stack.Types.IsMutable
   - Stack.Types.LockFileBehavior
   - Stack.Types.NamedComponent
   - Stack.Types.Nix
   - Stack.Types.Package
   - Stack.Types.PackageName
+  - Stack.Types.ParentMap
   - Stack.Types.Platform
   - Stack.Types.Project
   - Stack.Types.ProjectAndConfigMonoid
@@ -308,6 +312,7 @@ library:
   - Stack.Types.SourceMap
   - Stack.Types.StackYamlLoc
   - Stack.Types.TemplateName
+  - Stack.Types.UnusedFlags
   - Stack.Types.Version
   - Stack.Types.VersionedDownloadInfo
   - Stack.Uninstall

src/Stack/Build.hs

@@ -34,10 +34,9 @@ import           Stack.Prelude hiding ( loadPackage )
 import           Stack.Runners ( ShouldReexec (..), withConfig, withEnvConfig )
 import           Stack.Setup ( withNewLocalBuildTargets )
 import           Stack.Types.Build
-                   ( BaseConfigOpts (..), BuildException (..)
-                   , BuildPrettyException (..), Plan (..), Task (..)
-                   , TaskType (..), taskLocation
-                   )
+                   ( Plan (..), Task (..), TaskType (..), taskLocation )
+import           Stack.Types.Build.Exception
+                   ( BuildException (..), BuildPrettyException (..) )
 import           Stack.Types.BuildConfig ( HasBuildConfig, stackYamlL )
 import           Stack.Types.BuildOpts
                    ( BuildCommand (..), BuildOpts (..), BuildOptsCLI (..)
@@ -50,6 +49,7 @@ import           Stack.Types.CompilerPaths ( cabalVersionL )
 import           Stack.Types.Config
                    ( Config (..), HasConfig (..), buildOptsL
                    )
+import           Stack.Types.ConfigureOpts ( BaseConfigOpts (..) )
 import           Stack.Types.EnvConfig
                    ( EnvConfig (..), HasEnvConfig (..), HasSourceMap
                    , actualCompilerVersionL, installationRootDeps

src/Stack/Build/Cache.hs

@@ -57,13 +57,14 @@ import           Stack.Storage.User
                    , precompiledCacheKey, savePrecompiledCache
                    )
 import           Stack.Types.Build
-                   ( BuildCache (..), BaseConfigOpts (..), ConfigCache
-                   , ConfigureOpts (..), FileCacheInfo, InstallLocation (..)
-                   , Installed (..), PrecompiledCache (..)
+                   ( BuildCache (..), ConfigCache, FileCacheInfo
+                   , InstallLocation (..), Installed (..), PrecompiledCache (..)
                    )
 import           Stack.Types.Cache ( ConfigCacheType (..) )
 import           Stack.Types.CompilerPaths ( cabalVersionL )
 import           Stack.Types.Config ( stackRootL )
+import           Stack.Types.ConfigureOpts
+                   ( BaseConfigOpts (..), ConfigureOpts (..) )
 import           Stack.Types.EnvConfig
                    ( EnvConfig (..), HasEnvConfig (..), actualCompilerVersionL
                    , installationRootDeps, installationRootLocal

src/Stack/Build/ConstructPlan.hs

@@ -29,14 +29,14 @@ import           Stack.Package ( applyForceCustomBuild )
 import           Stack.Prelude hiding ( loadPackage )
 import           Stack.SourceMap ( getPLIVersion, mkProjectPackage )
 import           Stack.Types.Build
-                   ( BaseConfigOpts (..), BadDependency (..)
-                   , BuildException (..), BuildPrettyException (..)
-                   , CachePkgSrc (..), ConfigCache (..), ConfigureOpts (..)
-                   , ConstructPlanException (..), IsMutable (..), ParentMap
-                   , Plan (..), Task (..), TaskConfigOpts (..), TaskType (..)
-                   , configureOpts, installLocationIsMutable, isStackOpt
-                   , taskIsTarget, taskLocation, taskTargetIsMutable
-                   , toCachePkgSrc
+                   ( CachePkgSrc (..), ConfigCache (..), Plan (..), Task (..)
+                   , TaskConfigOpts (..), TaskType (..)
+                   , installLocationIsMutable, taskIsTarget, taskLocation
+                   , taskTargetIsMutable, toCachePkgSrc
+                   )
+import           Stack.Types.Build.Exception
+                   ( BadDependency (..), BuildException (..)
+                   , BuildPrettyException (..), ConstructPlanException (..)
                    )
 import           Stack.Types.BuildConfig
                    ( BuildConfig (..), HasBuildConfig (..), stackYamlL )
@@ -46,6 +46,8 @@ import           Stack.Types.Compiler ( WhichCompiler (..) )
 import           Stack.Types.CompilerPaths
                    ( CompilerPaths (..), HasCompiler (..) )
 import           Stack.Types.Config ( Config (..), HasConfig (..), stackRootL )
+import           Stack.Types.ConfigureOpts
+                   ( BaseConfigOpts (..), ConfigureOpts (..), configureOpts )
 import           Stack.Types.Curator ( Curator (..) )
 import           Stack.Types.Dependency
                    ( DepValue (DepValue), DepType (AsLibrary) )
@@ -55,13 +57,15 @@ import           Stack.Types.EnvConfig
 import           Stack.Types.EnvSettings ( EnvSettings (..), minimalEnvSettings )
 import           Stack.Types.GHCVariant ( HasGHCVariant (..) )
 import           Stack.Types.GhcPkgId ( GhcPkgId )
+import           Stack.Types.IsMutable ( IsMutable (..) )
 import           Stack.Types.NamedComponent ( exeComponents, renderComponent )
 import           Stack.Types.Package
                    ( ExeName (..), InstallLocation (..), Installed (..)
                    , InstalledMap, LocalPackage (..), Package (..)
                    , PackageLibraries (..), PackageSource (..), installedVersion
                    , packageIdentifier, psVersion, runMemoizedWith
                    )
+import           Stack.Types.ParentMap ( ParentMap )
 import           Stack.Types.Platform ( HasPlatform (..) )
 import           Stack.Types.Runner ( HasRunner (..) )
 import           Stack.Types.SourceMap
@@ -1129,6 +1133,31 @@ describeConfigDiff config old new
            . map T.pack
            . (\(ConfigureOpts x y) -> x ++ y)
            . configCacheOpts
+   where
+    -- options set by Stack
+    isStackOpt :: Text -> Bool
+    isStackOpt t = any (`T.isPrefixOf` t)
+      [ "--dependency="
+      , "--constraint="
+      , "--package-db="
+      , "--libdir="
+      , "--bindir="
+      , "--datadir="
+      , "--libexecdir="
+      , "--sysconfdir"
+      , "--docdir="
+      , "--htmldir="
+      , "--haddockdir="
+      , "--enable-tests"
+      , "--enable-benchmarks"
+      , "--exact-configuration"
+      -- Treat these as causing dirtiness, to resolve
+      -- https://github.com/commercialhaskell/stack/issues/2984
+      --
+      -- , "--enable-library-profiling"
+      -- , "--enable-executable-profiling"
+      -- , "--enable-profiling"
+      ] || t == "--user"
 
   (oldOpts, newOpts) = removeMatching (userOpts old) (userOpts new)
 

src/Stack/Build/Execute.hs

@@ -130,13 +130,12 @@ import           Stack.PackageDump ( conduitDumpPackage, ghcPkgDescribe )
 import           Stack.Prelude
 import           Stack.Types.ApplyGhcOptions ( ApplyGhcOptions (..) )
 import           Stack.Types.Build
-                   ( BaseConfigOpts (..), BuildException (..)
-                   , BuildPrettyException (..), ConfigCache (..)
-                   , ConfigureOpts (..), IsMutable (..), Plan (..)
-                   , PrecompiledCache (..), Task (..), TaskConfigOpts (..)
-                   , TaskType (..), configCacheComponents, taskIsTarget
-                   , taskLocation
+                   ( ConfigCache (..), Plan (..), PrecompiledCache (..)
+                   , Task (..), TaskConfigOpts (..), TaskType (..)
+                   , configCacheComponents, taskIsTarget, taskLocation
                    )
+import           Stack.Types.Build.Exception
+                   ( BuildException (..), BuildPrettyException (..) )
 import           Stack.Types.BuildConfig
                    ( BuildConfig (..), HasBuildConfig (..), projectRootL )
 import           Stack.Types.BuildOpts
@@ -153,6 +152,8 @@ import           Stack.Types.CompilerPaths
                    )
 import           Stack.Types.Config
                    ( Config (..), HasConfig (..), buildOptsL, stackRootL )
+import           Stack.Types.ConfigureOpts
+                   ( BaseConfigOpts (..), ConfigureOpts (..) )
 import           Stack.Types.DumpLogs ( DumpLogs (..) )
 import           Stack.Types.DumpPackage ( DumpPackage (..) )
 import           Stack.Types.EnvConfig
@@ -165,6 +166,7 @@ import           Stack.Types.EnvConfig
 import           Stack.Types.EnvSettings ( EnvSettings (..) )
 import           Stack.Types.GhcPkgId ( GhcPkgId, ghcPkgIdString, unGhcPkgId )
 import           Stack.Types.GlobalOpts ( GlobalOpts (..) )
+import           Stack.Types.IsMutable ( IsMutable (..) )
 import           Stack.Types.NamedComponent
                    ( NamedComponent, benchComponents, exeComponents, isCBench
                    , isCTest, renderComponent, testComponents

src/Stack/Build/Haddock.hs

@@ -30,9 +30,10 @@ import           RIO.List ( intercalate )
 import           RIO.Process ( HasProcessContext, withWorkingDir )
 import           Stack.Constants ( docDirSuffix, relDirAll, relFileIndexHtml )
 import           Stack.Prelude
-import           Stack.Types.Build ( BaseConfigOpts (..), BuildException (..) )
+import           Stack.Types.Build.Exception ( BuildException (..) )
 import           Stack.Types.CompilerPaths
                    ( CompilerPaths (..), HasCompiler (..) )
+import           Stack.Types.ConfigureOpts ( BaseConfigOpts (..) )
 import           Stack.Types.BuildOpts
                    ( BuildOpts (..), BuildOptsCLI (..), HaddockOpts (..) )
 import           Stack.Types.DumpPackage ( DumpPackage (..) )

src/Stack/Build/Source.hs

@@ -34,7 +34,6 @@ import           Stack.SourceMap
                    )
 import           Stack.Types.ApplyGhcOptions ( ApplyGhcOptions (..) )
 import           Stack.Types.ApplyProgOptions ( ApplyProgOptions (..) )
-import           Stack.Types.Build ( FlagSource (..) )
 import           Stack.Types.BuildConfig
                    ( BuildConfig (..), HasBuildConfig (..) )
 import           Stack.Types.BuildOpts
@@ -63,6 +62,7 @@ import           Stack.Types.SourceMap
                    , SMActual (..), SMTargets (..), SourceMap (..)
                    , SourceMapHash (..), Target (..), ppGPD, ppRoot
                    )
+import           Stack.Types.UnusedFlags ( FlagSource (..) )
 import           System.FilePath ( takeFileName )
 import           System.IO.Error ( isDoesNotExistError )
 

src/Stack/Build/Target.hs

@@ -80,7 +80,7 @@ import           Stack.Types.BuildOpts ( BuildOptsCLI (..) )
 import           Stack.Types.Config ( Config (..) )
 import           Stack.Types.NamedComponent
                    ( NamedComponent (..), renderComponent )
-import           Stack.Types.Build ( BuildPrettyException (..) )
+import           Stack.Types.Build.Exception ( BuildPrettyException (..) )
 import           Stack.Types.ProjectConfig ( ProjectConfig (..) )
 import           Stack.Types.SourceMap
                    ( DepPackage (..), GlobalPackage (..), PackageType (..)

src/Stack/Config.hs

@@ -100,7 +100,7 @@ import           Stack.Storage.Util ( handleMigrationException )
 import           Stack.Types.AllowNewerDeps ( AllowNewerDeps (..) )
 import           Stack.Types.ApplyGhcOptions ( ApplyGhcOptions (..) )
 import           Stack.Types.ApplyProgOptions ( ApplyProgOptions (..) )
-import           Stack.Types.Build ( BuildException (..), FlagSource (..) )
+import           Stack.Types.Build.Exception ( BuildException (..) )
 import           Stack.Types.BuildConfig ( BuildConfig (..) )
 import           Stack.Types.BuildOpts ( BuildOpts (..) )
 import           Stack.Types.ColorWhen ( ColorWhen (..) )
@@ -133,6 +133,7 @@ import           Stack.Types.SourceMap
                    , SMWanted (..)
                    )
 import           Stack.Types.StackYamlLoc ( StackYamlLoc (..) )
+import           Stack.Types.UnusedFlags ( FlagSource (..) )
 import           Stack.Types.Version
                    ( IntersectingVersionRange (..), VersionCheck (..)
                    , stackVersion, withinRange

src/Stack/Ghci.hs

@@ -52,7 +52,7 @@ import           Stack.Package
                    )
 import           Stack.Prelude
 import           Stack.Runners ( ShouldReexec (..), withConfig, withEnvConfig )
-import           Stack.Types.Build
+import           Stack.Types.Build.Exception
                    ( BuildPrettyException (..), pprintTargetParseErrors )
 import           Stack.Types.BuildConfig
                    ( BuildConfig (..), HasBuildConfig (..), stackYamlL )

src/Stack/SDist.hs

@@ -61,14 +61,15 @@ import           Stack.Runners
                    ( ShouldReexec (..), withConfig, withDefaultEnvConfig )
 import           Stack.SourceMap ( mkProjectPackage )
 import           Stack.Types.Build
-                   ( CachePkgSrc (..), ConfigureOpts (..), Task (..)
-                   , TaskConfigOpts (..), TaskType (..)
+                   ( CachePkgSrc (..), Task (..), TaskConfigOpts (..)
+                   , TaskType (..)
                    )
 import           Stack.Types.BuildConfig
                    ( BuildConfig (..), HasBuildConfig (..), stackYamlL )
 import           Stack.Types.BuildOpts
                    ( BuildOpts (..), defaultBuildOpts, defaultBuildOptsCLI )
 import           Stack.Types.Config ( Config (..), HasConfig (..) )
+import           Stack.Types.ConfigureOpts ( ConfigureOpts (..) )
 import           Stack.Types.EnvConfig
                    ( EnvConfig (..), HasEnvConfig (..), actualCompilerVersionL )
 import           Stack.Types.GhcPkgId ( GhcPkgId )

src/Stack/Setup.hs

@@ -108,7 +108,7 @@ import           Stack.Setup.Installed
 import           Stack.SourceMap
                    ( actualFromGhc, globalsFromDump, pruneGlobals )
 import           Stack.Storage.User ( loadCompilerPaths, saveCompilerPaths )
-import           Stack.Types.Build ( BuildException (..) )
+import           Stack.Types.Build.Exception ( BuildException (..) )
 import           Stack.Types.BuildConfig
                    ( BuildConfig (..), HasBuildConfig (..), projectRootL
                    , wantedCompilerVersionL

src/Stack/SourceMap.hs

@@ -33,14 +33,14 @@ import           RIO.Process ( HasProcessContext )
 import qualified RIO.Set as Set
 import           Stack.PackageDump ( conduitDumpPackage, ghcPkgDump )
 import           Stack.Prelude
-import           Stack.Types.Build
-                   ( BuildPrettyException (..), FlagSource, UnusedFlags (..) )
+import           Stack.Types.Build.Exception ( BuildPrettyException (..) )
 import           Stack.Types.Compiler
                    ( ActualCompiler, actualToWanted, wantedToActual )
 import           Stack.Types.CompilerPaths
                    ( CompilerPaths (..), GhcPkgExe, HasCompiler (..) )
 import           Stack.Types.Config ( HasConfig )
 import           Stack.Types.DumpPackage ( DumpPackage (..) )
+import           Stack.Types.UnusedFlags ( FlagSource, UnusedFlags (..) )
 import           Stack.Types.Platform ( HasPlatform (..) )
 import           Stack.Types.Runner ( rslInLogL )
 import           Stack.Types.SourceMap

src/Stack/Storage/Project.hs

@@ -34,11 +34,11 @@ import qualified Pantry.Internal as SQLite
 import           Stack.Prelude
 import           Stack.Storage.Util
                    ( handleMigrationException, updateList, updateSet )
-import           Stack.Types.Build
-                   ( CachePkgSrc, ConfigCache (..), ConfigureOpts (..) )
+import           Stack.Types.Build ( CachePkgSrc, ConfigCache (..) )
 import           Stack.Types.BuildConfig
                    ( BuildConfig (..), HasBuildConfig (..) )
 import           Stack.Types.Cache ( ConfigCacheType )
+import           Stack.Types.ConfigureOpts  ( ConfigureOpts (..) )
 import           Stack.Types.GhcPkgId ( GhcPkgId )
 import           Stack.Types.Storage ( ProjectStorage (..) )