From 3fddba91f7bbd4efe5f3cbc0b11c4a03b964dd4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9cate=20Moonlight?= Date: Sat, 5 Aug 2023 16:54:26 +0200 Subject: [PATCH] Fix conflicts --- Cabal/src/Distribution/Simple/Haddock.hs | 40 -- .../Distribution/Client/CmdHaddockProject.hs | 403 ++++-------------- .../Backpack/Includes2/setup-external.out | 79 +--- .../Includes2/setup-per-component.out | 95 ++--- .../Includes3/setup-external-explicit.out | 30 +- .../Includes3/setup-external-ok.cabal.out | 88 +--- .../Backpack/Includes3/setup-external-ok.out | 88 +--- .../Backpack/Reexport1/setup.cabal.out | 48 +-- .../PackageTests/Backpack/Reexport1/setup.out | 22 +- .../PackageTests/Haddock/setup.cabal.out | 6 - .../PackageTests/Haddock/setup.out | 6 - .../PackageTests/HaddockArgs/quickjump.out | 15 - .../HaddockNewline/setup.cabal.out | 6 - .../PackageTests/HaddockNewline/setup.out | 6 - .../Haddock/haddock.cabal.out | 12 - .../InternalLibraries/Haddock/haddock.out | 12 - .../NewHaddock/DisableDoc/cabal.out | 7 - .../NewHaddock/ImplyDependencies/cabal.out | 14 - 18 files changed, 197 insertions(+), 780 deletions(-) diff --git a/Cabal/src/Distribution/Simple/Haddock.hs b/Cabal/src/Distribution/Simple/Haddock.hs index ddf3cd1c7e9..855ef38b798 100644 --- a/Cabal/src/Distribution/Simple/Haddock.hs +++ b/Cabal/src/Distribution/Simple/Haddock.hs @@ -358,17 +358,10 @@ createHaddockIndex :: Verbosity -> HaddockProjectFlags -> IO () createHaddockIndex verbosity programDb comp platform flags = do -<<<<<<< HEAD - let args = fromHaddockProjectFlags flags - (haddockProg, _version) <- - getHaddockProg verbosity programDb comp args (haddockProjectQuickJump flags) - runHaddock verbosity defaultTempFileOptions comp platform haddockProg False args -======= let args = fromHaddockProjectFlags flags (haddockProg, _version) <- getHaddockProg verbosity programDb comp args (Flag True) runHaddock verbosity defaultTempFileOptions comp platform haddockProg False args ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) -- ------------------------------------------------------------------------------ -- Contributions to HaddockArgs (see also Doctest.hs for very similar code). @@ -410,19 +403,6 @@ fromFlags env flags = fromHaddockProjectFlags :: HaddockProjectFlags -> HaddockArgs fromHaddockProjectFlags flags = -<<<<<<< HEAD - mempty - { argOutputDir = Dir (fromFlag $ haddockProjectDir flags) - , argQuickJump = haddockProjectQuickJump flags - , argGenContents = haddockProjectGenContents flags - , argGenIndex = haddockProjectGenIndex flags - , argPrologueFile = haddockProjectPrologue flags - , argInterfaces = fromFlagOrDefault [] (haddockProjectInterfaces flags) - , argLinkedSource = haddockProjectLinkedSource flags - , argLib = haddockProjectLib flags - } - -======= mempty { argOutputDir = Dir (fromFlag $ haddockProjectDir flags) , argQuickJump = Flag True @@ -433,7 +413,6 @@ fromHaddockProjectFlags flags = , argLinkedSource = Flag True , argLib = haddockProjectLib flags } ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) fromPackageDescription :: HaddockTarget -> PackageDescription -> HaddockArgs fromPackageDescription haddockTarget pkg_descr = mempty @@ -697,24 +676,6 @@ renderArgs verbosity tmpFileOpts version comp platform args k = do (if haddockSupportsUTF8 then Just utf8 else Nothing) renderedArgs (\responseFileName -> k (["@" ++ responseFileName], result)) -<<<<<<< HEAD - else - k (renderedArgs, result) - where - outputDir = (unDir $ argOutputDir args) - result = intercalate ", " - . map (\o -> outputDir - case o of - Html -> "index.html" - Hoogle -> pkgstr <.> "txt") - . fromFlagOrDefault [Html] - . argOutput - $ args - where - pkgstr = prettyShow $ packageName pkgid - pkgid = arg argPackageName - arg f = fromFlag $ f args -======= else k (renderedArgs, result) where outputDir = (unDir $ argOutputDir args) @@ -739,7 +700,6 @@ renderArgs verbosity tmpFileOpts version comp platform args k = do pkgstr = prettyShow $ packageName pkgid pkgid = arg argPackageName arg f = fromFlag $ f args ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) renderPureArgs :: Version -> Compiler -> Platform -> HaddockArgs -> [String] renderPureArgs version comp platform args = concat diff --git a/cabal-install/src/Distribution/Client/CmdHaddockProject.hs b/cabal-install/src/Distribution/Client/CmdHaddockProject.hs index 2974a1acdda..e402a8db87c 100644 --- a/cabal-install/src/Distribution/Client/CmdHaddockProject.hs +++ b/cabal-install/src/Distribution/Client/CmdHaddockProject.hs @@ -3,50 +3,54 @@ module Distribution.Client.CmdHaddockProject , haddockProjectAction ) where -<<<<<<< HEAD -import Prelude () -import Data.Bool (bool) -======= ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) import Distribution.Client.Compat.Prelude hiding (get) +import Prelude () -import qualified Distribution.Client.CmdBuild as CmdBuild +import qualified Distribution.Client.CmdBuild as CmdBuild import qualified Distribution.Client.CmdHaddock as CmdHaddock -import Distribution.Client.DistDirLayout (DistDirLayout(..) - ,CabalDirLayout(..) - ,StoreDirLayout(..)) -import Distribution.Client.InstallPlan (foldPlanPackage) +import Distribution.Client.DistDirLayout + ( CabalDirLayout (..) + , DistDirLayout (..) + , StoreDirLayout (..) + ) +import Distribution.Client.InstallPlan (foldPlanPackage) import qualified Distribution.Client.InstallPlan as InstallPlan import qualified Distribution.Client.NixStyleOptions as NixStyleOptions import Distribution.Client.ProjectOrchestration - (AvailableTarget(..) - ,AvailableTargetStatus(..) - ,CurrentCommand(..) - ,ProjectBaseContext(..) - ,ProjectBuildContext(..) - ,TargetSelector(..) - ,printPlan - ,pruneInstallPlanToTargets - ,resolveTargets - ,runProjectPreBuildPhase - ,selectComponentTargetBasic) -import Distribution.Client.ProjectPlanning (ElaboratedConfiguredPackage(..) - ,ElaboratedInstallPlan - ,ElaboratedSharedConfig(..) - ,TargetAction(..)) + ( AvailableTarget (..) + , AvailableTargetStatus (..) + , CurrentCommand (..) + , ProjectBaseContext (..) + , ProjectBuildContext (..) + , TargetSelector (..) + , printPlan + , pruneInstallPlanToTargets + , resolveTargets + , runProjectPreBuildPhase + , selectComponentTargetBasic + ) +import Distribution.Client.ProjectPlanning + ( ElaboratedConfiguredPackage (..) + , ElaboratedInstallPlan + , ElaboratedSharedConfig (..) + , TargetAction (..) + ) import Distribution.Client.ProjectPlanning.Types - (elabDistDirParams) -import Distribution.Client.Setup (GlobalFlags(..) - ,ConfigFlags(..)) -import Distribution.Client.ScriptUtils (AcceptNoTargets(..) - ,TargetContext(..) - ,updateContextAndWriteProjectFile - ,withContextAndSelectors) -import Distribution.Client.TargetProblem (TargetProblem(..)) + ( elabDistDirParams + ) +import Distribution.Client.ScriptUtils + ( AcceptNoTargets (..) + , TargetContext (..) + , updateContextAndWriteProjectFile + , withContextAndSelectors + ) +import Distribution.Client.Setup + ( ConfigFlags (..) + , GlobalFlags (..) + ) +import Distribution.Client.TargetProblem (TargetProblem (..)) -<<<<<<< HEAD -======= import Distribution.Simple.Command ( CommandUI (..) ) @@ -84,97 +88,24 @@ import Distribution.Simple.Utils , warn ) import Distribution.Types.InstalledPackageInfo (InstalledPackageInfo (..)) ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) import Distribution.Types.PackageId (pkgName) import Distribution.Types.PackageName (unPackageName) import Distribution.Types.UnitId (unUnitId) import Distribution.Types.Version (mkVersion) import Distribution.Types.VersionRange (orLaterVersion) -import Distribution.Types.InstalledPackageInfo (InstalledPackageInfo (..)) -import Distribution.Simple.Command - ( CommandUI(..) ) -import Distribution.Simple.Compiler - ( Compiler (..) ) -import Distribution.Simple.Flag - ( Flag(..) - , flagElim - , flagToList - , fromFlag - , fromFlagOrDefault - ) -import Distribution.Simple.InstallDirs - ( toPathTemplate ) -import Distribution.Simple.Haddock (createHaddockIndex) -import Distribution.Simple.Utils - ( die', createDirectoryIfMissingVerbose - , copyDirectoryRecursive, warn ) -import Distribution.Simple.Program.Builtin - ( haddockProgram ) -import Distribution.Simple.Program.Db - ( addKnownProgram, reconfigurePrograms, requireProgramVersion ) -import Distribution.Simple.Setup - ( HaddockFlags(..), defaultHaddockFlags - , HaddockProjectFlags(..) - , Visibility(..) - , haddockProjectCommand - ) import Distribution.Verbosity as Verbosity - ( normal ) + ( normal + ) -import System.FilePath ( takeDirectory, normalise, (), (<.>) ) -import System.Directory ( doesDirectoryExist, doesFileExist ) +import System.Directory (doesDirectoryExist, doesFileExist) +import System.FilePath (normalise, takeDirectory, (<.>), ()) haddockProjectAction :: HaddockProjectFlags -> [String] -> GlobalFlags -> IO () haddockProjectAction flags _extraArgs globalFlags = do - -- create destination directory if it does not exist - let outputDir = normalise $ fromFlag (haddockProjectDir flags) - createDirectoryIfMissingVerbose verbosity True outputDir - -<<<<<<< HEAD - when ((2::Int) <= - ( flagElim 0 (bool 0 1) (haddockProjectHackage flags) - + flagElim 0 (bool 0 1) (haddockProjectLocal flags) - + flagElim 0 (const 1) (haddockProjectHtmlLocation flags) - )) $ - die' verbosity "Options `--local`, `--hackage` and `--html-location` are mutually exclusive`" + -- create destination directory if it does not exist + let outputDir = normalise $ fromFlag (haddockProjectDir flags) + createDirectoryIfMissingVerbose verbosity True outputDir - warn verbosity "haddock-project command is experimental, it might break in the future" - - -- build all packages with appropriate haddock flags - let haddockFlags = defaultHaddockFlags - { haddockHtml = Flag True - -- one can either use `--haddock-base-url` or - -- `--haddock-html-location`. - , haddockBaseUrl = if localStyle - then Flag ".." - else NoFlag - , haddockProgramPaths = haddockProjectProgramPaths flags - , haddockProgramArgs = haddockProjectProgramArgs flags - , haddockHtmlLocation = if fromFlagOrDefault False (haddockProjectHackage flags) - then Flag "https://hackage.haskell.org/package/$pkg-$version/docs" - else haddockProjectHtmlLocation flags - , haddockHoogle = haddockProjectHoogle flags - , haddockExecutables = haddockProjectExecutables flags - , haddockTestSuites = haddockProjectTestSuites flags - , haddockBenchmarks = haddockProjectBenchmarks flags - , haddockForeignLibs = haddockProjectForeignLibs flags - , haddockInternal = haddockProjectInternal flags - , haddockCss = haddockProjectCss flags - , haddockLinkedSource = if localOrHackage - then Flag True - else haddockProjectLinkedSource flags - , haddockQuickJump = if localOrHackage - then Flag True - else haddockProjectQuickJump flags - , haddockHscolourCss = haddockProjectHscolourCss flags - , haddockContents = if localStyle then Flag (toPathTemplate "../index.html") - else NoFlag - , haddockIndex = if localStyle then Flag (toPathTemplate "../doc-index.html") - else NoFlag - , haddockKeepTempFiles= haddockProjectKeepTempFiles flags - , haddockVerbosity = haddockProjectVerbosity flags - , haddockLib = haddockProjectLib flags -======= warn verbosity "haddock-project command is experimental, it might break in the future" -- build all packages with appropriate haddock flags @@ -215,20 +146,7 @@ haddockProjectAction flags _extraArgs globalFlags = do , haddockVerbosity = haddockProjectVerbosity flags , haddockLib = haddockProjectLib flags , haddockOutputDir = haddockProjectOutputDir flags ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) } -<<<<<<< HEAD - nixFlags = (commandDefaultFlags CmdHaddock.haddockCommand) - { NixStyleOptions.haddockFlags = haddockFlags - , NixStyleOptions.configFlags = - (NixStyleOptions.configFlags (commandDefaultFlags CmdBuild.buildCommand)) - { configVerbosity = haddockProjectVerbosity flags } - } - - -- - -- Construct the build plan and infer the list of packages which haddocks - -- we need. -======= nixFlags = (commandDefaultFlags CmdHaddock.haddockCommand) { NixStyleOptions.haddockFlags = haddockFlags @@ -316,91 +234,17 @@ haddockProjectAction flags _extraArgs globalFlags = do -- -- Build haddocks of each components ->>>>>>> 2c597e8c9 (Build dependencies with haddock-project) -- - withContextAndSelectors RejectNoTargets Nothing nixFlags ["all"] globalFlags HaddockCommand $ \targetCtx ctx targetSelectors -> do - baseCtx <- case targetCtx of - ProjectContext -> return ctx - GlobalContext -> return ctx - ScriptContext path exemeta -> updateContextAndWriteProjectFile ctx path exemeta - let distLayout = distDirLayout baseCtx - cabalLayout = cabalDirLayout baseCtx - buildCtx <- - runProjectPreBuildPhase verbosity baseCtx $ \elaboratedPlan -> do - -- Interpret the targets on the command line as build targets - -- (as opposed to say repl or haddock targets). - targets <- either reportTargetProblems return - $ resolveTargets - selectPackageTargets - selectComponentTargetBasic - elaboratedPlan - Nothing - targetSelectors - - let elaboratedPlan' = pruneInstallPlanToTargets - TargetActionBuild - targets - elaboratedPlan - return (elaboratedPlan', targets) - -<<<<<<< HEAD - printPlan verbosity baseCtx buildCtx - - let elaboratedPlan :: ElaboratedInstallPlan - elaboratedPlan = elaboratedPlanOriginal buildCtx - - sharedConfig :: ElaboratedSharedConfig - sharedConfig = elaboratedShared buildCtx - - pkgs :: [Either InstalledPackageInfo ElaboratedConfiguredPackage ] - pkgs = matchingPackages elaboratedPlan - - progs <- reconfigurePrograms verbosity - (haddockProjectProgramPaths flags) - (haddockProjectProgramArgs flags) - -- we need to insert 'haddockProgram' before we reconfigure it, - -- otherwise 'set - . addKnownProgram haddockProgram - . pkgConfigCompilerProgs - $ sharedConfig - let sharedConfig' = sharedConfig { pkgConfigCompilerProgs = progs } - - _ <- requireProgramVersion - verbosity haddockProgram - (orLaterVersion (mkVersion [2,26,1])) progs - - -- - -- Build haddocks of each components - -- - - CmdHaddock.haddockAction - nixFlags - ["all"] - globalFlags + CmdHaddock.haddockAction + nixFlags + ["all"] + globalFlags - -- - -- Copy haddocks to the destination folder - -- + -- + -- Copy haddocks to the destination folder + -- - packageInfos <- fmap (nub . concat) $ for pkgs $ \pkg -> - case pkg of - Left _ | not localStyle -> - return [] - Left package -> do - let packageName = unPackageName (pkgName $ sourcePackageId package) - destDir = outputDir packageName - fmap catMaybes $ for (haddockInterfaces package) $ \interfacePath -> do - let docDir = takeDirectory interfacePath - a <- doesFileExist interfacePath - case a of - True -> copyDirectoryRecursive verbosity docDir destDir - >> return (Just ( packageName - , interfacePath - , Hidden - )) - False -> return Nothing -======= packageInfos <- fmap (nub . concat) $ for pkgs $ \pkg -> case pkg of Left _ @@ -489,92 +333,20 @@ haddockProjectAction flags _extraArgs globalFlags = do , Hidden ) ] -<<<<<<< HEAD - False -> return [] ->>>>>>> 1840bca4b (haddock-project: use UnitId instead of package names) -======= False -> do warn verbosity ("haddocks of " ++ show unitId ++ " not found in the store") return [] ->>>>>>> 2c597e8c9 (Build dependencies with haddock-project) - - Right package -> - case elabLocalToProject package of - True -> do - let distDirParams = elabDistDirParams sharedConfig' package - buildDir = distBuildDirectory distLayout distDirParams - packageName = unPackageName (pkgName $ elabPkgSourceId package) - let docDir = buildDir - "doc" "html" - packageName - destDir = outputDir packageName - interfacePath = destDir - packageName <.> "haddock" - a <- doesDirectoryExist docDir - case a of - True -> copyDirectoryRecursive verbosity docDir destDir - >> return [( packageName - , interfacePath - , Visible - )] - False -> return [] - False | not localStyle -> - return [] - False -> do - let packageName = unPackageName (pkgName $ elabPkgSourceId package) - packageDir = storePackageDirectory (cabalStoreDirLayout cabalLayout) - (compilerId (pkgConfigCompiler sharedConfig')) - (elabUnitId package) - docDir = packageDir "share" "doc" "html" - destDir = outputDir packageName - interfacePath = destDir - packageName <.> "haddock" - a <- doesDirectoryExist docDir - case a of - True -> copyDirectoryRecursive verbosity docDir destDir - -- non local packages will be hidden in haddock's - -- generated contents page - >> return [( packageName - , interfacePath - , Hidden - )] - False -> return [] -<<<<<<< HEAD - -- - -- generate index, content, etc. - -- + -- + -- generate index, content, etc. + -- - let flags' = flags - { haddockProjectDir = Flag outputDir - , haddockProjectGenIndex = if localOrHackage - then Flag True - else haddockProjectGenIndex flags - , haddockProjectGenContents = if localOrHackage - then Flag True - else haddockProjectGenContents flags - , haddockProjectQuickJump = if localOrHackage - then Flag True - else haddockProjectQuickJump flags - , haddockProjectLinkedSource = haddockLinkedSource haddockFlags -<<<<<<< HEAD - , haddockProjectInterfaces = Flag - [ ( interfacePath - , Just packageName - , Just packageName - , visibility - ) - | (packageName, interfacePath, visibility) <- packageInfos - ] -======= -======= let flags' = flags { haddockProjectDir = Flag outputDir ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) , haddockProjectInterfaces = Flag [ ( interfacePath @@ -584,13 +356,13 @@ haddockProjectAction flags _extraArgs globalFlags = do ) | (name, interfacePath, visibility) <- packageInfos ] ->>>>>>> 1840bca4b (haddock-project: use UnitId instead of package names) } - createHaddockIndex verbosity - (pkgConfigCompilerProgs sharedConfig') - (pkgConfigCompiler sharedConfig') - (pkgConfigPlatform sharedConfig') - flags' + createHaddockIndex + verbosity + (pkgConfigCompilerProgs sharedConfig') + (pkgConfigCompiler sharedConfig') + (pkgConfigPlatform sharedConfig') + flags' where verbosity = fromFlagOrDefault normal (haddockProjectVerbosity flags) @@ -598,42 +370,33 @@ haddockProjectAction flags _extraArgs globalFlags = do -- transitive dependencies; or depend on `--haddocks-html-location` to -- provide location of the documentation of dependencies. localStyle = -<<<<<<< HEAD - let local = fromFlagOrDefault False (haddockProjectLocal flags) - hackage = fromFlagOrDefault False (haddockProjectHackage flags) - location = fromFlagOrDefault False (const True <$> haddockProjectHtmlLocation flags) - in local && not hackage && not location - -- or if none of the flags is given set `localStyle` to `True` - || not local && not hackage && not location - - - localOrHackage = - any id $ flagToList (haddockProjectLocal flags) - ++ flagToList (haddockProjectHackage flags) -======= let hackage = fromFlagOrDefault False (haddockProjectHackage flags) location = fromFlagOrDefault False (const True <$> haddockProjectHtmlLocation flags) in not hackage && not location ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) reportTargetProblems :: Show x => [x] -> IO a reportTargetProblems = - die' verbosity . unlines . map show + die' verbosity . unlines . map show -- TODO: this is just a sketch - selectPackageTargets :: TargetSelector - -> [AvailableTarget k] - -> Either (TargetProblem ()) [k] - selectPackageTargets _ ts = Right $ - mapMaybe - (\t -> case availableTargetStatus t of - TargetBuildable k _ | availableTargetLocalToProject t - -> Just k - _ -> Nothing) - ts - - matchingPackages :: ElaboratedInstallPlan - -> [Either InstalledPackageInfo ElaboratedConfiguredPackage] + selectPackageTargets + :: TargetSelector + -> [AvailableTarget k] + -> Either (TargetProblem ()) [k] + selectPackageTargets _ ts = + Right $ + mapMaybe + ( \t -> case availableTargetStatus t of + TargetBuildable k _ + | availableTargetLocalToProject t -> + Just k + _ -> Nothing + ) + ts + + matchingPackages + :: ElaboratedInstallPlan + -> [Either InstalledPackageInfo ElaboratedConfiguredPackage] matchingPackages = - fmap (foldPlanPackage Left Right) - . InstallPlan.toList + fmap (foldPlanPackage Left Right) + . InstallPlan.toList diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/setup-external.out b/cabal-testsuite/PackageTests/Backpack/Includes2/setup-external.out index f6661de655c..299d6a831b3 100644 --- a/cabal-testsuite/PackageTests/Backpack/Includes2/setup-external.out +++ b/cabal-testsuite/PackageTests/Backpack/Includes2/setup-external.out @@ -1,132 +1,99 @@ # Setup configure Configuring mylib-0.1.0.0... # Setup build -Preprocessing library for mylib-0.1.0.0.. +Preprocessing library for mylib-0.1.0.0... Building library instantiated with Database = -for mylib-0.1.0.0.. +for mylib-0.1.0.0... # Setup haddock -Preprocessing library for mylib-0.1.0.0.. +Preprocessing library for mylib-0.1.0.0... Running Haddock on library instantiated with Database = -<<<<<<< HEAD -for mylib-0.1.0.0.. -Documentation created: ../setup-external.dist/work/mylib/dist/doc/html/mylib/index.html -======= for mylib-0.1.0.0... Documentation created: ../setup-external.dist/work/mylib/dist/doc/html/mylib/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) # Setup copy Installing library in # Setup register Registering library instantiated with Database = -for mylib-0.1.0.0.. +for mylib-0.1.0.0... # Setup configure Configuring mysql-0.1.0.0... # Setup build -Preprocessing library for mysql-0.1.0.0.. -Building library for mysql-0.1.0.0.. +Preprocessing library for mysql-0.1.0.0... +Building library for mysql-0.1.0.0... # Setup haddock -<<<<<<< HEAD -Preprocessing library for mysql-0.1.0.0.. -Running Haddock on library for mysql-0.1.0.0.. -Documentation created: ../setup-external.dist/work/mysql/dist/doc/html/mysql/index.html -======= Preprocessing library for mysql-0.1.0.0... Running Haddock on library for mysql-0.1.0.0... Documentation created: ../setup-external.dist/work/mysql/dist/doc/html/mysql/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) # Setup copy Installing library in # Setup register -Registering library for mysql-0.1.0.0.. +Registering library for mysql-0.1.0.0... # Setup configure Configuring postgresql-0.1.0.0... # Setup build -Preprocessing library for postgresql-0.1.0.0.. -Building library for postgresql-0.1.0.0.. +Preprocessing library for postgresql-0.1.0.0... +Building library for postgresql-0.1.0.0... # Setup haddock -<<<<<<< HEAD -Preprocessing library for postgresql-0.1.0.0.. -Running Haddock on library for postgresql-0.1.0.0.. -Documentation created: ../setup-external.dist/work/postgresql/dist/doc/html/postgresql/index.html -======= Preprocessing library for postgresql-0.1.0.0... Running Haddock on library for postgresql-0.1.0.0... Documentation created: ../setup-external.dist/work/postgresql/dist/doc/html/postgresql/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) # Setup copy Installing library in # Setup register -Registering library for postgresql-0.1.0.0.. +Registering library for postgresql-0.1.0.0... # Setup configure Configuring mylib-0.1.0.0... # Setup build -Preprocessing library for mylib-0.1.0.0.. +Preprocessing library for mylib-0.1.0.0... Building library instantiated with Database = mysql-0.1.0.0:Database.MySQL -for mylib-0.1.0.0.. +for mylib-0.1.0.0... # Setup haddock -Preprocessing library for mylib-0.1.0.0.. +Preprocessing library for mylib-0.1.0.0... Running Haddock on library instantiated with Database = mysql-0.1.0.0:Database.MySQL -<<<<<<< HEAD -for mylib-0.1.0.0.. -Documentation created: ../setup-external.dist/work/mylib/dist/doc/html/mylib/index.html -======= for mylib-0.1.0.0... Documentation created: ../setup-external.dist/work/mylib/dist/doc/html/mylib/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) # Setup copy Installing library in # Setup register Registering library instantiated with Database = mysql-0.1.0.0:Database.MySQL -for mylib-0.1.0.0.. +for mylib-0.1.0.0... # Setup configure Configuring mylib-0.1.0.0... # Setup build -Preprocessing library for mylib-0.1.0.0.. +Preprocessing library for mylib-0.1.0.0... Building library instantiated with Database = postgresql-0.1.0.0:Database.PostgreSQL -for mylib-0.1.0.0.. +for mylib-0.1.0.0... # Setup haddock -Preprocessing library for mylib-0.1.0.0.. +Preprocessing library for mylib-0.1.0.0... Running Haddock on library instantiated with Database = postgresql-0.1.0.0:Database.PostgreSQL -<<<<<<< HEAD -for mylib-0.1.0.0.. -Documentation created: ../setup-external.dist/work/mylib/dist/doc/html/mylib/index.html -======= for mylib-0.1.0.0... Documentation created: ../setup-external.dist/work/mylib/dist/doc/html/mylib/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) # Setup copy Installing library in # Setup register Registering library instantiated with Database = postgresql-0.1.0.0:Database.PostgreSQL -for mylib-0.1.0.0.. +for mylib-0.1.0.0... # Setup configure Configuring src-0.1.0.0... # Setup build -Preprocessing library for src-0.1.0.0.. -Building library for src-0.1.0.0.. +Preprocessing library for src-0.1.0.0... +Building library for src-0.1.0.0... # Setup haddock -<<<<<<< HEAD -Preprocessing library for src-0.1.0.0.. -Running Haddock on library for src-0.1.0.0.. -Documentation created: ../setup-external.dist/work/src/dist/doc/html/src/index.html -======= Preprocessing library for src-0.1.0.0... Running Haddock on library for src-0.1.0.0... Documentation created: ../setup-external.dist/work/src/dist/doc/html/src/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) # Setup copy Installing library in # Setup register -Registering library for src-0.1.0.0.. +Registering library for src-0.1.0.0... # Setup configure Configuring exe-0.1.0.0... # Setup build -Preprocessing executable 'exe' for exe-0.1.0.0.. -Building executable 'exe' for exe-0.1.0.0.. +Preprocessing executable 'exe' for exe-0.1.0.0... +Building executable 'exe' for exe-0.1.0.0... # Setup haddock Warning: No documentation was generated as this package does not contain a library. Perhaps you want to use the --executables, --tests, --benchmarks or --foreign-libraries flags. # Setup copy diff --git a/cabal-testsuite/PackageTests/Backpack/Includes2/setup-per-component.out b/cabal-testsuite/PackageTests/Backpack/Includes2/setup-per-component.out index 390b8a55240..33ac75b0a99 100644 --- a/cabal-testsuite/PackageTests/Backpack/Includes2/setup-per-component.out +++ b/cabal-testsuite/PackageTests/Backpack/Includes2/setup-per-component.out @@ -1,140 +1,107 @@ # Setup configure -Configuring library 'mylib' for Includes2-0.1.0.0.. +Configuring library 'mylib' for Includes2-0.1.0.0... # Setup build -Preprocessing library 'mylib' for Includes2-0.1.0.0.. +Preprocessing library 'mylib' for Includes2-0.1.0.0... Building library 'mylib' instantiated with Database = -for Includes2-0.1.0.0.. +for Includes2-0.1.0.0... # Setup haddock -Preprocessing library 'mylib' for Includes2-0.1.0.0.. +Preprocessing library 'mylib' for Includes2-0.1.0.0... Running Haddock on library 'mylib' instantiated with Database = -<<<<<<< HEAD -for Includes2-0.1.0.0.. -Documentation created: setup-per-component.dist/work/dist/doc/html/Includes2/index.html -======= for Includes2-0.1.0.0... Documentation created: setup-per-component.dist/work/dist/doc/html/Includes2/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) # Setup copy Installing internal library mylib in # Setup register Registering library 'mylib' instantiated with Database = -for Includes2-0.1.0.0.. +for Includes2-0.1.0.0... # Setup configure -Configuring library 'mysql' for Includes2-0.1.0.0.. +Configuring library 'mysql' for Includes2-0.1.0.0... # Setup build -Preprocessing library 'mysql' for Includes2-0.1.0.0.. -Building library 'mysql' for Includes2-0.1.0.0.. +Preprocessing library 'mysql' for Includes2-0.1.0.0... +Building library 'mysql' for Includes2-0.1.0.0... # Setup haddock -<<<<<<< HEAD -Preprocessing library 'mysql' for Includes2-0.1.0.0.. -Running Haddock on library 'mysql' for Includes2-0.1.0.0.. -Documentation created: setup-per-component.dist/work/dist/doc/html/Includes2/index.html -======= Preprocessing library 'mysql' for Includes2-0.1.0.0... Running Haddock on library 'mysql' for Includes2-0.1.0.0... Documentation created: setup-per-component.dist/work/dist/doc/html/Includes2/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) # Setup copy Installing internal library mysql in # Setup register -Registering library 'mysql' for Includes2-0.1.0.0.. +Registering library 'mysql' for Includes2-0.1.0.0... # Setup configure -Configuring library 'postgresql' for Includes2-0.1.0.0.. +Configuring library 'postgresql' for Includes2-0.1.0.0... # Setup build -Preprocessing library 'postgresql' for Includes2-0.1.0.0.. -Building library 'postgresql' for Includes2-0.1.0.0.. +Preprocessing library 'postgresql' for Includes2-0.1.0.0... +Building library 'postgresql' for Includes2-0.1.0.0... # Setup haddock -<<<<<<< HEAD -Preprocessing library 'postgresql' for Includes2-0.1.0.0.. -Running Haddock on library 'postgresql' for Includes2-0.1.0.0.. -Documentation created: setup-per-component.dist/work/dist/doc/html/Includes2/index.html -======= Preprocessing library 'postgresql' for Includes2-0.1.0.0... Running Haddock on library 'postgresql' for Includes2-0.1.0.0... Documentation created: setup-per-component.dist/work/dist/doc/html/Includes2/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) # Setup copy Installing internal library postgresql in # Setup register -Registering library 'postgresql' for Includes2-0.1.0.0.. +Registering library 'postgresql' for Includes2-0.1.0.0... # Setup configure Configuring library 'mylib' instantiated with Database = mysql-0.1.0.0:Database.MySQL -for Includes2-0.1.0.0.. +for Includes2-0.1.0.0... # Setup build -Preprocessing library 'mylib' for Includes2-0.1.0.0.. +Preprocessing library 'mylib' for Includes2-0.1.0.0... Building library 'mylib' instantiated with Database = mysql-0.1.0.0:Database.MySQL -for Includes2-0.1.0.0.. +for Includes2-0.1.0.0... # Setup haddock -Preprocessing library 'mylib' for Includes2-0.1.0.0.. +Preprocessing library 'mylib' for Includes2-0.1.0.0... Running Haddock on library 'mylib' instantiated with Database = mysql-0.1.0.0:Database.MySQL -<<<<<<< HEAD -for Includes2-0.1.0.0.. -Documentation created: setup-per-component.dist/work/dist/doc/html/Includes2/index.html -======= for Includes2-0.1.0.0... Documentation created: setup-per-component.dist/work/dist/doc/html/Includes2/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) # Setup copy Installing internal library mylib in # Setup register Registering library 'mylib' instantiated with Database = mysql-0.1.0.0:Database.MySQL -for Includes2-0.1.0.0.. +for Includes2-0.1.0.0... # Setup configure Configuring library 'mylib' instantiated with Database = postgresql-0.1.0.0:Database.PostgreSQL -for Includes2-0.1.0.0.. +for Includes2-0.1.0.0... # Setup build -Preprocessing library 'mylib' for Includes2-0.1.0.0.. +Preprocessing library 'mylib' for Includes2-0.1.0.0... Building library 'mylib' instantiated with Database = postgresql-0.1.0.0:Database.PostgreSQL -for Includes2-0.1.0.0.. +for Includes2-0.1.0.0... # Setup haddock -Preprocessing library 'mylib' for Includes2-0.1.0.0.. +Preprocessing library 'mylib' for Includes2-0.1.0.0... Running Haddock on library 'mylib' instantiated with Database = postgresql-0.1.0.0:Database.PostgreSQL -<<<<<<< HEAD -for Includes2-0.1.0.0.. -Documentation created: setup-per-component.dist/work/dist/doc/html/Includes2/index.html -======= for Includes2-0.1.0.0... Documentation created: setup-per-component.dist/work/dist/doc/html/Includes2/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) # Setup copy Installing internal library mylib in # Setup register Registering library 'mylib' instantiated with Database = postgresql-0.1.0.0:Database.PostgreSQL -for Includes2-0.1.0.0.. +for Includes2-0.1.0.0... # Setup configure -Configuring library for Includes2-0.1.0.0.. +Configuring library for Includes2-0.1.0.0... # Setup build -Preprocessing library for Includes2-0.1.0.0.. -Building library for Includes2-0.1.0.0.. +Preprocessing library for Includes2-0.1.0.0... +Building library for Includes2-0.1.0.0... # Setup haddock -<<<<<<< HEAD -Preprocessing library for Includes2-0.1.0.0.. -Running Haddock on library for Includes2-0.1.0.0.. -Documentation created: setup-per-component.dist/work/dist/doc/html/Includes2/index.html -======= Preprocessing library for Includes2-0.1.0.0... Running Haddock on library for Includes2-0.1.0.0... Documentation created: setup-per-component.dist/work/dist/doc/html/Includes2/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) # Setup copy Installing library in # Setup register -Registering library for Includes2-0.1.0.0.. +Registering library for Includes2-0.1.0.0... # Setup configure -Configuring executable 'exe' for Includes2-0.1.0.0.. +Configuring executable 'exe' for Includes2-0.1.0.0... # Setup build -Preprocessing executable 'exe' for Includes2-0.1.0.0.. -Building executable 'exe' for Includes2-0.1.0.0.. +Preprocessing executable 'exe' for Includes2-0.1.0.0... +Building executable 'exe' for Includes2-0.1.0.0... # Setup haddock -Preprocessing executable 'exe' for Includes2-0.1.0.0.. +Preprocessing executable 'exe' for Includes2-0.1.0.0... # Setup copy Installing executable exe in Warning: The directory /setup-per-component.dist/usr/bin is not in the system search path. diff --git a/cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-explicit.out b/cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-explicit.out index e7f43f30270..b27b2d8eb1a 100644 --- a/cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-explicit.out +++ b/cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-explicit.out @@ -1,42 +1,32 @@ # Setup configure -Configuring library for sigs-0.1.0.0.. +Configuring library for sigs-0.1.0.0... # Setup build -Preprocessing library for sigs-0.1.0.0.. +Preprocessing library for sigs-0.1.0.0... Building library instantiated with Data.Map = -for sigs-0.1.0.0.. +for sigs-0.1.0.0... # Setup haddock -Preprocessing library for sigs-0.1.0.0.. +Preprocessing library for sigs-0.1.0.0... Running Haddock on library instantiated with Data.Map = -<<<<<<< HEAD -for sigs-0.1.0.0.. -Documentation created: ../../setup-external-explicit.dist/work/repo/sigs-0.1.0.0/dist/doc/html/sigs/index.html -======= for sigs-0.1.0.0... Documentation created: ../../setup-external-explicit.dist/work/repo/sigs-0.1.0.0/dist/doc/html/sigs/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) # Setup copy Installing library in # Setup register Registering library instantiated with Data.Map = -for sigs-0.1.0.0.. +for sigs-0.1.0.0... # Setup configure -Configuring library for indef-0.1.0.0.. +Configuring library for indef-0.1.0.0... # Setup build -Preprocessing library for indef-0.1.0.0.. +Preprocessing library for indef-0.1.0.0... Building library instantiated with Data.Map = -for indef-0.1.0.0.. +for indef-0.1.0.0... # Setup haddock -Preprocessing library for indef-0.1.0.0.. +Preprocessing library for indef-0.1.0.0... Running Haddock on library instantiated with Data.Map = -<<<<<<< HEAD -for indef-0.1.0.0.. -Documentation created: ../../setup-external-explicit.dist/work/repo/indef-0.1.0.0/dist/doc/html/indef/index.html -======= for indef-0.1.0.0... Documentation created: ../../setup-external-explicit.dist/work/repo/indef-0.1.0.0/dist/doc/html/indef/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) # Setup copy Installing library in # Setup register Registering library instantiated with Data.Map = -for indef-0.1.0.0.. +for indef-0.1.0.0... diff --git a/cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-ok.cabal.out b/cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-ok.cabal.out index 02adbf8da20..b27b2d8eb1a 100644 --- a/cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-ok.cabal.out +++ b/cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-ok.cabal.out @@ -1,98 +1,32 @@ # Setup configure -Configuring sigs-0.1.0.0... +Configuring library for sigs-0.1.0.0... # Setup build -Preprocessing library for sigs-0.1.0.0.. +Preprocessing library for sigs-0.1.0.0... Building library instantiated with Data.Map = -for sigs-0.1.0.0.. +for sigs-0.1.0.0... # Setup haddock -Preprocessing library for sigs-0.1.0.0.. +Preprocessing library for sigs-0.1.0.0... Running Haddock on library instantiated with Data.Map = -<<<<<<< HEAD -for sigs-0.1.0.0.. -Documentation created: ../../setup-external-ok.cabal.dist/work/repo/sigs-0.1.0.0/dist/doc/html/sigs/index.html -======= for sigs-0.1.0.0... -Documentation created: ../../setup-external-ok.cabal.dist/work/repo/sigs-0.1.0.0/dist/doc/html/sigs/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) +Documentation created: ../../setup-external-explicit.dist/work/repo/sigs-0.1.0.0/dist/doc/html/sigs/ # Setup copy Installing library in # Setup register Registering library instantiated with Data.Map = -for sigs-0.1.0.0.. +for sigs-0.1.0.0... # Setup configure -Configuring indef-0.1.0.0... +Configuring library for indef-0.1.0.0... # Setup build -Preprocessing library for indef-0.1.0.0.. +Preprocessing library for indef-0.1.0.0... Building library instantiated with Data.Map = -for indef-0.1.0.0.. +for indef-0.1.0.0... # Setup haddock -Preprocessing library for indef-0.1.0.0.. +Preprocessing library for indef-0.1.0.0... Running Haddock on library instantiated with Data.Map = -<<<<<<< HEAD -for indef-0.1.0.0.. -Documentation created: ../../setup-external-ok.cabal.dist/work/repo/indef-0.1.0.0/dist/doc/html/indef/index.html -======= for indef-0.1.0.0... -Documentation created: ../../setup-external-ok.cabal.dist/work/repo/indef-0.1.0.0/dist/doc/html/indef/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) +Documentation created: ../../setup-external-explicit.dist/work/repo/indef-0.1.0.0/dist/doc/html/indef/ # Setup copy Installing library in # Setup register Registering library instantiated with Data.Map = -for indef-0.1.0.0.. -# Setup configure -Configuring sigs-0.1.0.0... -# Setup build -Preprocessing library for sigs-0.1.0.0.. -Building library instantiated with Data.Map = containers-:Data.Map -for sigs-0.1.0.0.. -# Setup haddock -Preprocessing library for sigs-0.1.0.0.. -Running Haddock on library instantiated with - Data.Map = containers-:Data.Map -<<<<<<< HEAD -for sigs-0.1.0.0.. -Documentation created: ../../setup-external-ok.cabal.dist/work/repo/sigs-0.1.0.0/dist/doc/html/sigs/index.html -======= -for sigs-0.1.0.0... -Documentation created: ../../setup-external-ok.cabal.dist/work/repo/sigs-0.1.0.0/dist/doc/html/sigs/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) -# Setup copy -Installing library in -# Setup register -Registering library instantiated with Data.Map = containers-:Data.Map -for sigs-0.1.0.0.. -# Setup configure -Configuring indef-0.1.0.0... -# Setup build -Preprocessing library for indef-0.1.0.0.. -Building library instantiated with Data.Map = containers-:Data.Map -for indef-0.1.0.0.. -# Setup haddock -Preprocessing library for indef-0.1.0.0.. -Running Haddock on library instantiated with - Data.Map = containers-:Data.Map -<<<<<<< HEAD -for indef-0.1.0.0.. -Documentation created: ../../setup-external-ok.cabal.dist/work/repo/indef-0.1.0.0/dist/doc/html/indef/index.html -======= for indef-0.1.0.0... -Documentation created: ../../setup-external-ok.cabal.dist/work/repo/indef-0.1.0.0/dist/doc/html/indef/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) -# Setup copy -Installing library in -# Setup register -Registering library instantiated with Data.Map = containers-:Data.Map -for indef-0.1.0.0.. -# Setup configure -Configuring exe-0.1.0.0... -# Setup build -Preprocessing executable 'exe' for exe-0.1.0.0.. -Building executable 'exe' for exe-0.1.0.0.. -# Setup copy -Installing executable exe in -Warning: The directory /setup-external-ok.cabal.dist/usr/bin is not in the system search path. -# Setup register -Package contains no library to register: exe-0.1.0.0... -# exe -fromList [(0,2),(2,4)] diff --git a/cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-ok.out b/cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-ok.out index 473e09b2011..b27b2d8eb1a 100644 --- a/cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-ok.out +++ b/cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-ok.out @@ -1,98 +1,32 @@ # Setup configure -Configuring sigs-0.1.0.0... +Configuring library for sigs-0.1.0.0... # Setup build -Preprocessing library for sigs-0.1.0.0.. +Preprocessing library for sigs-0.1.0.0... Building library instantiated with Data.Map = -for sigs-0.1.0.0.. +for sigs-0.1.0.0... # Setup haddock -Preprocessing library for sigs-0.1.0.0.. +Preprocessing library for sigs-0.1.0.0... Running Haddock on library instantiated with Data.Map = -<<<<<<< HEAD -for sigs-0.1.0.0.. -Documentation created: ../../setup-external-ok.dist/work/repo/sigs-0.1.0.0/dist/doc/html/sigs/index.html -======= for sigs-0.1.0.0... -Documentation created: ../../setup-external-ok.dist/work/repo/sigs-0.1.0.0/dist/doc/html/sigs/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) +Documentation created: ../../setup-external-explicit.dist/work/repo/sigs-0.1.0.0/dist/doc/html/sigs/ # Setup copy Installing library in # Setup register Registering library instantiated with Data.Map = -for sigs-0.1.0.0.. +for sigs-0.1.0.0... # Setup configure -Configuring indef-0.1.0.0... +Configuring library for indef-0.1.0.0... # Setup build -Preprocessing library for indef-0.1.0.0.. +Preprocessing library for indef-0.1.0.0... Building library instantiated with Data.Map = -for indef-0.1.0.0.. +for indef-0.1.0.0... # Setup haddock -Preprocessing library for indef-0.1.0.0.. +Preprocessing library for indef-0.1.0.0... Running Haddock on library instantiated with Data.Map = -<<<<<<< HEAD -for indef-0.1.0.0.. -Documentation created: ../../setup-external-ok.dist/work/repo/indef-0.1.0.0/dist/doc/html/indef/index.html -======= for indef-0.1.0.0... -Documentation created: ../../setup-external-ok.dist/work/repo/indef-0.1.0.0/dist/doc/html/indef/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) +Documentation created: ../../setup-external-explicit.dist/work/repo/indef-0.1.0.0/dist/doc/html/indef/ # Setup copy Installing library in # Setup register Registering library instantiated with Data.Map = -for indef-0.1.0.0.. -# Setup configure -Configuring sigs-0.1.0.0... -# Setup build -Preprocessing library for sigs-0.1.0.0.. -Building library instantiated with Data.Map = containers-:Data.Map -for sigs-0.1.0.0.. -# Setup haddock -Preprocessing library for sigs-0.1.0.0.. -Running Haddock on library instantiated with - Data.Map = containers-:Data.Map -<<<<<<< HEAD -for sigs-0.1.0.0.. -Documentation created: ../../setup-external-ok.dist/work/repo/sigs-0.1.0.0/dist/doc/html/sigs/index.html -======= -for sigs-0.1.0.0... -Documentation created: ../../setup-external-ok.dist/work/repo/sigs-0.1.0.0/dist/doc/html/sigs/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) -# Setup copy -Installing library in -# Setup register -Registering library instantiated with Data.Map = containers-:Data.Map -for sigs-0.1.0.0.. -# Setup configure -Configuring indef-0.1.0.0... -# Setup build -Preprocessing library for indef-0.1.0.0.. -Building library instantiated with Data.Map = containers-:Data.Map -for indef-0.1.0.0.. -# Setup haddock -Preprocessing library for indef-0.1.0.0.. -Running Haddock on library instantiated with - Data.Map = containers-:Data.Map -<<<<<<< HEAD -for indef-0.1.0.0.. -Documentation created: ../../setup-external-ok.dist/work/repo/indef-0.1.0.0/dist/doc/html/indef/index.html -======= for indef-0.1.0.0... -Documentation created: ../../setup-external-ok.dist/work/repo/indef-0.1.0.0/dist/doc/html/indef/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) -# Setup copy -Installing library in -# Setup register -Registering library instantiated with Data.Map = containers-:Data.Map -for indef-0.1.0.0.. -# Setup configure -Configuring exe-0.1.0.0... -# Setup build -Preprocessing executable 'exe' for exe-0.1.0.0.. -Building executable 'exe' for exe-0.1.0.0.. -# Setup copy -Installing executable exe in -Warning: The directory /setup-external-ok.dist/usr/bin is not in the system search path. -# Setup register -Package contains no library to register: exe-0.1.0.0... -# exe -fromList [(0,2),(2,4)] diff --git a/cabal-testsuite/PackageTests/Backpack/Reexport1/setup.cabal.out b/cabal-testsuite/PackageTests/Backpack/Reexport1/setup.cabal.out index c6015aede7e..b27b2d8eb1a 100644 --- a/cabal-testsuite/PackageTests/Backpack/Reexport1/setup.cabal.out +++ b/cabal-testsuite/PackageTests/Backpack/Reexport1/setup.cabal.out @@ -1,34 +1,32 @@ # Setup configure -Configuring p-0.1.0.0... +Configuring library for sigs-0.1.0.0... # Setup build -Preprocessing library for p-0.1.0.0.. -Building library for p-0.1.0.0.. +Preprocessing library for sigs-0.1.0.0... +Building library instantiated with Data.Map = +for sigs-0.1.0.0... # Setup haddock -<<<<<<< HEAD -Preprocessing library for p-0.1.0.0.. -Running Haddock on library for p-0.1.0.0.. -Documentation created: ../setup.cabal.dist/work/p/dist/doc/html/p/index.html -======= -Preprocessing library for p-0.1.0.0... -Running Haddock on library for p-0.1.0.0... -Documentation created: ../setup.cabal.dist/work/p/dist/doc/html/p/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) +Preprocessing library for sigs-0.1.0.0... +Running Haddock on library instantiated with Data.Map = +for sigs-0.1.0.0... +Documentation created: ../../setup-external-explicit.dist/work/repo/sigs-0.1.0.0/dist/doc/html/sigs/ # Setup copy Installing library in # Setup register -Registering library for p-0.1.0.0.. +Registering library instantiated with Data.Map = +for sigs-0.1.0.0... # Setup configure -Configuring q-0.1.0.0... +Configuring library for indef-0.1.0.0... # Setup build -Preprocessing library for q-0.1.0.0.. -Building library for q-0.1.0.0.. +Preprocessing library for indef-0.1.0.0... +Building library instantiated with Data.Map = +for indef-0.1.0.0... # Setup haddock -<<<<<<< HEAD -Preprocessing library for q-0.1.0.0.. -Running Haddock on library for q-0.1.0.0.. -Documentation created: ../setup.cabal.dist/work/q/dist/doc/html/q/index.html -======= -Preprocessing library for q-0.1.0.0... -Running Haddock on library for q-0.1.0.0... -Documentation created: ../setup.cabal.dist/work/q/dist/doc/html/q/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) +Preprocessing library for indef-0.1.0.0... +Running Haddock on library instantiated with Data.Map = +for indef-0.1.0.0... +Documentation created: ../../setup-external-explicit.dist/work/repo/indef-0.1.0.0/dist/doc/html/indef/ +# Setup copy +Installing library in +# Setup register +Registering library instantiated with Data.Map = +for indef-0.1.0.0... diff --git a/cabal-testsuite/PackageTests/Backpack/Reexport1/setup.out b/cabal-testsuite/PackageTests/Backpack/Reexport1/setup.out index 332a3d84f69..ee41d01148b 100644 --- a/cabal-testsuite/PackageTests/Backpack/Reexport1/setup.out +++ b/cabal-testsuite/PackageTests/Backpack/Reexport1/setup.out @@ -1,34 +1,22 @@ # Setup configure Configuring p-0.1.0.0... # Setup build -Preprocessing library for p-0.1.0.0.. -Building library for p-0.1.0.0.. +Preprocessing library for p-0.1.0.0... +Building library for p-0.1.0.0... # Setup haddock -<<<<<<< HEAD -Preprocessing library for p-0.1.0.0.. -Running Haddock on library for p-0.1.0.0.. -Documentation created: ../setup.dist/work/p/dist/doc/html/p/index.html -======= Preprocessing library for p-0.1.0.0... Running Haddock on library for p-0.1.0.0... Documentation created: ../setup.dist/work/p/dist/doc/html/p/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) # Setup copy Installing library in # Setup register -Registering library for p-0.1.0.0.. +Registering library for p-0.1.0.0... # Setup configure Configuring q-0.1.0.0... # Setup build -Preprocessing library for q-0.1.0.0.. -Building library for q-0.1.0.0.. +Preprocessing library for q-0.1.0.0... +Building library for q-0.1.0.0... # Setup haddock -<<<<<<< HEAD -Preprocessing library for q-0.1.0.0.. -Running Haddock on library for q-0.1.0.0.. -Documentation created: ../setup.dist/work/q/dist/doc/html/q/index.html -======= Preprocessing library for q-0.1.0.0... Running Haddock on library for q-0.1.0.0... Documentation created: ../setup.dist/work/q/dist/doc/html/q/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) diff --git a/cabal-testsuite/PackageTests/Haddock/setup.cabal.out b/cabal-testsuite/PackageTests/Haddock/setup.cabal.out index 6bc1d6fe052..a13ae638ac4 100644 --- a/cabal-testsuite/PackageTests/Haddock/setup.cabal.out +++ b/cabal-testsuite/PackageTests/Haddock/setup.cabal.out @@ -1,12 +1,6 @@ # Setup configure Configuring Haddock-0.1... # Setup haddock -<<<<<<< HEAD -Preprocessing library for Haddock-0.1.. -Running Haddock on library for Haddock-0.1.. -Documentation created: setup.cabal.dist/work/dist/doc/html/Haddock/index.html -======= Preprocessing library for Haddock-0.1... Running Haddock on library for Haddock-0.1... Documentation created: setup.cabal.dist/work/dist/doc/html/Haddock/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) diff --git a/cabal-testsuite/PackageTests/Haddock/setup.out b/cabal-testsuite/PackageTests/Haddock/setup.out index dc8f2b8dcbc..a16722bc65c 100644 --- a/cabal-testsuite/PackageTests/Haddock/setup.out +++ b/cabal-testsuite/PackageTests/Haddock/setup.out @@ -1,12 +1,6 @@ # Setup configure Configuring Haddock-0.1... # Setup haddock -<<<<<<< HEAD -Preprocessing library for Haddock-0.1.. -Running Haddock on library for Haddock-0.1.. -Documentation created: setup.dist/work/dist/doc/html/Haddock/index.html -======= Preprocessing library for Haddock-0.1... Running Haddock on library for Haddock-0.1... Documentation created: setup.dist/work/dist/doc/html/Haddock/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) diff --git a/cabal-testsuite/PackageTests/HaddockArgs/quickjump.out b/cabal-testsuite/PackageTests/HaddockArgs/quickjump.out index 846b0188cd2..3015dbd34d1 100644 --- a/cabal-testsuite/PackageTests/HaddockArgs/quickjump.out +++ b/cabal-testsuite/PackageTests/HaddockArgs/quickjump.out @@ -13,13 +13,8 @@ Building library instantiated with Data.Map = for sigs-0.1.0.0.. Preprocessing library for sigs-0.1.0.0.. Running Haddock on library instantiated with Data.Map = -<<<<<<< HEAD -for sigs-0.1.0.0.. -Documentation created: dist/doc/html/sigs/index.html -======= for sigs-0.1.0.0... Documentation created: dist/doc/html/sigs/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) Installing library in Configuring library for indef-0.1.0.0.. Preprocessing library for indef-0.1.0.0.. @@ -27,13 +22,8 @@ Building library instantiated with Data.Map = for indef-0.1.0.0.. Preprocessing library for indef-0.1.0.0.. Running Haddock on library instantiated with Data.Map = -<<<<<<< HEAD -for indef-0.1.0.0.. -Documentation created: dist/doc/html/indef/index.html -======= for indef-0.1.0.0... Documentation created: dist/doc/html/indef/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) Installing library in Configuring library for example-1.0.. Preprocessing library for example-1.0.. @@ -41,10 +31,5 @@ Building library instantiated with Data.Map = for example-1.0.. Preprocessing library for example-1.0.. Running Haddock on library instantiated with Data.Map = -<<<<<<< HEAD -for example-1.0.. -Documentation created: /quickjump.dist/work/dist/build//ghc-/example-1.0/doc/html/example/index.html -======= for example-1.0... Documentation created: /quickjump.dist/work/dist/build//ghc-/example-1.0/doc/html/example/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) diff --git a/cabal-testsuite/PackageTests/HaddockNewline/setup.cabal.out b/cabal-testsuite/PackageTests/HaddockNewline/setup.cabal.out index 8f6470f294d..7db9a69eefe 100644 --- a/cabal-testsuite/PackageTests/HaddockNewline/setup.cabal.out +++ b/cabal-testsuite/PackageTests/HaddockNewline/setup.cabal.out @@ -1,12 +1,6 @@ # Setup configure Configuring HaddockNewline-0.1.0.0... # Setup haddock -<<<<<<< HEAD -Preprocessing library for HaddockNewline-0.1.0.0.. -Running Haddock on library for HaddockNewline-0.1.0.0.. -Documentation created: setup.cabal.dist/work/dist/doc/html/HaddockNewline/index.html -======= Preprocessing library for HaddockNewline-0.1.0.0... Running Haddock on library for HaddockNewline-0.1.0.0... Documentation created: setup.cabal.dist/work/dist/doc/html/HaddockNewline/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) diff --git a/cabal-testsuite/PackageTests/HaddockNewline/setup.out b/cabal-testsuite/PackageTests/HaddockNewline/setup.out index 891085be912..57908512556 100644 --- a/cabal-testsuite/PackageTests/HaddockNewline/setup.out +++ b/cabal-testsuite/PackageTests/HaddockNewline/setup.out @@ -1,12 +1,6 @@ # Setup configure Configuring HaddockNewline-0.1.0.0... # Setup haddock -<<<<<<< HEAD -Preprocessing library for HaddockNewline-0.1.0.0.. -Running Haddock on library for HaddockNewline-0.1.0.0.. -Documentation created: setup.dist/work/dist/doc/html/HaddockNewline/index.html -======= Preprocessing library for HaddockNewline-0.1.0.0... Running Haddock on library for HaddockNewline-0.1.0.0... Documentation created: setup.dist/work/dist/doc/html/HaddockNewline/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) diff --git a/cabal-testsuite/PackageTests/InternalLibraries/Haddock/haddock.cabal.out b/cabal-testsuite/PackageTests/InternalLibraries/Haddock/haddock.cabal.out index e2d7e242958..46b899037f3 100644 --- a/cabal-testsuite/PackageTests/InternalLibraries/Haddock/haddock.cabal.out +++ b/cabal-testsuite/PackageTests/InternalLibraries/Haddock/haddock.cabal.out @@ -16,17 +16,6 @@ Registering library 'foo-internal-before' for foo-0.1.0.0.. Registering library for foo-0.1.0.0.. Registering library 'foo-internal-after' for foo-0.1.0.0.. # Setup haddock -<<<<<<< HEAD -Preprocessing library 'foo-internal-before' for foo-0.1.0.0.. -Running Haddock on library 'foo-internal-before' for foo-0.1.0.0.. -Documentation created: haddock.cabal.dist/work/dist/doc/html/foo/index.html -Preprocessing library for foo-0.1.0.0.. -Running Haddock on library for foo-0.1.0.0.. -Documentation created: haddock.cabal.dist/work/dist/doc/html/foo/index.html -Preprocessing library 'foo-internal-after' for foo-0.1.0.0.. -Running Haddock on library 'foo-internal-after' for foo-0.1.0.0.. -Documentation created: haddock.cabal.dist/work/dist/doc/html/foo/index.html -======= Preprocessing library 'foo-internal-before' for foo-0.1.0.0... Running Haddock on library 'foo-internal-before' for foo-0.1.0.0... Documentation created: haddock.cabal.dist/work/dist/doc/html/foo/ @@ -36,4 +25,3 @@ Documentation created: haddock.cabal.dist/work/dist/doc/html/foo/ Preprocessing library 'foo-internal-after' for foo-0.1.0.0... Running Haddock on library 'foo-internal-after' for foo-0.1.0.0... Documentation created: haddock.cabal.dist/work/dist/doc/html/foo/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) diff --git a/cabal-testsuite/PackageTests/InternalLibraries/Haddock/haddock.out b/cabal-testsuite/PackageTests/InternalLibraries/Haddock/haddock.out index 5e44049b665..9e6632daf86 100644 --- a/cabal-testsuite/PackageTests/InternalLibraries/Haddock/haddock.out +++ b/cabal-testsuite/PackageTests/InternalLibraries/Haddock/haddock.out @@ -16,17 +16,6 @@ Registering library 'foo-internal-before' for foo-0.1.0.0.. Registering library for foo-0.1.0.0.. Registering library 'foo-internal-after' for foo-0.1.0.0.. # Setup haddock -<<<<<<< HEAD -Preprocessing library 'foo-internal-before' for foo-0.1.0.0.. -Running Haddock on library 'foo-internal-before' for foo-0.1.0.0.. -Documentation created: haddock.dist/work/dist/doc/html/foo/index.html -Preprocessing library for foo-0.1.0.0.. -Running Haddock on library for foo-0.1.0.0.. -Documentation created: haddock.dist/work/dist/doc/html/foo/index.html -Preprocessing library 'foo-internal-after' for foo-0.1.0.0.. -Running Haddock on library 'foo-internal-after' for foo-0.1.0.0.. -Documentation created: haddock.dist/work/dist/doc/html/foo/index.html -======= Preprocessing library 'foo-internal-before' for foo-0.1.0.0... Running Haddock on library 'foo-internal-before' for foo-0.1.0.0... Documentation created: haddock.dist/work/dist/doc/html/foo/ @@ -36,4 +25,3 @@ Documentation created: haddock.dist/work/dist/doc/html/foo/ Preprocessing library 'foo-internal-after' for foo-0.1.0.0... Running Haddock on library 'foo-internal-after' for foo-0.1.0.0... Documentation created: haddock.dist/work/dist/doc/html/foo/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) diff --git a/cabal-testsuite/PackageTests/NewHaddock/DisableDoc/cabal.out b/cabal-testsuite/PackageTests/NewHaddock/DisableDoc/cabal.out index af2647de6c1..82fe26e1d14 100644 --- a/cabal-testsuite/PackageTests/NewHaddock/DisableDoc/cabal.out +++ b/cabal-testsuite/PackageTests/NewHaddock/DisableDoc/cabal.out @@ -10,14 +10,7 @@ Configuring library for A-0.1.0.0.. Preprocessing library for A-0.1.0.0.. Building library for A-0.1.0.0.. Installing library in -<<<<<<< HEAD -Configuring library for B-0.1.0.0.. -Preprocessing library for B-0.1.0.0.. -Running Haddock on library for B-0.1.0.0.. -Documentation created: /cabal.dist/work/dist/build//ghc-/B-0.1.0.0/doc/html/B/index.html -======= Configuring library for B-0.1.0.0... Preprocessing library for B-0.1.0.0... Running Haddock on library for B-0.1.0.0... Documentation created: /cabal.dist/work/dist/build//ghc-/B-0.1.0.0/doc/html/B/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options) diff --git a/cabal-testsuite/PackageTests/NewHaddock/ImplyDependencies/cabal.out b/cabal-testsuite/PackageTests/NewHaddock/ImplyDependencies/cabal.out index 663a4d2c236..9397fb7d076 100644 --- a/cabal-testsuite/PackageTests/NewHaddock/ImplyDependencies/cabal.out +++ b/cabal-testsuite/PackageTests/NewHaddock/ImplyDependencies/cabal.out @@ -6,19 +6,6 @@ Build profile: -w ghc- -O1 In order, the following will be built: - A-0.1.0.0 (lib) (requires build) - B-0.1.0.0 (lib) (first run) -<<<<<<< HEAD -Configuring library for A-0.1.0.0.. -Preprocessing library for A-0.1.0.0.. -Building library for A-0.1.0.0.. -Preprocessing library for A-0.1.0.0.. -Running Haddock on library for A-0.1.0.0.. -Documentation created: dist/doc/html/A/index.html -Installing library in -Configuring library for B-0.1.0.0.. -Preprocessing library for B-0.1.0.0.. -Running Haddock on library for B-0.1.0.0.. -Documentation created: /cabal.dist/work/dist/build//ghc-/B-0.1.0.0/doc/html/B/index.html -======= Configuring library for A-0.1.0.0... Preprocessing library for A-0.1.0.0... Building library for A-0.1.0.0... @@ -30,4 +17,3 @@ Configuring library for B-0.1.0.0... Preprocessing library for B-0.1.0.0... Running Haddock on library for B-0.1.0.0... Documentation created: /cabal.dist/work/dist/build//ghc-/B-0.1.0.0/doc/html/B/ ->>>>>>> 1b89c1bf5 (Removed some haddock-project options)