Skip to content

Commit 5b27278

Browse files
authored
Merge pull request haskell#62 from hvr/pr/simple-buildtype
Change to simple build-type & minor ver increment
2 parents d6b5bbb + d98ba27 commit 5b27278

File tree

2 files changed

+4
-31
lines changed

2 files changed

+4
-31
lines changed

Setup.hs

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,2 @@
1-
import Distribution.System
2-
import Distribution.PackageDescription
31
import Distribution.Simple
4-
import Distribution.Simple.Setup
5-
6-
import Control.Monad(when)
7-
8-
main :: IO ()
9-
main = defaultMainWithHooks myHooks
10-
11-
myHooks :: UserHooks
12-
myHooks
13-
| buildOS == Windows = simpleUserHooks
14-
| otherwise = simpleUserHooks {
15-
confHook = \genericDescript flags -> do
16-
warnIfNotTerminfo flags
17-
confHook simpleUserHooks genericDescript flags
18-
}
19-
20-
warnIfNotTerminfo flags = when (not (hasFlagSet flags (FlagName "terminfo")))
21-
$ mapM_ putStrLn
22-
[ "*** Warning: running on POSIX but not building the terminfo backend. ***"
23-
, "You may need to install the terminfo package manually, e.g. with"
24-
, "\"cabal install terminfo\"; or, use \"-fterminfo\" when configuring or"
25-
, "installing this package."
26-
,""
27-
]
28-
29-
hasFlagSet :: ConfigFlags -> FlagName -> Bool
30-
hasFlagSet cflags flag = Just True == lookup flag (configConfigurationsFlags cflags)
2+
main = defaultMain

haskeline.cabal

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Name: haskeline
22
Cabal-Version: >=1.10
3-
Version: 0.7.3.1
3+
Version: 0.7.4.0
44
Category: User Interfaces
55
License: BSD3
66
License-File: LICENSE
@@ -19,7 +19,7 @@ Description:
1919
Homepage: http://trac.haskell.org/haskeline
2020
Bug-Reports: https://github.com/judah/haskeline/issues
2121
Stability: Stable
22-
Build-Type: Custom
22+
Build-Type: Simple
2323
extra-source-files: examples/Test.hs Changelog includes/*.h
2424

2525
source-repository head
@@ -37,6 +37,7 @@ source-repository head
3737
flag terminfo
3838
Description: Use the terminfo package for POSIX consoles.
3939
Default: True
40+
Manual: True
4041

4142
Library
4243
-- We require ghc>=7.4.1 (base>=4.5) to use the base library encodings, even

0 commit comments

Comments
 (0)