b473c6a · typeable/http-api-data

git.iko.soy/typeable/http-api-data

allow newer in all cabal execs

commitb473c6ac6d7e2fca1a5cb8d106afa5dd74d81ad0 authorOleg Grenrus <oleg.grenrus@iki.fi> dateFri 13 Jan 2017, 09:31 (10 years ago) parentbfb81b2

2 files changed+10−17

compare with master

unifiedsplit

.travis.yml+2−2 Setup.lhs+8−15

.travis.yml+2−2

@@ -90,7 +90,7 @@ script:

9090 - cabal new-build ${CABALFLAGS} -w ${HC} --disable-tests --disable-benchmarks --flag http-api-data:use-text-show

9191 # this builds all libraries and executables (including tests/benchmarks)

9292 # - rm -rf ./dist-newstyle

93− - cabal new-build -w ${HC} ${TEST} ${BENCH}

93+ - cabal new-build ${CABALFLAGS} -w ${HC} ${TEST} ${BENCH}

9494

9595 # there's no 'cabal new-test' yet, so let's emulate for now

9696 - TESTS=( $(awk 'tolower($0) ~ /^test-suite / { print $2 }' *.cabal) )

@@ -100,7 +100,7 @@ script:

100100 if dist-newstyle/build/**/$SRC_BASENAME/**/build/$T/$T; then echo "= $T OK =";

101101 else echo "= $T FAILED ="; RC=false; fi; done; $RC

102102

103− - cabal new-build -w ${HC} ${TEST} ${BENCH} --flag http-api-data:use-text-show

103+ - cabal new-build ${CABALFLAGS} -w ${HC} ${TEST} ${BENCH} --flag http-api-data:use-text-show

104104 - shopt -s globstar;

105105 RC=true; for T in ${TESTS[@]}; do echo "== $T ==";

106106 if dist-newstyle/build/**/$SRC_BASENAME/**/build/$T/$T; then echo "= $T OK =";

Setup.lhs+8−15

@@ -8,18 +8,18 @@

88#endif

99module Main (main) where

1010

11+import Control.Monad ( when )

1112import Data.List ( nub )

1213import Distribution.Package ( InstalledPackageId )

13−import Distribution.Package ( PackageId, Package (..), packageVersion, packageName )

14+import Distribution.Package ( PackageId, Package (..), packageVersion )

1415import Distribution.PackageDescription ( PackageDescription(), TestSuite(..) , Library (..), BuildInfo (..))

1516import Distribution.Simple ( defaultMainWithHooks, UserHooks(..), simpleUserHooks )

16−import Distribution.Simple.Utils ( rewriteFile, createDirectoryIfMissingVerbose, copyFiles )

17+import Distribution.Simple.Utils ( rewriteFile, createDirectoryIfMissingVerbose )

1718import Distribution.Simple.BuildPaths ( autogenModulesDir )

18−import Distribution.Simple.Setup ( BuildFlags(buildDistPref, buildVerbosity), Flag(..), fromFlag, HaddockFlags(haddockDistPref))

19−import Distribution.Simple.LocalBuildInfo ( withPackageDB, withLibLBI, withTestLBI, LocalBuildInfo(), ComponentLocalBuildInfo(componentPackageDeps), compiler, buildDir )

19+import Distribution.Simple.Setup ( BuildFlags(buildDistPref, buildVerbosity), fromFlag)

20+import Distribution.Simple.LocalBuildInfo ( withPackageDB, withLibLBI, withTestLBI, LocalBuildInfo(), ComponentLocalBuildInfo(componentPackageDeps), compiler )

2021import Distribution.Simple.Compiler ( showCompilerId , PackageDB (..))

2122import Distribution.Text ( display , simpleParse )

22−import Distribution.Verbosity ( Verbosity, normal )

2323import System.FilePath ( (</>) )

2424

2525#if MIN_VERSION_Cabal(1,25,0)

@@ -33,13 +33,6 @@ main = defaultMainWithHooks simpleUserHooks

3333 buildHook simpleUserHooks pkg lbi hooks flags

3434 }

3535

36−haddockOutputDir :: Package p => HaddockFlags -> p -> FilePath

37−haddockOutputDir flags pkg = destDir where

38− baseDir = case haddockDistPref flags of

39− NoFlag -> "."

40− Flag x -> x

41− destDir = baseDir </> "doc" </> "html" </> display (packageName pkg)

42−

4336generateBuildModule :: BuildFlags -> PackageDescription -> LocalBuildInfo -> IO ()

4437generateBuildModule flags pkg lbi = do

4538 let verbosity = fromFlag (buildVerbosity flags)

@@ -49,7 +42,6 @@ generateBuildModule flags pkg lbi = do

4942 let dbStack = withPackageDB lbi ++ [ SpecificPackageDB $ distPref </> "package.conf.inplace" ]

5043 let dbFlags = "-hide-all-packages" : packageDbArgs dbStack

5144

52− let bdir = buildDir lbi

5345 withLibLBI pkg lbi $ \lib libcfg -> do

5446 let libBI = libBuildInfo lib

5547

@@ -67,8 +59,9 @@ generateBuildModule flags pkg lbi = do

6759 -- CPP includes, i.e. include cabal_macros.h

6860 let cppFlags = [ "-optP-include", "-optP" ++ libAutogenDir ++ "/cabal_macros.h" ]

6961

70− withTestLBI pkg lbi $ \suite suitecfg -> do

71− -- when (testName suite == "doctests") $ we need IsString instance

62+ -- Actually we need to check whether testName suite == "doctests"

63+ -- pending https://github.com/haskell/cabal/pull/4229 getting into GHC HEAD tree

64+ withTestLBI pkg lbi $ \suite suitecfg -> when (testName suite == testName suite) $ do

7265

7366 -- get and create autogen dir

7467#if MIN_VERSION_Cabal(1,25,0)