Resolve backporting conflicts

Author: jasagredo

Cabal/src/Distribution/Simple/Configure.hs

@@ -73,23 +73,16 @@ import Distribution.PackageDescription.Configuration
 import Distribution.PackageDescription.Check hiding (doesFileExist)
 import Distribution.Simple.BuildToolDepends
 import Distribution.Simple.Program
-<<<<<<< HEAD
 import Distribution.Simple.Setup as Setup
 import Distribution.Simple.BuildTarget
 import Distribution.Simple.LocalBuildInfo
-import Distribution.Types.PackageVersionConstraint
-import Distribution.Types.LocalBuildInfo
-=======
-import Distribution.Simple.Program.Db (appendProgramSearchPath, lookupProgramByName)
-import Distribution.Simple.Setup.Common as Setup
-import Distribution.Simple.Setup.Config as Setup
+import Distribution.Simple.Program.Db (appendProgramSearchPath)
 import Distribution.Simple.Utils
 import Distribution.System
->>>>>>> 46df8ba71 (Fix extra-prog-path propagation in the codebase.)
+import Distribution.Types.PackageVersionConstraint
+import Distribution.Types.LocalBuildInfo
 import Distribution.Types.ComponentRequestedSpec
 import Distribution.Types.GivenComponent
-import Distribution.Simple.Utils
-import Distribution.System
 import Distribution.Version
 import Distribution.Verbosity
 import qualified Distribution.Compat.Graph as Graph
@@ -375,18 +368,19 @@ configure (pkg_descr0, pbi) cfg = do
             (fromFlag (configUserInstall cfg))
             (configPackageDBs cfg)
 
+    programDbPre <- mkProgramDb cfg (configPrograms cfg)
     -- comp:            the compiler we're building with
     -- compPlatform:    the platform we're building for
     -- programDb:  location and args of all programs we're
     --                  building with
-    (comp         :: Compiler,
+    (comp :: Compiler,
      compPlatform :: Platform,
-     programDb    :: ProgramDb)
+     programDb :: ProgramDb)
         <- configCompilerEx
             (flagToMaybe (configHcFlavor cfg))
             (flagToMaybe (configHcPath cfg))
             (flagToMaybe (configHcPkg cfg))
-            (mkProgramDb cfg (configPrograms cfg))
+            programDbPre
             (lessVerbose verbosity)
 
     -- The InstalledPackageIndex of all installed packages
@@ -399,7 +393,6 @@ configure (pkg_descr0, pbi) cfg = do
     let internalPackageSet :: Set LibraryName
         internalPackageSet = getInternalLibraries pkg_descr0
 
-<<<<<<< HEAD
     -- Make a data structure describing what components are enabled.
     let enabled :: ComponentRequestedSpec
         enabled = case mb_cname of
@@ -421,23 +414,6 @@ configure (pkg_descr0, pbi) cfg = do
         die' verbosity $
               "--enable-tests/--enable-benchmarks are incompatible with" ++
               " explicitly specifying a component to configure."
-=======
-  programDbPre <- mkProgramDb cfg (configPrograms cfg)
-  -- comp:            the compiler we're building with
-  -- compPlatform:    the platform we're building for
-  -- programDb:  location and args of all programs we're
-  --                  building with
-  ( comp :: Compiler
-    , compPlatform :: Platform
-    , programDb00 :: ProgramDb
-    ) <-
-    configCompilerEx
-      (flagToMaybe (configHcFlavor cfg))
-      (flagToMaybe (configHcPath cfg))
-      (flagToMaybe (configHcPkg cfg))
-      programDbPre
-      (lessVerbose verbosity)
->>>>>>> 46df8ba71 (Fix extra-prog-path propagation in the codebase.)
 
     -- Some sanity checks related to dynamic/static linking.
     when (fromFlag (configDynExe cfg) && fromFlag (configFullyStaticExe cfg)) $
@@ -880,15 +856,6 @@ mkProgramDb cfg initialProgramDb = do
     . userSpecifyPaths (configProgramPaths cfg)
     $ programDb
   where
-<<<<<<< HEAD
-    programDb  = userSpecifyArgss (configProgramArgs cfg)
-                 . userSpecifyPaths (configProgramPaths cfg)
-                 . setProgramSearchPath searchpath
-                 $ initialProgramDb
-    searchpath = map ProgramSearchPathDir
-                 (fromNubList $ configProgramPathExtra cfg)
-                 ++ getProgramSearchPath initialProgramDb
-=======
     searchpath = fromNubList $ configProgramPathExtra cfg
 
 -- Note. We try as much as possible to _prepend_ rather than postpend the extra-prog-path
@@ -897,7 +864,6 @@ mkProgramDb cfg initialProgramDb = do
 -- so for v2 builds adding it again is entirely unnecessary. However, it needs to get added again _anyway_
 -- so as to take effect for v1 builds or standalone calls to Setup.hs
 -- In this instance, the lesser evil is to not allow it to override the system path.
->>>>>>> 46df8ba71 (Fix extra-prog-path propagation in the codebase.)
 
 -- -----------------------------------------------------------------------------
 -- Helper functions for configure
@@ -1745,29 +1711,15 @@ ccLdOptionsBuildInfo cflags ldflags ldflags_static =
 -- -----------------------------------------------------------------------------
 -- Determining the compiler details
 
-<<<<<<< HEAD
 configCompilerAuxEx :: ConfigFlags
                     -> IO (Compiler, Platform, ProgramDb)
-configCompilerAuxEx cfg = configCompilerEx (flagToMaybe $ configHcFlavor cfg)
+configCompilerAuxEx cfg = do
+  programDb <- mkProgramDb cfg defaultProgramDb
+  configCompilerEx (flagToMaybe $ configHcFlavor cfg)
                                            (flagToMaybe $ configHcPath cfg)
                                            (flagToMaybe $ configHcPkg cfg)
                                            programDb
                                            (fromFlag (configVerbosity cfg))
-  where
-    programDb = mkProgramDb cfg defaultProgramDb
-=======
-configCompilerAuxEx
-  :: ConfigFlags
-  -> IO (Compiler, Platform, ProgramDb)
-configCompilerAuxEx cfg = do
-  programDb <- mkProgramDb cfg defaultProgramDb
-  configCompilerEx
-    (flagToMaybe $ configHcFlavor cfg)
-    (flagToMaybe $ configHcPath cfg)
-    (flagToMaybe $ configHcPkg cfg)
-    programDb
-    (fromFlag (configVerbosity cfg))
->>>>>>> 46df8ba71 (Fix extra-prog-path propagation in the codebase.)
 
 configCompilerEx :: Maybe CompilerFlavor -> Maybe FilePath -> Maybe FilePath
                  -> ProgramDb -> Verbosity

Cabal/src/Distribution/Simple/ConfigureScript.hs

@@ -137,17 +137,9 @@ runConfigureScript verbosity flags lbi = do
       maybeHostFlag = if hp == buildPlatform then [] else ["--host=" ++ show (pretty hp)]
       args' = configureFile':args ++ ["CC=" ++ ccProgShort] ++ maybeHostFlag
       shProg = simpleProgram "sh"
-<<<<<<< HEAD
-      progDb = modifyProgramSearchPath
-               (\p -> map ProgramSearchPathDir extraPath ++ p) emptyProgramDb
-  shConfiguredProg <- lookupProgram shProg
-                      `fmap` configureProgram  verbosity shProg progDb
-=======
   progDb <- appendProgramSearchPath verbosity extraPath emptyProgramDb
-  shConfiguredProg <-
-    lookupProgram shProg
-      `fmap` configureProgram verbosity shProg progDb
->>>>>>> 46df8ba71 (Fix extra-prog-path propagation in the codebase.)
+  shConfiguredProg <- lookupProgram shProg
+                      `fmap` configureProgram verbosity shProg progDb
   case shConfiguredProg of
       Just sh -> runProgramInvocation verbosity $
                  (programInvocation (sh {programOverrideEnv = overEnv}) args')

Cabal/src/Distribution/Simple/GHC.hs

@@ -1889,17 +1889,8 @@ libAbiHash verbosity _pkg_descr lbi lib clbi = do
         | otherwise = error "libAbiHash: Can't find an enabled library way"
 
   (ghcProg, _) <- requireProgram verbosity ghcProgram (withPrograms lbi)
-<<<<<<< HEAD
   hash <- getProgramInvocationOutput verbosity
-          (ghcInvocation ghcProg comp platform ghcArgs)
-=======
-
-  hash <-
-    getProgramInvocationOutput
-      verbosity
-      =<< ghcInvocation verbosity ghcProg comp platform ghcArgs
-
->>>>>>> 46df8ba71 (Fix extra-prog-path propagation in the codebase.)
+          =<< ghcInvocation verbosity ghcProg comp platform ghcArgs
   return (takeWhile (not . isSpace) hash)
 
 componentGhcOptions :: Verbosity -> LocalBuildInfo

Cabal/src/Distribution/Simple/GHCJS.hs

@@ -1601,15 +1601,8 @@ libAbiHash verbosity _pkg_descr lbi lib clbi = do
         | otherwise = error "libAbiHash: Can't find an enabled library way"
 
   (ghcjsProg, _) <- requireProgram verbosity ghcjsProgram (withPrograms lbi)
-<<<<<<< HEAD
   hash <- getProgramInvocationOutput verbosity
-          (ghcInvocation ghcjsProg comp platform ghcArgs)
-=======
-  hash <-
-    getProgramInvocationOutput
-      verbosity
-      =<< ghcInvocation verbosity ghcjsProg comp platform ghcArgs
->>>>>>> 46df8ba71 (Fix extra-prog-path propagation in the codebase.)
+          =<< ghcInvocation verbose ghcjsProg comp platform ghcArgs
   return (takeWhile (not . isSpace) hash)
 
 componentGhcOptions :: Verbosity -> LocalBuildInfo

Cabal/src/Distribution/Simple/Program/Db.hs

@@ -32,9 +32,9 @@ module Distribution.Simple.Program.Db (
     restoreProgramDb,
 
     -- ** Query and manipulate the program db
-<<<<<<< HEAD
     addKnownProgram,
     addKnownPrograms,
+    appendProgramSearchPath,
     lookupKnownProgram,
     knownPrograms,
     getProgramSearchPath,
@@ -49,26 +49,6 @@ module Distribution.Simple.Program.Db (
     lookupProgram,
     updateProgram,
     configuredPrograms,
-=======
-  , addKnownProgram
-  , addKnownPrograms
-  , appendProgramSearchPath
-  , lookupKnownProgram
-  , knownPrograms
-  , getProgramSearchPath
-  , setProgramSearchPath
-  , modifyProgramSearchPath
-  , userSpecifyPath
-  , userSpecifyPaths
-  , userMaybeSpecifyPath
-  , userSpecifyArgs
-  , userSpecifyArgss
-  , userSpecifiedArgs
-  , lookupProgram
-  , lookupProgramByName
-  , updateProgram
-  , configuredPrograms
->>>>>>> 46df8ba71 (Fix extra-prog-path propagation in the codebase.)
 
     -- ** Query and manipulate the program db
     configureProgram,
@@ -243,15 +223,6 @@ modifyProgramSearchPath :: (ProgramSearchPath -> ProgramSearchPath)
 modifyProgramSearchPath f db =
   setProgramSearchPath (f $ getProgramSearchPath db) db
 
-<<<<<<< HEAD
--- |User-specify this path.  Basically override any path information
--- for this program in the configuration. If it's not a known
--- program ignore it.
---
-userSpecifyPath :: String   -- ^Program name
-                -> FilePath -- ^user-specified path to the program
-                -> ProgramDb -> ProgramDb
-=======
 -- | Modify the current 'ProgramSearchPath' used by the 'ProgramDb'
 -- by appending the provided extra paths. Also logs the added paths
 -- in info verbosity.
@@ -267,17 +238,13 @@ appendProgramSearchPath verbosity extraPaths db =
       pure $ modifyProgramSearchPath (map ProgramSearchPathDir extraPaths ++) db
     else pure db
 
--- | User-specify this path.  Basically override any path information
---  for this program in the configuration. If it's not a known
---  program ignore it.
-userSpecifyPath
-  :: String
-  -- ^ Program name
-  -> FilePath
-  -- ^ user-specified path to the program
-  -> ProgramDb
-  -> ProgramDb
->>>>>>> 46df8ba71 (Fix extra-prog-path propagation in the codebase.)
+-- |User-specify this path.  Basically override any path information
+-- for this program in the configuration. If it's not a known
+-- program ignore it.
+--
+userSpecifyPath :: String   -- ^Program name
+                -> FilePath -- ^user-specified path to the program
+                -> ProgramDb -> ProgramDb
 userSpecifyPath name path = updateUnconfiguredProgs $
   flip Map.update name $ \(prog, _, args) -> Just (prog, Just path, args)
 

Cabal/src/Distribution/Simple/Program/Find.hs

@@ -24,7 +24,6 @@
 -- So we need an extension of the usual 'findExecutable' that can look in
 -- additional locations, either before, after or instead of the normal OS
 -- locations.
-<<<<<<< HEAD
 --
 module Distribution.Simple.Program.Find (
     -- * Program search path
@@ -33,26 +32,17 @@ module Distribution.Simple.Program.Find (
     defaultProgramSearchPath,
     findProgramOnSearchPath,
     programSearchPathAsPATHVar,
+    logExtraProgramSearchPath,
     getSystemSearchPath,
-=======
-module Distribution.Simple.Program.Find
-  ( -- * Program search path
-    ProgramSearchPath
-  , ProgramSearchPathEntry (..)
-  , defaultProgramSearchPath
-  , findProgramOnSearchPath
-  , programSearchPathAsPATHVar
-  , logExtraProgramSearchPath
-  , getSystemSearchPath
-  , getExtraPathEnv
-  , simpleProgram
->>>>>>> 46df8ba71 (Fix extra-prog-path propagation in the codebase.)
+    getExtraPathEnv,
+    simpleProgram
   ) where
 
 import Prelude ()
 import Distribution.Compat.Prelude
 
 import Distribution.Verbosity
+import Distribution.Simple.Program.Types
 import Distribution.Simple.Utils
 import Distribution.System
 import Distribution.Compat.Environment
@@ -66,34 +56,9 @@ import System.FilePath as FilePath
 import qualified System.Win32 as Win32
 #endif
 
--- | A search path to use when locating executables. This is analogous
--- to the unix @$PATH@ or win32 @%PATH%@ but with the ability to use
--- the system default method for finding executables ('findExecutable' which
--- on unix is simply looking on the @$PATH@ but on win32 is a bit more
--- complicated).
---
--- The default to use is @[ProgSearchPathDefault]@ but you can add extra dirs
--- either before, after or instead of the default, e.g. here we add an extra
--- dir to search after the usual ones.
---
--- > ['ProgramSearchPathDefault', 'ProgramSearchPathDir' dir]
---
-type ProgramSearchPath = [ProgramSearchPathEntry]
-data ProgramSearchPathEntry =
-         ProgramSearchPathDir FilePath  -- ^ A specific dir
-       | ProgramSearchPathDefault       -- ^ The system default
-  deriving (Eq, Generic, Typeable)
-
-instance Binary ProgramSearchPathEntry
-instance Structured ProgramSearchPathEntry
-
 defaultProgramSearchPath :: ProgramSearchPath
 defaultProgramSearchPath = [ProgramSearchPathDefault]
 
-<<<<<<< HEAD
-findProgramOnSearchPath :: Verbosity -> ProgramSearchPath
-                        -> FilePath -> IO (Maybe (FilePath, [FilePath]))
-=======
 logExtraProgramSearchPath
   :: Verbosity
   -> [FilePath]
@@ -103,12 +68,8 @@ logExtraProgramSearchPath verbosity extraPaths =
     "Including the following directories in PATH:"
       : map ("- " ++) extraPaths
 
-findProgramOnSearchPath
-  :: Verbosity
-  -> ProgramSearchPath
-  -> FilePath
-  -> IO (Maybe (FilePath, [FilePath]))
->>>>>>> 46df8ba71 (Fix extra-prog-path propagation in the codebase.)
+findProgramOnSearchPath :: Verbosity -> ProgramSearchPath
+                        -> FilePath -> IO (Maybe (FilePath, [FilePath]))
 findProgramOnSearchPath verbosity searchpath prog = do
     debug verbosity $ "Searching for " ++ prog ++ " in path."
     res <- tryPathElems [] searchpath
@@ -246,3 +207,19 @@ findExecutable prog = do
         _     -> return mExe
 #endif
 
+
+-- | Make a simple named program.
+--
+-- By default we'll just search for it in the path and not try to find the
+-- version name. You can override these behaviours if necessary, eg:
+--
+-- > (simpleProgram "foo") { programFindLocation = ... , programFindVersion ... }
+--
+simpleProgram :: String -> Program
+simpleProgram name = Program {
+    programName         = name,
+    programFindLocation = \v p -> findProgramOnSearchPath v p name,
+    programFindVersion  = \_ _ -> return Nothing,
+    programPostConf     = \_ p -> return p,
+    programNormaliseArgs   = \_ _ -> id
+  }