Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/068d4f77b58fa7b4aff4a7a0ff95413d0cb012ca >--------------------------------------------------------------- commit 068d4f77b58fa7b4aff4a7a0ff95413d0cb012ca Author: Johan Tibell <[email protected]> Date: Tue Oct 11 19:23:49 2011 +0000 Parse the --{enable,disable}-benchmarks command line flag >--------------------------------------------------------------- cabal/Distribution/Simple/Setup.hs | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/cabal/Distribution/Simple/Setup.hs b/cabal/Distribution/Simple/Setup.hs index 62785c7..148755e 100644 --- a/cabal/Distribution/Simple/Setup.hs +++ b/cabal/Distribution/Simple/Setup.hs @@ -292,6 +292,7 @@ data ConfigFlags = ConfigFlags { -- dependencies configConfigurationsFlags :: FlagAssignment, configTests :: Flag Bool, -- ^Enable test suite compilation + configBenchmarks :: Flag Bool, -- ^Enable benchmark compilation configLibCoverage :: Flag Bool -- ^ Enable test suite program coverage } deriving (Read,Show) @@ -315,6 +316,7 @@ defaultConfigFlags progConf = emptyConfigFlags { configSplitObjs = Flag False, -- takes longer, so turn off by default configStripExes = Flag True, configTests = Flag False, + configBenchmarks = Flag False, configLibCoverage = Flag False } @@ -478,6 +480,10 @@ configureOptions showOrParseArgs = "build library and test suites with Haskell Program Coverage enabled. (GHC only)" configLibCoverage (\v flags -> flags { configLibCoverage = v }) (boolOpt [] []) + ,option "" ["benchmarks"] + "dependency checking and compilation for benchmarkss listed in the package description file." + configBenchmarks (\v flags -> flags { configBenchmarks = v }) + (boolOpt [] []) ] where readFlagList :: String -> FlagAssignment @@ -587,7 +593,8 @@ instance Monoid ConfigFlags where configExtraIncludeDirs = mempty, configConfigurationsFlags = mempty, configTests = mempty, - configLibCoverage = mempty + configLibCoverage = mempty, + configBenchmarks = mempty } mappend a b = ConfigFlags { configPrograms = configPrograms b, @@ -619,7 +626,8 @@ instance Monoid ConfigFlags where configExtraIncludeDirs = combine configExtraIncludeDirs, configConfigurationsFlags = combine configConfigurationsFlags, configTests = combine configTests, - configLibCoverage = combine configLibCoverage + configLibCoverage = combine configLibCoverage, + configBenchmarks = combine configBenchmarks } where combine field = field a `mappend` field b _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
