Sorry, removing merge commits

haskell · Aug 6, 2016 · 7201de3 · 7201de3
2 parents 1b7fb7e + 3339f08
commit 7201de3
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 0 deletions.
diff --git a/Cabal/Distribution/PackageDescription.hs b/Cabal/Distribution/PackageDescription.hs
@@ -30,6 +30,7 @@ module Distribution.PackageDescription (
 
         -- ** Module names
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         allModuleNames,
         allModuleNamesAutogen,
@@ -41,6 +42,10 @@ module Distribution.PackageDescription (
         allModuleNames,
         allModuleNamesAutogen,
 >>>>>>> Rename function
+=======
+        allModuleNames,
+        allModuleNamesAutogen,
+>>>>>>> 3339f087be58fdcd6d60f5ce738a5ba68f91c4ae
 
         -- ** Libraries
         Library(..),

diff --git a/Cabal/Distribution/PackageDescription/Check.hs b/Cabal/Distribution/PackageDescription/Check.hs
@@ -1142,6 +1142,7 @@ checkCabalVersion pkg =
 
   , check (specVersion pkg >= Version [1,25] []
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
            && elem (autogenModuleName pkg) (allModuleNames pkg)
            && not (elem (autogenModuleName pkg) (allModuleNamesAutogen pkg)) ) $
@@ -1157,6 +1158,10 @@ checkCabalVersion pkg =
            && elem (autogenModuleName pkg) (allModuleNames pkg)
            && not (elem (autogenModuleName pkg) (allModuleNamesAutogen pkg)) ) $
 >>>>>>> Rename function
+=======
+           && elem (autogenModuleName pkg) (allModuleNames pkg)
+           && not (elem (autogenModuleName pkg) (allModuleNamesAutogen pkg)) ) $
+>>>>>>> 3339f087be58fdcd6d60f5ce738a5ba68f91c4ae
       PackageBuildWarning $
            "Packages using 'cabal-version: >= 1.25' and the autogenerated "
         ++ "module Paths_* must include it also on the 'autoge-modules' field "
@@ -1167,6 +1172,7 @@ checkCabalVersion pkg =
 
   , check (specVersion pkg < Version [1,25] []
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
            && elem (autogenModuleName pkg) (allModuleNames pkg)
            && not (elem (autogenModuleName pkg) (allModuleNamesAutogen pkg)) ) $
@@ -1182,6 +1188,10 @@ checkCabalVersion pkg =
            && elem (autogenModuleName pkg) (allModuleNames pkg)
            && not (elem (autogenModuleName pkg) (allModuleNamesAutogen pkg)) ) $
 >>>>>>> Rename function
+=======
+           && elem (autogenModuleName pkg) (allModuleNames pkg)
+           && not (elem (autogenModuleName pkg) (allModuleNamesAutogen pkg)) ) $
+>>>>>>> 3339f087be58fdcd6d60f5ce738a5ba68f91c4ae
       PackageDistSuspiciousWarn $
            "From version 1.25 autogenerated modules are included on the "
         ++ "'autoge-modules' field besides 'exposed-modules' and "

diff --git a/Cabal/Distribution/Simple/SrcDist.hs b/Cabal/Distribution/Simple/SrcDist.hs
@@ -316,6 +316,9 @@ filterAutogenModules pkg_descr0 = mapLib filterAutogenModuleLib $
     filterAutogenModuleLib lib = lib {
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 3339f087be58fdcd6d60f5ce738a5ba68f91c4ae
       exposedModules = filter (filterFunction (libBuildInfo lib)) (exposedModules lib)
     }
     filterAutogenModuleBI bi = bi {
@@ -325,6 +328,7 @@ filterAutogenModules pkg_descr0 = mapLib filterAutogenModuleLib $
     filterFunction bi = \mn ->
                                    mn /= pathsModule
                                 && not (elem mn (autogenModules bi))
+<<<<<<< HEAD
 =======
       exposedModules = filter (/=pathsModule) (exposedModules lib)
 =======
@@ -342,6 +346,8 @@ filterAutogenModules pkg_descr0 = mapLib filterAutogenModuleLib $
                                    mn /= pathsModule
                                 && not (elem mn (autogenModules bi))
 >>>>>>> Filter autogen modules from sdist
+=======
+>>>>>>> 3339f087be58fdcd6d60f5ce738a5ba68f91c4ae
 
 -- | Prepare a directory tree of source files for a snapshot version.
 -- It is expected that the appropriate snapshot version has already been set

diff --git a/Cabal/Distribution/Types/PackageDescription.hs b/Cabal/Distribution/Types/PackageDescription.hs
@@ -41,6 +41,7 @@ module Distribution.Types.PackageDescription (
     withBenchmark,
     allBuildInfo,
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     allModuleNames,
     allModuleNamesAutogen,
@@ -52,6 +53,10 @@ module Distribution.Types.PackageDescription (
     allModuleNames,
     allModuleNamesAutogen,
 >>>>>>> Rename function
+=======
+    allModuleNames,
+    allModuleNamesAutogen,
+>>>>>>> 3339f087be58fdcd6d60f5ce738a5ba68f91c4ae
     updatePackageDescription,
     pkgComponents,
     pkgBuildableComponents,
@@ -313,6 +318,7 @@ allBuildInfo pkg_descr = [ bi | lib <- allLibraries pkg_descr
 -- It is not exluded if it already appears here.
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 allModuleNames :: PackageDescription -> [ModuleName]
 allModuleNames pkg_descr = (case library pkg_descr of
 =======
@@ -323,6 +329,10 @@ allNonAutogenModuleNames pkg_descr = (case library pkg_descr of
 allModuleNames :: PackageDescription -> [ModuleName]
 allModuleNames pkg_descr = (case library pkg_descr of
 >>>>>>> Rename function
+=======
+allModuleNames :: PackageDescription -> [ModuleName]
+allModuleNames pkg_descr = (case library pkg_descr of
+>>>>>>> 3339f087be58fdcd6d60f5ce738a5ba68f91c4ae
                                    Nothing -> []
                                    (Just lib) -> libModules lib)
                                  ++ concatMap otherModules (allBuildInfo pkg_descr)
@@ -331,6 +341,7 @@ allModuleNames pkg_descr = (case library pkg_descr of
 -- It is not added if it doesn't already appears here.
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 allModuleNamesAutogen  :: PackageDescription -> [ModuleName]
 allModuleNamesAutogen pkg_descr = concatMap autogenModules (allBuildInfo pkg_descr)
 =======
@@ -341,6 +352,10 @@ allAutogenModuleNames pkg_descr = concatMap autogenModules (allBuildInfo pkg_des
 allModuleNamesAutogen  :: PackageDescription -> [ModuleName]
 allModuleNamesAutogen pkg_descr = concatMap autogenModules (allBuildInfo pkg_descr)
 >>>>>>> Rename function
+=======
+allModuleNamesAutogen  :: PackageDescription -> [ModuleName]
+allModuleNamesAutogen pkg_descr = concatMap autogenModules (allBuildInfo pkg_descr)
+>>>>>>> 3339f087be58fdcd6d60f5ce738a5ba68f91c4ae
 
 -- ------------------------------------------------------------
 -- * Utils