Ticket #592: cabal-test-bench-auto-build.dpatch

2 patches for repository /home/ttuegel/repos/cabal-head:

Sat Apr 21 13:53:09 CDT 2012  Thomas Tuegel <ttuegel@gmail.com>
  * Run 'cabal build' automatically whenever 'cabal test' is run.

Sat Apr 21 13:57:19 CDT 2012  Thomas Tuegel <ttuegel@gmail.com>
  * Automatically run 'cabal build' when 'cabal bench' is run.


New patches:

[Run 'cabal build' automatically whenever 'cabal test' is run.
Thomas Tuegel <ttuegel@gmail.com>**20120421185309
 Ignore-this: d45b6086eeb2e5757bc1a1088b6bff18
] {
hunk ./cabal-install/Distribution/Client/Setup.hs 30
     , unpackCommand, UnpackFlags(..)
     , initCommand, IT.InitFlags(..)
     , sdistCommand, SDistFlags(..), SDistExFlags(..), ArchiveFormat(..)
+    , testCommand
 
     , parsePackageArgs
     --TODO: stop exporting these:
hunk ./cabal-install/Distribution/Client/Setup.hs 53
          ( defaultProgramConfiguration )
 import Distribution.Simple.Command hiding (boolOpt)
 import qualified Distribution.Simple.Setup as Cabal
-         ( configureCommand, sdistCommand, haddockCommand )
+         ( buildCommand, configureCommand, sdistCommand, haddockCommand
+         , testCommand )
 import Distribution.Simple.Setup
hunk ./cabal-install/Distribution/Client/Setup.hs 56
-         ( ConfigFlags(..), SDistFlags(..), HaddockFlags(..) )
+         ( BuildFlags(..), ConfigFlags(..), SDistFlags(..), HaddockFlags(..)
+         , TestFlags(..) )
 import Distribution.Simple.Setup
          ( Flag(..), toFlag, fromFlag, flagToMaybe, flagToList
          , optionVerbosity, boolOpt, trueArg, falseArg )
hunk ./cabal-install/Distribution/Client/Setup.hs 1113
     where
       combine field = field a `mappend` field b
 
+-- ------------------------------------------------------------
+-- * Test Flags
+-- ------------------------------------------------------------
+
+testCommand :: CommandUI (BuildFlags, TestFlags)
+testCommand = Cabal.testCommand {
+  commandDefaultFlags = (mempty, mempty),
+  commandOptions      = \showOrParseArgs ->
+       liftOptions get1 set1 (commandOptions buildCommand showOrParseArgs)
+    ++ liftOptions get2 set2 (commandOptions Cabal.testCommand showOrParseArgs)
+  }
+  where
+    get1 (a,_) = a; set1 a (_,b) = (a,b)
+    get2 (_,b) = b; set2 b (a,_) = (a,b)
+    buildCommand = Cabal.buildCommand defaultProgramConfiguration
+
 -- ------------------------------------------------------------
 -- * GetOpt Utils
 -- ------------------------------------------------------------
hunk ./cabal-install/Main.hs 31
          , ReportFlags(..), reportCommand
          , InitFlags(initVerbosity), initCommand
          , SDistFlags(..), SDistExFlags(..), sdistCommand
+         , testCommand
          , reportCommand
          , unpackCommand, UnpackFlags(..) )
 import Distribution.Simple.Setup
hunk ./cabal-install/Main.hs 41
          , CopyFlags(..), copyCommand
          , RegisterFlags(..), registerCommand
          , CleanFlags(..), cleanCommand
-         , TestFlags(..), testCommand
+         , TestFlags(..)
          , BenchmarkFlags(..), benchmarkCommand
          , Flag(..), fromFlag, fromFlagOrDefault, flagToMaybe )
hunk ./cabal-install/Main.hs 44
+import qualified Distribution.Simple.Setup as Cabal ( testCommand )
 
 import Distribution.Client.SetupWrapper
          ( setupWrapper, SetupScriptOptions(..), defaultSetupScriptOptions )
hunk ./cabal-install/Main.hs 143
       ,reportCommand          `commandAddAction` reportAction
       ,initCommand            `commandAddAction` initAction
       ,configureExCommand     `commandAddAction` configureAction
+      ,testCommand            `commandAddAction` testAction
       ,wrapperAction (buildCommand defaultProgramConfiguration)
                      buildVerbosity    buildDistPref
       ,wrapperAction copyCommand
hunk ./cabal-install/Main.hs 156
                      hscolourVerbosity hscolourDistPref
       ,wrapperAction registerCommand
                      regVerbosity      regDistPref
-      ,wrapperAction testCommand
-                     testVerbosity     testDistPref
       ,wrapperAction benchmarkCommand
                      benchmarkVerbosity     benchmarkDistPref
       ,upgradeCommand         `commandAddAction` upgradeAction
hunk ./cabal-install/Main.hs 375
             conf
             initFlags
 
+testAction :: (BuildFlags, TestFlags) -> [String] -> GlobalFlags -> IO ()
+testAction (buildFlags, testFlags) extraArgs _ = do
+    let verbosity = fromFlagOrDefault normal (testVerbosity testFlags)
+        setupScriptOptions = defaultSetupScriptOptions {
+          useDistPref = fromFlagOrDefault
+                          (useDistPref defaultSetupScriptOptions)
+                          (testDistPref testFlags)
+        }
+    setupWrapper verbosity setupScriptOptions Nothing
+                 (buildCommand defaultProgramConfiguration) (const buildFlags) extraArgs
+    setupWrapper verbosity setupScriptOptions Nothing
+                 Cabal.testCommand (const testFlags) extraArgs
+
 -- | See 'Distribution.Client.Install.withWin32SelfUpgrade' for details.
 --
 win32SelfUpgradeAction :: [String] -> IO ()
}
[Automatically run 'cabal build' when 'cabal bench' is run.
Thomas Tuegel <ttuegel@gmail.com>**20120421185719
 Ignore-this: 581573227937050027f7d766d6e2ca2
] {
hunk ./cabal-install/Distribution/Client/Setup.hs 30
     , unpackCommand, UnpackFlags(..)
     , initCommand, IT.InitFlags(..)
     , sdistCommand, SDistFlags(..), SDistExFlags(..), ArchiveFormat(..)
-    , testCommand
+    , testCommand, benchmarkCommand
 
     , parsePackageArgs
     --TODO: stop exporting these:
hunk ./cabal-install/Distribution/Client/Setup.hs 53
          ( defaultProgramConfiguration )
 import Distribution.Simple.Command hiding (boolOpt)
 import qualified Distribution.Simple.Setup as Cabal
-         ( buildCommand, configureCommand, sdistCommand, haddockCommand
-         , testCommand )
+         ( benchmarkCommand, buildCommand, configureCommand, sdistCommand
+         , haddockCommand, testCommand )
 import Distribution.Simple.Setup
hunk ./cabal-install/Distribution/Client/Setup.hs 56
-         ( BuildFlags(..), ConfigFlags(..), SDistFlags(..), HaddockFlags(..)
-         , TestFlags(..) )
+         ( BenchmarkFlags(..), BuildFlags(..), ConfigFlags(..), SDistFlags(..)
+         , HaddockFlags(..), TestFlags(..) )
 import Distribution.Simple.Setup
          ( Flag(..), toFlag, fromFlag, flagToMaybe, flagToList
          , optionVerbosity, boolOpt, trueArg, falseArg )
hunk ./cabal-install/Distribution/Client/Setup.hs 1129
     get2 (_,b) = b; set2 b (a,_) = (a,b)
     buildCommand = Cabal.buildCommand defaultProgramConfiguration
 
+-- ------------------------------------------------------------
+-- * Benchmark Flags
+-- ------------------------------------------------------------
+
+benchmarkCommand :: CommandUI (BuildFlags, BenchmarkFlags)
+benchmarkCommand = Cabal.benchmarkCommand {
+  commandDefaultFlags = (mempty, mempty),
+  commandOptions      = \showOrParseArgs ->
+       liftOptions get1 set1 (commandOptions buildCommand showOrParseArgs)
+    ++ liftOptions get2 set2 (commandOptions Cabal.benchmarkCommand showOrParseArgs)
+  }
+  where
+    get1 (a,_) = a; set1 a (_,b) = (a,b)
+    get2 (_,b) = b; set2 b (a,_) = (a,b)
+    buildCommand = Cabal.buildCommand defaultProgramConfiguration
+
 -- ------------------------------------------------------------
 -- * GetOpt Utils
 -- ------------------------------------------------------------
hunk ./cabal-install/Main.hs 31
          , ReportFlags(..), reportCommand
          , InitFlags(initVerbosity), initCommand
          , SDistFlags(..), SDistExFlags(..), sdistCommand
-         , testCommand
+         , testCommand, benchmarkCommand
          , reportCommand
          , unpackCommand, UnpackFlags(..) )
 import Distribution.Simple.Setup
hunk ./cabal-install/Main.hs 42
          , RegisterFlags(..), registerCommand
          , CleanFlags(..), cleanCommand
          , TestFlags(..)
-         , BenchmarkFlags(..), benchmarkCommand
+         , BenchmarkFlags(..)
          , Flag(..), fromFlag, fromFlagOrDefault, flagToMaybe )
hunk ./cabal-install/Main.hs 44
-import qualified Distribution.Simple.Setup as Cabal ( testCommand )
+import qualified Distribution.Simple.Setup as Cabal
+         ( benchmarkCommand, testCommand )
 
 import Distribution.Client.SetupWrapper
          ( setupWrapper, SetupScriptOptions(..), defaultSetupScriptOptions )
hunk ./cabal-install/Main.hs 145
       ,initCommand            `commandAddAction` initAction
       ,configureExCommand     `commandAddAction` configureAction
       ,testCommand            `commandAddAction` testAction
+      ,benchmarkCommand       `commandAddAction` benchmarkAction
       ,wrapperAction (buildCommand defaultProgramConfiguration)
                      buildVerbosity    buildDistPref
       ,wrapperAction copyCommand
hunk ./cabal-install/Main.hs 158
                      hscolourVerbosity hscolourDistPref
       ,wrapperAction registerCommand
                      regVerbosity      regDistPref
-      ,wrapperAction benchmarkCommand
-                     benchmarkVerbosity     benchmarkDistPref
       ,upgradeCommand         `commandAddAction` upgradeAction
       ]
 
hunk ./cabal-install/Main.hs 388
     setupWrapper verbosity setupScriptOptions Nothing
                  Cabal.testCommand (const testFlags) extraArgs
 
+benchmarkAction :: (BuildFlags, BenchmarkFlags) -> [String] -> GlobalFlags -> IO ()
+benchmarkAction (buildFlags, benchmarkFlags) extraArgs _ = do
+    let verbosity = fromFlagOrDefault normal (benchmarkVerbosity benchmarkFlags)
+        setupScriptOptions = defaultSetupScriptOptions {
+          useDistPref = fromFlagOrDefault
+                          (useDistPref defaultSetupScriptOptions)
+                          (benchmarkDistPref benchmarkFlags)
+        }
+    setupWrapper verbosity setupScriptOptions Nothing
+                 (buildCommand defaultProgramConfiguration) (const buildFlags) extraArgs
+    setupWrapper verbosity setupScriptOptions Nothing
+                 Cabal.benchmarkCommand (const benchmarkFlags) extraArgs
+
 -- | See 'Distribution.Client.Install.withWin32SelfUpgrade' for details.
 --
 win32SelfUpgradeAction :: [String] -> IO ()
}

Context:

[version update in Cabal Makefile
Andres Loeh <andres@well-typed.com>**20120418053859
 Ignore-this: 955fcfc9f97a26d11b91b671639c73b2
] 
[last-minute README changes
Andres Loeh <andres@well-typed.com>**20120417151703
 Ignore-this: 2ebed8c82fc6dfaf55af2dd59a38af24
] 
[updated copyright year for Duncan
Andres Loeh <andres@well-typed.com>**20120416171558
 Ignore-this: b3745f5b7d78e94d872a0050ff0e5319
] 
[updated changelog
Andres Loeh <andres@well-typed.com>**20120416171256
 Ignore-this: ce3af93be513c6ce0c1c9970745b34ac
] 
[added deepseq to bootstrap.sh
Andres Loeh <andres@well-typed.com>**20120416170448
 Ignore-this: eb5f7ce79d96bbf6b30d9d1d16f5b2eb
 
 deepseq is a dependency of text, and not included with ghc-7.0.4.
] 
[handling the solver options properly in config file
Andres Loeh <andres@well-typed.com>**20120416123024
 Ignore-this: e6238b7b2846d44dff996b0f03416d3e
] 
[handling the "optimization" option properly in config file
Andres Loeh <andres@well-typed.com>**20120416122903
 Ignore-this: 53da3cf3f7bb5490286e960941704d4a
] 
[Update cabal-install bootstrap.sh
Tuncer Ayaz <tuncer.ayaz@gmail.com>**20120412212459
 Ignore-this: ed0ac98d2b6a235bd4107acf194aa0a6
] 
[treat packages that are unknown no longer as an "internal error" in modular solver
Andres Loeh <andres@well-typed.com>**20120416070302
 Ignore-this: f536450cab4370868edeedc154dc3ccb
] 
[minor wording change when printing install plans
Andres Loeh <andres@well-typed.com>**20120408171852
 Ignore-this: ed5e00be940cb1c27c6b2de0fdff1da4
] 
[no longer pre-filter broken packages for modular solver
Andres Loeh <andres@well-typed.com>**20120408171423
 Ignore-this: 89dca77a92ed810fa663d9d154b409c8
 
 The modular solver can now deal with broken packages in the
 index. I have, however, discovered, that broken packages were
 filtered before even passing the installed package index to
 the solver. I have made that filtering conditional on using
 the topdown solver for now.
 
 Related is the issue that we should not warn about possible
 breakage of already broken packages. So we now exclude
 already broken packages when considering whether an install
 plan contains dangerous reinstalls.
] 
[for empty install plans, print the packages that are installed
Andres Loeh <andres@well-typed.com>**20120407092829
 Ignore-this: 2e058d6fc4dfecc0425b4e8ba9223371
 
 This is a fix for #623.
 
 If we ask to install a package without --reinstall that's already
 there, then we'll show the package and its version in the warning
 message and suggest the use of the --reinstall flag.
] 
[make the reinstall check less noisy
Andres Loeh <andres@well-typed.com>**20120406172435
 Ignore-this: 87e1722393d23b633c72501fab94d71f
 
 There are two aspects to this change.
 
 The uncontroversial one is that if the install plan contains
 reinstalls, we now determine if there are reverse dependencies
 of such reinstalled packages that we can see. If so, these
 are likely to be broken. If we find such packages, we list
 them and state that we can only install the plan if
 --force-reinstalls is explicitly stated.
 
 The more controversial change is that if we cannot find such
 reverse dependencies, we now merely print a warning but
 continue, even though there are situations where executing
 the build process can still break packages. The most likely
 example of this is that we're installing to the global package
 database, and user package databases on the system have
 dependencies on the replaces packages -- but we cannot see
 these user package databases.
] 
[disable line-wrapping for solver debug output
Andres Loeh <andres@well-typed.com>**20120406172403
 Ignore-this: 339747737c9964abeb665d25c50dd206
] 
[adding a solver flag for shadowing of installed packages
Andres Loeh <andres@well-typed.com>**20120406103435
 Ignore-this: 8126f62c6c2c69c0a2b0724cbaf9d585
] 
[adding the possibility for index-disabled packages
Andres Loeh <andres@well-typed.com>**20120405153315
 Ignore-this: d339f6b52cf895507282e89a408de1c4
 
 In the modular solver, it's now possible to mark packages
 as disabled in the index conversion phase. This can be used
 to mark broken packages (with missing dependencies) in such
 a way that they can still be seen by the solver and reported
 in error messages.
 
 Furthermore, the feature could be used to implement
 shadowing restrictions. Currently, there are some things
 that can go wrong if multiple installed instances of
 the same version and package exist on the system. However,
 I've not enabled the use of shadowing for now, as it's
 hard to match the restrictions exactly, and we can end up
 excluding perfectly valid cases. Enabling shadowing
 selectively by a solver flag would be an option.
] 
[choose default solver based on compiler version
Andres Loeh <andres@well-typed.com>**20120331134211
 Ignore-this: 302cf0ca02aeca77b3c2ad675b557562
 
 GHC-6.12 has base-3 depending on base-4. This is a situation the
 topdown solver is hacked to deal with, but the new modular solver
 currently doesn't support it. We therefore switch back to the
 topdown solver if a GHC version before 7 is detected, but switch
 to the modular solver by default in all other situations.
] 
[Added a comment
Andres Loeh <andres@well-typed.com>**20120315181626
 Ignore-this: 50c1ea721ec654c8759ea0f174be3a2f
] 
[Use the new --package-db flag stuff in cabal-install
Duncan Coutts <duncan@community.haskell.org>**20120329020752
 Ignore-this: 922fc496afe50c3ab39101d12420fd97
] 
[Extend the --package-db= feature to allow multiple dbs and start from empty
Duncan Coutts <duncan@community.haskell.org>**20120329020720
 Ignore-this: dcc425219ebc7cbb1e7fd361d248d93b
 Previously only one --package-db flag was used (later ones overrode earlier).
 Internally we can handle stacks of package dbs, now we expose that fully in
 the user interface.
  --global sets the initial db stack to [GlobalPackageDB]
  --user sets the initial db stack to [GlobalPackageDB, UserPackageDB]
  --package-db=clear clears the db stack to []
  --package-db=global pushes GlobalPackageDB on the top of the stack
  --package-db=user pushes UserPackageDB on the top of the stack
  --package-db=${file} pushes SpecificPackageDB ${file} on the top of the stack
 So --global and --user just affect the initial db stack, and this can be
 extended by the --package-db flag, or reset using --package-db=clear.
 
 Note that although this lets users tell cabal to avoid using the global
 package db, we cannot yet stop ghc from looking at the global package db.
 See http://hackage.haskell.org/trac/ghc/ticket/5977
 
 Fixes feature request #437.
] 
[head cabal-install requires head Cabal
Duncan Coutts <duncan@community.haskell.org>**20120329014653
 Ignore-this: 5193c3ce6957fc2fce47b0981d2232ba
] 
[Add back deprecated ghcVerbosityOptions and ghcPackageDbOptions
Duncan Coutts <duncan@community.haskell.org>**20120329010837
 Ignore-this: 1a9a609654fbe32fcac5958ae34122b9
] 
[Fix ticket #731
Duncan Coutts <duncan@community.haskell.org>**20120328220556
 Ignore-this: c43dc521130cceb91f0722e0b43ab0e9
] 
[Check for the env var GHC_PACKAGE_PATH
Duncan Coutts <duncan@community.haskell.org>**20120328214522
 Ignore-this: 1007ec6206c782d16be5bc5c297c84b1
 Based on the patch by Keegan McAllister <mcallister.keegan@gmail.com>
 Fixes ticket #335
] 
[Break up the component build code a bit
Duncan Coutts <duncan@community.haskell.org>**20120327233203
 Ignore-this: d017f92774140a5825218df2abf6c9a5
 This will make it easier to allow building individual components
] 
[Convert ghc option construction to use an options record
Duncan Coutts <duncan@community.haskell.org>**20120327225205
 Ignore-this: acc812662113673a9476fcfee6aa4239
 Using a structured representation of the ghc options rather
 than [String] makes it easier to share and reuse the code
 for building sets of ghc options, which makes it easier to
 add code for calling ghci.
 
 This is based on Sam Anklesaria's GSoC work on "cabal repl"
] 
[Add brief description of PVP to cabal init generated .cabal files
Duncan Coutts <duncan@community.haskell.org>**20110925051815
 Ignore-this: febca1644219556fa1b823958bf37563
] 
[Bump versions to 1.15 and 0.15
Duncan Coutts <duncan@community.haskell.org>**20120329012952
 Ignore-this: b281ea31cd85401b89636ac52f03a6d1
 This is the head branch, the 1.14.x and 0.14.x are in the 1.14 branch.
] 
[Add strip.exe to the list of programs we look for in GHC's mingw installation
Ian Lynagh <igloo@earth.li>**20120318170938
 Ignore-this: d89f0977272ea79d80c8d67f83c38c10
 
 In particular, this fixes the case where strip in your path is a Win32
 strip, but you are using a Win64 GHC.
] 
[Fix for #917: Generated Paths module broken with NoImplicitPrelude
Duncan Coutts <duncan@community.haskell.org>**20120317202858
 Ignore-this: d9663db5d6979bd862365a7b2067906f
 import Prelude explicitly
] 
[Tweak the tool-finder for mingw64
Ian Lynagh <igloo@earth.li>**20120316233502
 Ignore-this: 705a0296b1e7ffe8af62fdae1114b3d1
] 
[init: guess at filling in deps in the build-depends: field
Brent Yorgey <byorgey@cis.upenn.edu>**20111025050900
 Ignore-this: 4adf589b96657d084c6fd72175d8ee05
] 
[init: see whether source directory 'src' exists.
Brent Yorgey <byorgey@cis.upenn.edu>**20111014202230
 Ignore-this: 8008fc37fad5ebe45c1a62c5ce45264b
] 
[init: improve prompt: enclose y/n in parens
Brent Yorgey <byorgey@cis.upenn.edu>**20111014202210
 Ignore-this: 4925b25ef425d774333856b83fc6eb6a
] 
[init: improve prompt: 'homepage' field is not for repos.
Brent Yorgey <byorgey@cis.upenn.edu>**20111014202134
 Ignore-this: 432aabae368e371597a384d97f1dbc21
] 
[bootstrap with --global should still respect $PREFIX
Andres Loeh <andres@well-typed.com>**20120309083031
 Ignore-this: 37e4b3b7bab5fa81d01cc26075eaed92
 
 Thanks to milkypostman for providing the patch. Closes ticket #926.
] 
[Update cabal-install boostrap.sh package versions
Tuncer Ayaz <tuncer.ayaz@gmail.com>**20120217201457
 Ignore-this: dd38533c30efa49a29438216cb73bb2d
] 
[Fix 'cabal configure --enable-{tests,benchmarks}'.
Thomas Tuegel <ttuegel@gmail.com>**20120219005511
 Ignore-this: 70d8481e4bbce0dcbd75af438dab0750
 'cabal configure' was not adding optional stanza constraints when checking
 dependencies, causing '--enable-{tests,benchmarks}' to be silently ignored.
] 
[Relax containers dependency
Ian Lynagh <igloo@earth.li>**20120222190918
 Ignore-this: 8334d295f37a82a03076fbb6db3bd35a
] 
[added missing error message
Andres Loeh <andres@well-typed.com>**20120217072849
 Ignore-this: d6771c1e4b8e9749595db25d82a92390
 
 Thanks to Thomas Tuegel for spotting this.
] 
[Don't try to run test suites where none exist.
Thomas Tuegel <ttuegel@gmail.com>**20120216184617
 Ignore-this: 46bfa99cc4f731076254755b69378c1f
] 
[Fixed non-exhaustive pattern matches with new InstallOutcome.
Thomas Tuegel <ttuegel@gmail.com>**20120216181622
 Ignore-this: 14fef6aed57bfa93dec3e8f6bcee3112
] 
[Automatically run test suites when invoked with 'cabal install --enable-tests'. Do not install if tests fail.
Thomas Tuegel <ttuegel@gmail.com>**20120204202258
 Ignore-this: 5d3cdd405559fe2ed5393b80b6414555
] 
[make test and bench available as user constraints
Andres Loeh <andres@well-typed.com>**20120213081641
 Ignore-this: 5394dc06ba70aa9e2f2316ab1f413a27
 
 Saying
 
   cabal install foo --enable-tests
 
 is now equivalent to saying
 
   cabal install foo --constraint="foo test"
 
 The constraint syntax in addition allows to enable tests and benchmarks
 for packages that are further down in the dependency chain.
] 
[let --reinstall imply --force-reinstalls for targets
Andres Loeh <andres@well-typed.com>**20120212134322
 Ignore-this: 451afd567040c56f1eaa17bb718c15ab
] 
[stanza support in modular solver
Andres Loeh <andres@well-typed.com>**20120212113524
 Ignore-this: 9697a66807ddee3ea2de811458c2fa5a
] 
[show optional stanzas when printing install plans
Andres Loeh <andres@well-typed.com>**20120211155929
 Ignore-this: b9d3b404ce7e58eb9368ee28670d31ae
] 
[Added a missing case.
Andres Loeh <andres@well-typed.com>**20120211154119
 Ignore-this: 449e59fec67c986ea2804642bf02b8c3
] 
[Enable tests and benchmarks in cabal-install without modifications to the Cabal library.
Thomas Tuegel <ttuegel@gmail.com>**20120208065701
 Ignore-this: 66273287bbae4fd47a8bc16734e4b305
] 
[Don't build benchmarks, even if installing benchmark dependencies.
Thomas Tuegel <ttuegel@gmail.com>**20120207194852
 Ignore-this: 994177542d8d746f5e9035450059164e
] 
[Update types in modular dependency solver to compile with new test/benchmark dependency constraints.
Thomas Tuegel <ttuegel@gmail.com>**20120207194543
 Ignore-this: ddfdb45064df125b176ade0ba19bbbbb
] 
[Handle test and benchmark dependencies through the resolver properly.
Thomas Tuegel <ttuegel@gmail.com>**20120207193958
 Ignore-this: 99e675795396fc9f64741417f6d7afd5
 
 Previously, test and benchmark dependencies were handled by editing the
 package description to include or exclude those stanzas before running
 the dependency resolver. Test and benchmark dependencies could only be
 installed for source packages because no package description is available
 for named packages before dependency resolution.
 
 Now, test and benchmark stanzas are enabled or disabled through constraints
 passed to the dependency resolver. This way, we can install dependencies for
 the test suites of target packages without propagating '--enable-tests'
 through the entire dependency tree; i.e., tests and benchmarks, when enabled,
 are built only for target packages. Later, this will allow us to
 automatically run test suites and, e.g., install only upon their success.
] 
[updating dependencies in bootstrap.sh
Andres Loeh <andres@well-typed.com>**20120110203053
 Ignore-this: e48d474f85eb4fd8383c0e8ded858260
 
 Thanks to Tuncer Ayaz.
] 
[fix compilation with ghc-7.4
Andres Loeh <andres@well-typed.com>**20120110200356
 Ignore-this: c949a5ef384fb9a47fd6c6c3d1b0010
 
 Thanks to Tuncer Ayaz.
] 
[Update dependencies
Ian Lynagh <igloo@earth.li>**20111212214606
 Ignore-this: ccc7ed3096d33aae6115a671a0996867
] 
[Bump version to 1.14.0
Ian Lynagh <igloo@earth.li>**20111212214416
 Ignore-this: 59dcc4f7ec38576350aa2d3d5e730394
] 
[Added a comment.
Andres Loeh <andres@well-typed.com>**20120109080907
 Ignore-this: 6f16ea76d8c01423cdfb3cb1601bdf04
] 
[removing trailing whitespace
Andres Loeh <andres@well-typed.com>**20120101153235
 Ignore-this: a5345cf959661ea4fca5d00d25f08129
] 
[removing datatype contexts
Andres Loeh <andres@well-typed.com>**20111216144355
 Ignore-this: d64302ae49aaffb4e713eeecadad4689
] 
[Now require mtl-2
Duncan Coutts <duncan@community.haskell.org>**20111117001719
 Ignore-this: fd7314e32766ab9a0aa84c2138d5e393
] 
[Include testsuites and benchmarks in external deps when enabled
Duncan Coutts <duncan@community.haskell.org>**20111116191455
 Ignore-this: a6fd90e7645cbac6e5d9ad64b5991dad
 In particular this should fix ticket #871 where the cabal_macros.h
 is missing info for testsuite components.
] 
[When running haddock, only pass package deps for the component only
Duncan Coutts <duncan@community.haskell.org>**20111116191139
 Ignore-this: a489d34257850af9b0b90718ed99fbcf
 rather than for the union of all components in the package.
] 
[Note in the README that you can install using the cabal program
Duncan Coutts <duncan@community.haskell.org>**20111111133113
 Ignore-this: cbd5b54d3d120ac354bbcaed2e323e59
] 
[changed --override-reinstall-check to --force-reinstalls
Andres Loeh <andres@well-typed.com>**20111107150713
 Ignore-this: 8120844dc8479f7169cc8c0eb3e7bf97
 
 Also adapted the message for the failed check.
] 
[do not print reinstall warning if --override-reinstall-check has been specified
Andres Loeh <andres@well-typed.com>**20111107101501
 Ignore-this: 79634b89056c38a0c87ea1409762c893
] 
[slightly modify a debug message in the new solver
Andres Loeh <andres@well-typed.com>**20111107101437
 Ignore-this: eabc3949b3cb86235f3c2eb881ad25d8
] 
[Fix fallout of Num / Show class changes in ghc-7.4
Duncan Coutts <duncan@community.haskell.org>**20111104002510
 Ignore-this: 2b646b5b5e73d692192576cab62f0565
] 
[change solver default to TopDown for now
Andres Loeh <andres@well-typed.com>**20111103205744
 Ignore-this: 10c65a306dd53948eb025bbd8645ee11
] 
[removing dead code
Andres Loeh <andres@well-typed.com>**20111029141133
 Ignore-this: b86c2a8dd2890059a069e54ef1a2be7
] 
[goal choice heuristic in modular solver: choose base as early as possible
Andres Loeh <andres@well-typed.com>**20111029140041
 Ignore-this: 4a4113b878e041d901deed7e42837286
] 
[bugfix: wrong flag choice was sometimes shown in goal reasons
Andres Loeh <andres@well-typed.com>**20111029122324
 Ignore-this: 6d0ea0605d767712e7d6116afd25269f
] 
[when printing the install plan, show non-default flag assignments
Andres Loeh <andres@well-typed.com>**20111029121515
 Ignore-this: 4686e5efaf543c19b3435e3098609d8
] 
[remove trailing whitespace
Andres Loeh <andres@well-typed.com>**20111029112245
 Ignore-this: be59e8a32bf881f1d34f35aae84b8fc
] 
[proper fix for default solver option handling
Andres Loeh <andres@well-typed.com>**20111028112358
 Ignore-this: 5e5816f9eddb4cdb14196d65e3501b00
 
 Suggested by Duncan.
] 
[removing wrong option handling fix
Andres Loeh <andres@well-typed.com>**20111028111231
 Ignore-this: a1cf3dedde8b6c535be11ae8dcac6fec
] 
[fixed a strange options handling bug
Andres Loeh <andres@well-typed.com>**20111028091727
 Ignore-this: 6896824671481e929d7732b71d2a3d67
] 
[revised solver flag configuration
Andres Loeh <andres@well-typed.com>**20111028073729
 Ignore-this: 5497056c8815bd43d287ce38a1ad3589
] 
[make solver configurable via command-line flag
Andres Loeh <andres@well-typed.com>**20111027212705
 Ignore-this: d11264b74257f61720ab58fd1f04a50d
] 
[reactivate (but not use) the top-down resolver
Andres Loeh <andres@well-typed.com>**20111027190304
 Ignore-this: 9741619c2052d21e8a7e28d2e941b6d5
] 
[restore the index conversion utility function, but as a top-level function
Andres Loeh <andres@well-typed.com>**20111027190152
 Ignore-this: 26dcf713c8075fb58f895cc55db00e98
] 
[collapse repeated flag choices
Andres Loeh <andres@well-typed.com>**20111027161120
 Ignore-this: 4b6f35c49675014002c4506eb7425fd
 
 In the build phase, we allow the same flag choice to occur multiple times.
 This makes it easy to handle the situation where the same flag occurs
 several times in the condition tree, and hence new goals and dependencies
 might be introduced depending on the choice.
 
 Previously, we have ensured during validation that repeated flag choices
 are consistent. This behaviour has now been replaced by the new approach
 to collapse repeated flag choice nodes completely during validation.
 
 The advantage is that the tree is less deep, and that the trace output looks
 less strange. Repeated flag choices are no longer seen, which I think avoids
 confusion.
] 
[fixing warnings
Andres Loeh <andres@well-typed.com>**20111027160944
 Ignore-this: 2f99859d1585045fb292c69b4431e76f
] 
[adding a lookup function for PSQs
Andres Loeh <andres@well-typed.com>**20111027160924
 Ignore-this: b404d9055ba4237fc4410ff8c102eb65
] 
[minor clarification in naming
Andres Loeh <andres@well-typed.com>**20111027134534
 Ignore-this: 2bd081c6adb7a8c5c888c8069696d1ae
] 
[removing dead code for global flag enforcement
Andres Loeh <andres@well-typed.com>**20111027133309
 Ignore-this: 52be852bb715be5d83cf2e1db6169e8
 
 This is all covered by the function that enforces package constraints,
 as global flag constraints are translated into package-specific flag
 constraints outside of the solver.
] 
[there may be more than one package constraint per package
Andres Loeh <andres@well-typed.com>**20111027133108
 Ignore-this: 44ba0feece724fce97f498d22bd56c93
] 
[in parsing user constraints, require a space to separate the initial package name
Andres Loeh <andres@well-typed.com>**20111027133021
 Ignore-this: 335b77cc0e2ffadd1315a8ed42925d45
] 
[add --override-reinstall-check option
Jens Petersen <juhp@community.haskell.org>**20111026124024
 Ignore-this: 176b70d8e72e4ce6b65ad21611426069
 
 This option flag overrides the new destructive reinstalls check,
 allowing forcing overwriting already installed library versions.
 The patch also documents this flag and other softer options
 in the output of printPlanMessages, which is renamed to checkPrintPlan.
] 
[treat ghc-prim like base as non-upgradeable in modular solver
Andres Loeh <andres@well-typed.com>**20111025063820
 Ignore-this: 68acee21bcc5df42f4295f61a93a367d
] 
[merging changes from HEAD into modular-solver branch
Andres Loeh <andres@well-typed.com>**20111025063632
 Ignore-this: 35fb9a9d8736d4b2bca35e36004d24c4
] 
[Added a check for destructive reinstalls.
Andres Loeh <andres@well-typed.com>**20111021120831
 Ignore-this: f343899c19a1b18156c8498cc1183d08
 
 Some refactoring in Distribution.Client.Install:
 
   * the linear representation of an install plan is now typed
   * it can be checked for the presence of destructive reinstalls
 
 Currently, Cabal will stop if destructive reinstalls are encountered.
 While this should become default behaviour, there has to be a flag
 that overrides it.
] 
[merging modular solver with main branch
Andres Loeh <andres@well-typed.com>**20111021071736
 Ignore-this: 57d24e3c979872682ee66abecbf808b2
] 
[Added flag --independent-goals (not yet functioning correctly)
Andres Loeh <andres@well-typed.com>**20110709083556
 Ignore-this: d420a08623f173a3483b1f8382d7af27
] 
[Fixing a few warnings.
Andres Loeh <andres@well-typed.com>**20110708074744
 Ignore-this: 395c2f791da6046c3e0b4ac73392f438
] 
[make max backjumps configurable
Andres Loeh <andres@well-typed.com>**20110707092854
 Ignore-this: e57965fad997f248e5c811040b4c511b
] 
[introduce backjump limit, and produce error messages
Andres Loeh <andres@well-typed.com>**20110705141536
 Ignore-this: dce6d6d474f71e46a20c6bfc6633ee46
] 
[Generalized the type of traversals.
Andres Loeh <andres@well-typed.com>**20110704184550
 Ignore-this: f10a367f6c95b722f381afa4396adb9
] 
[Added a Functor instance for search trees.
Andres Loeh <andres@well-typed.com>**20110704184533
 Ignore-this: f872a3349ccbe64de991106476586188
] 
[Rewrite traversals using a new combinator.
Andres Loeh <andres@well-typed.com>**20110704182930
 Ignore-this: f989ec7fced87c9389fcd1a3e23b8896
 
 The hope is that sooner or later we can apply fusion.
] 
[Refactoring: write traversals in a nicer way
Andres Loeh <andres@well-typed.com>**20110704175631
 Ignore-this: 7f9942f74e237b165c2be6c9c28431fe
] 
[layout
Andres Loeh <andres@well-typed.com>**20110704173553
 Ignore-this: 12c8ab24e372068fdfbb2e9cc04a1590
] 
[Added a --reorder-goals flag.
Andres Loeh <andres@well-typed.com>**20110703143656
 Ignore-this: c5a797b71d5050ac68ce4bb08b6f8bbd
] 
[switch goal reordering off by default
Andres Loeh <andres@well-typed.com>**20110703135217
 Ignore-this: c7bc5a87f89c49793f9171cbb8aaac6a
 
 It surprised me somewhat, but goal reordering seems to slow things
 down, even for backtracking packages. It was supposed to speed things
 up, but it's possible that backjumping works so nicely that it more
 than compensates for the effects. More systematic testing might be
 needed.
] 
[switch to less precise, more efficient goal reordering
Andres Loeh <andres@well-typed.com>**20110703134359
 Ignore-this: b9d1c7c8ce62480fb5885ef61c388677
] 
[Refactoring: use toConflictSet
Andres Loeh <andres@well-typed.com>**20110703132011
 Ignore-this: e5c90d6c2dfe391d8becef3e6b667e00
] 
[better conflict reporting
Andres Loeh <andres@well-typed.com>**20110703131435
 Ignore-this: f331ae416dc2606a903b7a563406a4c1
] 
[Keep better track of goal reasons.
Andres Loeh <andres@well-typed.com>**20110703101721
 Ignore-this: d8b77e6b03fd089dd70095620ee49039
] 
[typo
Andres Loeh <andres@well-typed.com>**20110630121901
 Ignore-this: 78cd22e1681dd9ddd9280acd764b0795
] 
[Refactoring: moving goals to Dependency module
Andres Loeh <andres@well-typed.com>**20110630121018
 Ignore-this: 3f3e5a8debd4d6fd095f5f267a4710c7
] 
[adding a command-line flag to avoid reinstalls
Andres Loeh <andres@well-typed.com>**20110630101721
 Ignore-this: e18974fd5c10e5b6e0a2450299b4f8a3
] 
[make conflict sets slightly larger
Andres Loeh <andres@well-typed.com>**20110621140618
 Ignore-this: a17f29faddb8e955bd1c0c0a2ded71f7
 
 This is slower, however seems more correct. Larger conflict sets
 typically mean fewer possibilities to cut the search space. On the
 other hand, cutting too much risks incompleteness. At some later
 stage, we might want to try hard to think about how/if conflict sets
 could be reduced in size.
] 
[more compact output for multiple subsequently rejected packages
Andres Loeh <andres@well-typed.com>**20110621133231
 Ignore-this: f2cdeac0e73501ac600ff6e29daf7605
] 
[debug output for backjumping
Andres Loeh <andres@well-typed.com>**20110621113210
 Ignore-this: 6353021aec10f411abb2447534a151c9
] 
[documentation for backjumping
Andres Loeh <andres@well-typed.com>**20110621094547
 Ignore-this: cf54c33b4bb632ad7dcc5429ae46189
] 
[maintain chains of GoalReasons
Andres Loeh <andres@well-typed.com>**20110621075136
 Ignore-this: 3a1301ad75703a892e10b1796d7012ac
 
 Bugfix: conflict sets now contain the transitive closure of goal reasons,
 which is required for completeness.
 
 We now finally have sufficient info to produce good error messages, too.
 At a failure site, we can trace which parts of the tree are relevant to
 the failure, via the correctly generated conflict sets.
 
] 
[refactoring: conflict sets are now sets instead of lists
Andres Loeh <andres@well-typed.com>**20110620213330
 Ignore-this: 5b428bd4bb4cce656fc05762bd10aa88
] 
[implemented a version of backjumping
Andres Loeh <andres@well-typed.com>**20110620171957
 Ignore-this: e4125293151373f684be57d233b7f536
] 
[annotate with goal reason throughout reordering phase
Andres Loeh <andres@well-typed.com>**20110620150603
 Ignore-this: d35069fa5f8da4bfdbb816e2e357675c
] 
[no annotations needed in goal choices
Andres Loeh <andres@well-typed.com>**20110620144923
 Ignore-this: 6aa29a706003651994b6493a1520af1f
] 
[refactoring: change the way tree annotations are handled
Andres Loeh <andres@well-typed.com>**20110620143641
 Ignore-this: 9ea74e5fed8b63b363d468f585efade2
] 
[build conflict sets
Andres Loeh <andres@well-typed.com>**20110620143443
 Ignore-this: c648018f1a948f48bfd4780e1aab7cdd
] 
[provide more info about conflicts
Andres Loeh <andres@well-typed.com>**20110620130453
 Ignore-this: d83f29eb56377129b40f6038cc6b1643
] 
[proper constraint origins also for flag-introduced dependencies
Andres Loeh <andres@well-typed.com>**20110620100852
 Ignore-this: 6cc63c642dbb2fb01c58de558c98c7b9
] 
[store origin info in constrained instances
Andres Loeh <andres@well-typed.com>**20110620095808
 Ignore-this: 59cf77a2c8009d3061dd9bbbff3e24b6
] 
[Ignore self-dependencies (of executables on libraries).
Andres Loeh <andres@well-typed.com>**20110620073104
 Ignore-this: 843b67aba3b1d5d888d57445633c8161
] 
[Reactivate output of changes for reinstalled pkgs in install plan
Andres Loeh <andres@well-typed.com>**20110619163520
 Ignore-this: 6058ad537ea93399ce1dadf677360943
] 
[Bugfix: wrong flag name was used while adding new dependencies
Andres Loeh <andres@well-typed.com>**20110619154841
 Ignore-this: 6d5fb52890b518bd33f9bf0c5e274c72
] 
[Bugfix: ignore broken packages.
Andres Loeh <andres@well-typed.com>**20110616065422
 Ignore-this: acba4e209ac0603c295f05153c0d1dd8
] 
[produce a bit more compact debugging output
Andres Loeh <andres@well-typed.com>**20110615114213
 Ignore-this: d1f134808e33a47ccfe3d431eb3af44c
] 
[fix package ordering bug
Andres Loeh <andres@well-typed.com>**20110615073630
 Ignore-this: 945f696c0467974e9463c4b8efb1d1d2
] 
[change avoidReinstalls default, to match old Cabal solver
Andres Loeh <andres@well-typed.com>**20110615072835
 Ignore-this: cf1e95a0f3cf1d8ea2186dae35e35861
] 
[integrate the modular solver into cabal-install repo
Andres Loeh <andres@well-typed.com>**20110615070720
 Ignore-this: c9dd7139bf2d29114991b2f23a9989f3
] 
[New solver now respects preferences.
Andres Loeh <andres@well-typed.com>**20110615070343
 Ignore-this: 9442ddf244f28a0447560a54ffe3928b
] 
[updated Cabal file
Andres Loeh <andres@well-typed.com>**20110614213015
 Ignore-this: a0a208a6c8d57efb50a6ef28b9b9f80c
] 
[properly translate package constraints
Andres Loeh <andres@well-typed.com>**20110614212736
 Ignore-this: 518cb0e05af8e163235528c495d4ec4
] 
[whitespace
Andres Loeh <andres@well-typed.com>**20110614101908
 Ignore-this: a6215083dd56f50cf21ff813d8d9a7b2
] 
[modular resolver now standard
Andres Loeh <andres@well-typed.com>**20110614101850
 Ignore-this: fcf6d1d7443720e26f4ad5d9b8f944bb
] 
[use InstalledPackageIndex throughout
Andres Loeh <andres@well-typed.com>**20110614101525
 Ignore-this: 6a86fd2d78b38815be8026314488c5db
] 
[started the solver interface conversion
Andres Loeh <andres@well-typed.com>**20110605125221
 Ignore-this: 24e988891e3b3a91645763f1a54c3de1
] 
[added a module for the interface to the new solver
Andres Loeh <andres@well-typed.com>**20110605124213
 Ignore-this: 1b43f04a29a8f4c88b94cb9d20fa0854
] 
[integrated index conversion functions
Andres Loeh <andres@well-typed.com>**20110605122430
 Ignore-this: c6a3427e1e068b6bec8aba54c9e587e4
] 
[added Progress instances
Andres Loeh <andres@well-typed.com>**20110605112809
 Ignore-this: 9ec44d6bceb4fd8310d2770843d818a6
] 
[reordering
Andres Loeh <andres@well-typed.com>**20110605110341
 Ignore-this: bb889dea57cc8b9dbf63a8a3685d2433
] 
[include the new solver in the dependency hierarchy
Andres Loeh <andres@well-typed.com>**20110605110052
 Ignore-this: 5d8dc387d44ffe7917d70d92bccf34ee
] 
[moving PackagesPreferenceDefault
Andres Loeh <andres@well-typed.com>**20110605110028
 Ignore-this: a2e86dd13af1622856626a7f8cbb909c
] 
[updated Cabal file to include modular solver modules
Andres Loeh <andres@well-typed.com>**20110605100942
 Ignore-this: 2a99b8c12681530e795cd16450877de6
] 
[Bump major version to 1.13
Duncan Coutts <duncan@community.haskell.org>**20111026204346
 Ignore-this: 143bf697f22b7225757c9907b37d8fbb
 Since 1.12 got released with ghc-7.2.x
] 
[Register 'bench' command with the CLI
Johan Tibell <johan.tibell@gmail.com>**20111026005309
 Ignore-this: 69168a6e951f5dcea6e9826704487d47
] 
[Briefly document 'cabal test' and 'cabal bench'
Johan Tibell <johan.tibell@gmail.com>**20111026002738
 Ignore-this: ccfb88fa6bec02eef62cf2dee34807c2
] 
[Small doc fix in Benchmarks section
Bas van Dijk <v.dijk.bas@gmail.com>**20111025184055
 Ignore-this: 5512c7f5d959335d73a8b9c427193d36
] 
[typos in benchmarks documentation/help
Simon Meier <iridcode@gmail.com>**20111025183032
 Ignore-this: 3f6ecc518bce2d1d07380e35c1b7f160
] 
[Describe benchmark sections in the user guide
Johan Tibell <johan.tibell@gmail.com>**20111019153233
 Ignore-this: 349a426ca769cfea19c5f784846e8a95
] 
[Fix source repo subdir name after cabal->Cabal dir rename
Duncan Coutts <duncan@community.haskell.org>**20111023214425
 Ignore-this: e1e0327576da9bfc45056ef69c74e28a
] 
[Add a source package index cache to speed up reading
Duncan Coutts <duncan@community.haskell.org>**20111023213253
 Ignore-this: d35c7eeaba12305fc9a5f1b1c146c902
 e.g. about 3x faster for cabal info pkgname
] 
[Bump versions of Cabal and cabal-install
Duncan Coutts <duncan@community.haskell.org>**20111023213924
 Ignore-this: b298e60d9b5eada94f0f40edf942f031
 Latest cabal-install requires latest Cabal due to api addition
] 
[Fail gracefully if 'cabal bench' is run before 'cabal build'
Johan Tibell <johan.tibell@gmail.com>**20111013232847
 Ignore-this: 9c73bb0b650fe4b06a5515bef7587cfd
] 
[Add unit test for 'cabal bench' command-line flags
Johan Tibell <johan.tibell@gmail.com>**20111013232109
 Ignore-this: fc3e53a768c3c971a8f5e3a6e187ba2d
] 
[Implement 'cabal bench' command
Johan Tibell <johan.tibell@gmail.com>**20111013225615
 Ignore-this: 34a2e6e5bdc13d16eaadc48a2efe2d75
 The only implement benchmark interface so far is exitcode-stdio-1.0,
 which forwards the output of the benchmark executable being run to the
 parent process' stdout/stderr.
] 
[Add package checks for benchmarks
Johan Tibell <johan.tibell@gmail.com>**20111012201604
 Ignore-this: ce4094004ab81b6f60d69a30f6f16247
 Refactor duplicate names check to avoid having to manually write all
 O(n^2) possible collision cases between executables, test suites, and
 benchmarks.
] 
[Uploading build reports shouldn't fail if there are no reports
Max Bolingbroke <batterseapower@hotmail.com>**20111016143819
 Ignore-this: 7423a9c3a67a581c04502912fc08f460
] 
[Add a (substituted) flag to allow configuration of Haddock's --use-contents flag
Max Bolingbroke <batterseapower@hotmail.com>**20111016110852
 Ignore-this: 33d1cc9683e9e3e421c2ca54dc745de0
] 
[Allow Haddock to be configured from the 'install' command
Max Bolingbroke <batterseapower@hotmail.com>**20111015170101
 Ignore-this: af173867f239b0259490445f27756ad9
] 
[Rename the cabal directory to Cabal
Ian Lynagh <igloo@earth.li>**20111023151002
 Ignore-this: ff444b152bfc981496c6e2d2206a4953
 
 Makes things a little simpler in GHC's build system if libraries are in
 the same directory as their name.
] 
[Change Safe Haskell package trust default to untrusted
David Terei <davidterei@gmail.com>**20111018033319
 Ignore-this: 2b7ea14f983abf92b8c7dca67b280d4a
] 
[Install phase pulls in benchmark dependencies when necessary
Johan Tibell <johan.tibell@gmail.com>**20111012210035
 Ignore-this: 9b055441a6fec970fbb2aaa6f4cb4406
] 
[Include benchmarks in product of 'setup sdist'
Johan Tibell <johan.tibell@gmail.com>**20111012205036
 Ignore-this: 216583b2d9ae5312aaf3da043bf45b6
] 
[Add unit test for building benchmarks
Johan Tibell <johan.tibell@gmail.com>**20111012154138
 Ignore-this: b66404f7b8829e67223c0222cbc98b10
] 
[Build executable benchmarks
Johan Tibell <johan.tibell@gmail.com>**20111012143034
 Ignore-this: 26ba0c0ab2476bef33c2e4c0b2e0c8d9
 Benchmarks are treated just like test suites in that a dummy
 Executable is created and built.
] 
[Add unit test for benchmark section
Johan Tibell <johan.tibell@gmail.com>**20111011195847
 Ignore-this: 672f8848e5ce9cb2e321894506176b3e
] 
[Implement 'configure' and preprocessing for benchmarks
Johan Tibell <johan.tibell@gmail.com>**20111011194838
 Ignore-this: 519cfe1fd6bb6ac0ccc4f10d2d037897
] 
[Parse the --{enable,disable}-benchmarks command line flag
Johan Tibell <johan.tibell@gmail.com>**20111011192349
 Ignore-this: 268674c925d07184b6efc11a38d65d6f
] 
[Parse 'benchmark' sections and handle configurations (flags) for benchmarks
Johan Tibell <johan.tibell@gmail.com>**20111011191515
 Ignore-this: e6b671538374a5db09b995ab1a233ce2
] 
[Add a Benchmark data type for representing 'benchmark' sections
Johan Tibell <johan.tibell@gmail.com>**20111011175849
 Ignore-this: aba4698167e15db635302e577b871b1b
] 
[Use the configured proxy even for uploading build reports
Max Bolingbroke <batterseapower@hotmail.com>**20110928210859
 Ignore-this: 189a21577bfe5a651850feda891955e2
] 
[GHC 7.2+ no longer generates _stub.o files
Duncan Coutts <duncan@community.haskell.org>**20110910195329
 Ignore-this: e7b432affc79e4d7c418c03be7e55acc
 So stop looking for them. This could otherwise cause problems if one
 switches ghc version without cleaning the build dir since we'll pick
 up the old _stub.o files and end up with duplicate linker symbols.
] 
[Use a PVP-style version as the default for cabal init
Duncan Coutts <duncan@community.haskell.org>**20110925021722
 Ignore-this: 58c054d082254c4bcf26cd4601317f2
] 
[Filter autogenerated modules from test suite build info when doing sdist.
Thomas Tuegel <ttuegel@gmail.com>**20110923201806
 Ignore-this: 6f1eb9a1af8fad0442544d05d2568db9
] 
[Change extension name to "ConstraintKinds"
Duncan Coutts <duncan@community.haskell.org>**20110908220819
 Ignore-this: a5faf4ded03ba1394278c810a8136bf2
 For consistency with the rest of the extensions. Requested by SPJ.
] 
[Add the ConstraintKind extension
Max Bolingbroke <batterseapower@hotmail.com>**20110906094145
 Ignore-this: 838aa67afada51bc8f023a24531a0d0d
] 
[Fix a typo in a QA message
Duncan Coutts <duncan@community.haskell.org>**20110905001515
 Ignore-this: e906b589e4acea1121ac193998696751
] 
[Better error message for unknown build types
Duncan Coutts <duncan@community.haskell.org>**20110901114046
 Ignore-this: 91989561ff78edbe3d72b7d569db4561
] 
[Consistent import of Text.PrettyPrint
David Terei <davidterei@gmail.com>**20110825180411
 Ignore-this: 785b7c0aaad8b997678c1e68b90502f8
] 
[Drop assertion checking in the old solver
Duncan Coutts <duncan@community.haskell.org>**20110818172118
 Ignore-this: a516461e7f19e2aa2109fc905ac85
 Make it a bit faster.
] 
[Update version constraint on the Cabal library, for 1.12 release.
Duncan Coutts <duncan@community.haskell.org>**20110818171955
 Ignore-this: 870a523382e1e0cec2b5cd033c778359
] 
[Add cabal sdist --zip flag for creating zip archives
Duncan Coutts <duncan@community.haskell.org>**20110818171721
 Ignore-this: 86469c0f4f4b72d58b6278c3ef692901
 Handy if you want to send sources to people who do not grok .tar.gz
 Requires that the 'zip' program be installed (unlike for .tar.gz where
 we do it internally so that it works on all systems).
] 
[Relax cabal-install's deps for ghc-7.2
Duncan Coutts <duncan@community.haskell.org>**20110812110846
 Ignore-this: 1524732bffa5cc04e5d475ec4c4f12d8
] 
[Fix the repo location
Duncan Coutts <duncan@community.haskell.org>**20110812110820
 Ignore-this: 1ed9152864fc3336c82495904b1e5612
] 
[Improve the error message emitted when multiple .cabal files are found
Duncan Coutts <duncan@community.haskell.org>**20110508223014
 Ignore-this: 1c96d4f42fe55094f07b0573bb80fda1
] 
[Add Safe Haskell flags to known extensions
David Terei <davidterei@gmail.com>**20110810201543
 Ignore-this: 9e0a42de1539e1a56d72f9a7ecdf554c
] 
[Change trusted property to be true by default
David Terei <davidterei@gmail.com>**20110808223228
 Ignore-this: c46cf169c46b809cf457678f77e02b20
] 
[Fix for intra-package build-tools dependencies
Duncan Coutts <duncan@community.haskell.org>**20110808165045
 Ignore-this: 83f148981c7d8d3c616027975ee8f59a
] 
[Simplify some code in Program.Hpc slightly
Duncan Coutts <duncan@community.haskell.org>**20110726001531
 Ignore-this: d7ea77d1f072f7071fc709e0c9a38ded
] 
[Added Distribution.Simple.Program.Hpc.
Thomas Tuegel <ttuegel@gmail.com>**20110719004251
 Ignore-this: a988f4262e4f52c8ae0a3ca5715a636e
] 
[Restore graceful failure upon invoking "cabal test" before "cabal build".
Thomas Tuegel <ttuegel@gmail.com>**20110719002218
 Ignore-this: 2096a4cfad17eb67ef26bb15a8b3a066
] 
[Fix executable test suite unit test for improved HPC interface.
Thomas Tuegel <ttuegel@gmail.com>**20110718033150
 Ignore-this: b543b01721940b23aac7bd46282425b1
] 
[Generate aggregate coverage statistics from all test suites in package.
Thomas Tuegel <ttuegel@gmail.com>**20110718050448
 Ignore-this: bff5f3167ab61da015b8fcb7c4f77cdc
] 
[Invoke HPC using D.S.Program utilities.
Thomas Tuegel <ttuegel@gmail.com>**20110718045949
 Ignore-this: 37e1f01f594dd522c5328b397ac0e94d
 This patch also reorganizes the HPC output directories for consistency. All
 files related to HPC are now located in the "dist/hpc" directory.
] 
[Fix cabal haddock for packages with internal dependencies
Duncan Coutts <duncan@community.haskell.org>**20110718235728
 Ignore-this: 86cdab6325a86875e9ae592881b4f54f
] 
[Update cabal sdist to follow the changes in the Cabal lib
Duncan Coutts <duncan@community.haskell.org>**20110717223648
 Ignore-this: 1136aa98cb024a10250ea75ec8633a2c
] 
[Added unit test for test options.
Thomas Tuegel <ttuegel@gmail.com>**20110521164529
 Ignore-this: 3dc94c06cdfacf20cf000682370fbf3
] 
[Fixed crash on Windows due to file handle leak.
Thomas Tuegel <ttuegel@gmail.com>**20110518030422
 Ignore-this: c94eb903aef9ffcf52394a821d245dda
 Ticket #843. Cabal test crashed when trying to delete a temporary log file
 because 'readFile' reads unnecessarily lazily and was keeping a file handle
 open during attempted deletion. This patch forces the entire file to be read
 so the handle will be closed.
] 
[Stop cabal-install from duplicating test options.
Thomas Tuegel <ttuegel@gmail.com>**20110521232047
 Ignore-this: 55b98ab47306178e355cacedc7a5a6d2
] 
[Fix use of multiple test options.
Thomas Tuegel <ttuegel@gmail.com>**20110521223029
 Ignore-this: c694ad21faab23abb7157ccec700ccf2
] 
[Don't prefix test output with ">>>".
Thomas Tuegel <ttuegel@gmail.com>**20110708035007
 Ignore-this: a9d417eb836c641339a0203d1c36e82e
 Ticket #848. Removing the prefix brings "cabal test" in line with other cabal
 commands, which do not prefix their output, either. Prior to this patch, the
 summary notices which appear before and after each test suite were written to
 the temporary log file along with the stdio from the test executable; this would
 lead to duplicate notices when the contents of the temporary log file are read
 onto the console. After this patch, the summary notices are never written to the
 temporary log file, only to the console and the final log file (which is never
 read by Cabal), removing the confusing duplicate notices.
] 
[Fail gracefully when running "setup test" before "setup build".
Thomas Tuegel <ttuegel@gmail.com>**20110303164611
 Ignore-this: a4d818cd7702ddbbbbffc8679abeb85d
] 
[Bump cabal-install version
Duncan Coutts <duncan@community.haskell.org>**20110708013248
 Ignore-this: 16626faad564787fc5ae3808d1e6ccc9
] 
[Bump Cabal lib version
Duncan Coutts <duncan@community.haskell.org>**20110708013245
 Ignore-this: e01c7efbb68856167c227ba118ddce33
] 
[Couple of trivial code changes
Duncan Coutts <duncan@community.haskell.org>**20110708013012
 Ignore-this: b98aaac9e33f8c684cefedcd05d37ee2
] 
[Fix withComponentsLBI and move Components to LocalBuildInfo module
Duncan Coutts <duncan@community.haskell.org>**20110708012122
 Ignore-this: 57217119f7825c9bcd3824a34ecd0c8f
 An annoyance of the current Simple build system is that each phase
 (build, install, etc) can be passed additional HookedBuildInfo which
 gets merged into the PackageDescription. This means that we cannot
 process the PackageDescription up front at configure time and just
 store and reuse it later, we have to work from it each time afresh.
 
 The recent addition of Components (libs, exes, test suites) and a
 topoligical sort of the components in the LocalBuildInfo fell foul
 of this annoyance. The LocalBuildInfo stored the entire component
 which meant they were not updated with the HookedBuildInfo. This
 broke packages with custom Setup.hs scripts that took advantage of
 the HookedBuildInfo feature, including those with configure scripts.
 
 The solution is to store not the list of whole components but the
 list of component names. Then withComponentsLBI retrieves the actual
 components from the PackageDescription which thus includes the
 HookedBuildInfo.
 
 Also moved the Components into an internal module because (for the
 moment at least) it is part of the Simple build system, not part of
 the package description.
] 
[Relax some dependencies
Ian Lynagh <igloo@earth.li>**20110706192619
 Ignore-this: 6353c1d64a2fff3cef3ca0d8a9f2e95e
] 
[Add files needed by the GHC build system
Ian Lynagh <igloo@earth.li>**20110624003654
 Ignore-this: a40dd98104e994d1a1648c3ce2676a45
] 
[Add a dash separator for pid in createTempDirectory and openBinaryTempFile too
Jens Petersen <juhp@community.haskell.org>**20110519021658
 Ignore-this: ee0c842388212326579309ac6f93408f
] 
[Update changelog for 1.10.2.0
Duncan Coutts <duncan@community.haskell.org>**20110618190748
 Ignore-this: 64129f45dd16d2d93c82097530dc15d1
] 
[TAG cabal-install merged
Duncan Coutts <duncan@community.haskell.org>**20110619135228
 Ignore-this: 58d670de46a24046d0b869dc2b88e13a
 We now have both the Cabal library and the cabal-install tool
 together in the same repo, each in a subdir.
     
 The idea is that this will make splitting packages and moving
 code between package rather easier in future.
] 
Patch bundle hash:
d256bfe8948c5ea0ccdaa10609570bf34724475f