ui, web, api: package.yaml: similar cleanups

This commit is contained in:
Simon Michael 2017-08-25 16:31:54 -07:00
parent 8e35bfdfc8
commit c3ba45cd48
5 changed files with 120 additions and 113 deletions

View File

@ -18,14 +18,19 @@ maintainer: Simon Michael <simon@joyful.com>
github: simonmichael/hledger
homepage: http://hledger.org
bug-reports: http://bugs.hledger.org
stability: alpha
tested-with: GHC==7.10.3, GHC==8.0
extra-source-files:
- CHANGES
- README
- examples/*.html
data-files:
- doc/hledger-api.1
- doc/hledger-api.1.txt
- doc/hledger-api.1.info
dependencies:
- hledger-lib >= 1.3.99 && < 1.4
- hledger >= 1.3.99 && < 1.4
@ -47,10 +52,9 @@ dependencies:
- wai
- wai-extra
- warp
executables:
hledger-api:
main: hledger-api.hs
ghc-options: -threaded
cpp-options: -DVERSION="1.3.99"
stability: alpha
tested-with: GHC==7.10.3, GHC==8.0

View File

@ -87,8 +87,6 @@ executable hledger-ui
build-depends:
brick >= 0.12 && < 0.25
, vty >= 5.5 && < 5.18
if flag(threaded)
ghc-options: -threaded
if flag(oldtime)
build-depends:
time < 1.5
@ -96,6 +94,8 @@ executable hledger-ui
else
build-depends:
time >= 1.5
if flag(threaded)
ghc-options: -threaded
other-modules:
Hledger.UI
Hledger.UI.AccountsScreen

View File

@ -19,13 +19,18 @@ maintainer : Simon Michael <simon@joyful.com>
github : simonmichael/hledger
homepage : http://hledger.org
bug-reports : http://bugs.hledger.org
stability : stable
tested-with : GHC==7.10.3, GHC==8.0
extra-source-files:
- CHANGES
- README
data-files:
- doc/hledger-ui.1
- doc/hledger-ui.1.txt
- doc/hledger-ui.1.info
flags:
threaded:
description: Build with support for multithreaded execution
@ -35,7 +40,62 @@ flags:
description: If building with time < 1.5, also depend on old-locale. Set automatically by cabal.
manual: false
default: false
cpp-options: -DVERSION="1.3.99"
dependencies:
- hledger >= 1.3.99 && < 1.4
- hledger-lib >= 1.3.99 && < 1.4
- ansi-terminal >= 0.6.2.3 && < 0.7
- async
- base >= 4.8 && < 5
- base-compat >= 0.8.1
- cmdargs >= 0.8
- containers
- data-default
- directory
- filepath
- fsnotify >= 0.2 && < 0.3
- HUnit
- microlens >= 0.4 && < 0.5
- microlens-platform >= 0.2.3.1 && < 0.4
- megaparsec >=5.0 && < 6.2
- pretty-show >=1.6.4
- process >= 1.2
- safe >= 0.2
- split >= 0.1 && < 0.3
- text >= 1.2 && < 1.3
- text-zipper >= 0.4 && < 0.11
- transformers
- vector
when:
# curses is required to build terminfo for vty for hledger-ui.
# On POSIX systems it might be not present.
# On windows it's very likely not present, but possibly it could be.
# Ideally we'd like to
# on POSIX: give a clear error ("install your system libcurses-dev package") if not present
# on windows: quietly skip building if not present, build if it is present
# curses
# default: True
# description:
# For now, just don't build hledger-ui on windows
- condition: os(windows)
then:
buildable: false
else:
dependencies:
- brick >= 0.12 && < 0.25
- vty >= 5.5 && < 5.18
- condition: flag(oldtime)
then:
dependencies:
- time < 1.5
- old-locale
else:
dependencies:
- time >= 1.5
executables:
hledger-ui:
source-dirs: .
@ -47,58 +107,6 @@ executables:
-fno-warn-missing-signatures
-fno-warn-type-defaults
-fno-warn-orphans
dependencies:
- hledger >= 1.3.99 && < 1.4
- hledger-lib >= 1.3.99 && < 1.4
- ansi-terminal >= 0.6.2.3 && < 0.7
- async
- base >= 4.8 && < 5
- base-compat >= 0.8.1
- cmdargs >= 0.8
- containers
- data-default
- directory
- filepath
- fsnotify >= 0.2 && < 0.3
- HUnit
- microlens >= 0.4 && < 0.5
- microlens-platform >= 0.2.3.1 && < 0.4
- megaparsec >=5.0 && < 6.2
- pretty-show >=1.6.4
- process >= 1.2
- safe >= 0.2
- split >= 0.1 && < 0.3
- text >= 1.2 && < 1.3
- text-zipper >= 0.4 && < 0.11
- transformers
- vector
when:
# curses is required to build terminfo for vty for hledger-ui.
# On POSIX systems it might be not present.
# On windows it's very likely not present, but possibly it could be.
# Ideally we'd like to
# on POSIX: give a clear error ("install your system libcurses-dev package") if not present
# on windows: quietly skip building if not present, build if it is present
# curses
# default: True
# description:
# For now, just don't build hledger-ui on windows
- condition: os(windows)
then:
buildable: false
else:
dependencies:
- brick >= 0.12 && < 0.25
- vty >= 5.5 && < 5.18
- condition: flag(threaded)
ghc-options: -threaded
- condition: flag(oldtime)
then:
dependencies:
- time < 1.5
- old-locale
else:
dependencies:
- time >= 1.5
stability : stable
tested-with : GHC==7.10.3, GHC==8.0
- condition: flag(threaded)
ghc-options: -threaded

View File

@ -161,8 +161,11 @@ library
, json
, megaparsec >=5.0 && < 6.2
, mtl
, parsec >=3
if (flag(dev)) || (flag(library-only))
cpp-options: -DDEVELOPMENT
if flag(dev)
ghc-options: -O0
if flag(oldtime)
build-depends:
time <1.5
@ -233,16 +236,14 @@ executable hledger-web
, yesod-form
, yesod-static
, json
, megaparsec >=5.0 && < 6.2
, mtl
, parsec >=3
, hledger-web
if flag(library-only)
buildable: False
if flag(threaded)
ghc-options: -threaded
if (flag(dev)) || (flag(library-only))
cpp-options: -DDEVELOPMENT
if flag(dev)
ghc-options: -O0
if flag(dev)
cpp-options: -DDEVELOPMENT
if flag(oldtime)
build-depends:
time <1.5
@ -253,6 +254,10 @@ executable hledger-web
if impl(ghc <7.6)
build-depends:
ghc-prim
if flag(library-only)
buildable: False
if flag(threaded)
ghc-options: -threaded
default-language: Haskell2010
test-suite test
@ -295,9 +300,16 @@ test-suite test
, yesod-form
, yesod-static
, json
, megaparsec >=5.0 && < 6.2
, mtl
, parsec >=3
, hledger-web
, hspec
, yesod-test
if (flag(dev)) || (flag(library-only))
cpp-options: -DDEVELOPMENT
if flag(dev)
ghc-options: -O0
if flag(oldtime)
build-depends:
time <1.5

View File

@ -19,6 +19,9 @@ maintainer: Simon Michael <simon@joyful.com>
github: simonmichael/hledger
homepage: http://hledger.org
bug-reports: http://bugs.hledger.org
stability: stable
tested-with: GHC==7.10.3, GHC==8.0
extra-source-files:
- CHANGES
- README
@ -38,10 +41,12 @@ extra-source-files:
- static/hledger.js
- static/js/*.js
- templates/*.hamlet
data-files:
- doc/hledger-web.1
- doc/hledger-web.1.txt
- doc/hledger-web.1.info
flags:
library-only:
description: Build for use with "yesod devel"
@ -59,6 +64,7 @@ flags:
description: If building with time < 1.5, also depend on old-locale. Set automatically by cabal.
manual: false
default: false
dependencies:
- hledger-lib >= 1.3.99 && < 1.4
- hledger >= 1.3.99 && < 1.4
@ -92,6 +98,27 @@ dependencies:
- yesod-form
- yesod-static
- json
- megaparsec >=5.0 && < 6.2
- mtl
- parsec >=3
when:
- condition: (flag(dev)) || (flag(library-only))
cpp-options: -DDEVELOPMENT
- condition: flag(dev)
ghc-options: -O0
- condition: flag(oldtime)
then:
dependencies:
- time <1.5
- old-locale
else:
dependencies:
- time >=1.5
- condition: impl(ghc <7.6)
dependencies:
- ghc-prim
ghc-options:
- -Wall
- -fno-warn-unused-do-bind
@ -99,6 +126,7 @@ ghc-options:
- -fno-warn-missing-signatures
- -fno-warn-type-defaults
- -fno-warn-orphans
library:
cpp-options: -DVERSION="1.3.99"
exposed-modules:
@ -118,71 +146,26 @@ library:
- Settings
- Settings.Development
- Settings.StaticFiles
dependencies:
- megaparsec >=5.0 && < 6.2
- mtl
when:
- condition: (flag(dev)) || (flag(library-only))
cpp-options: -DDEVELOPMENT
- condition: flag(oldtime)
then:
dependencies:
- time <1.5
- old-locale
else:
dependencies:
- time >=1.5
- condition: impl(ghc <7.6)
dependencies:
- ghc-prim
executables:
hledger-web:
main: main.hs
source-dirs: app
main: main.hs
cpp-options: -DVERSION="1.3.99"
dependencies:
- parsec >=3
- hledger-web
when:
- condition: flag(library-only)
buildable: false
- condition: flag(threaded)
ghc-options: -threaded
- condition: flag(dev)
ghc-options: -O0
- condition: flag(dev)
cpp-options: -DDEVELOPMENT
- condition: flag(oldtime)
then:
dependencies:
- time <1.5
- old-locale
else:
dependencies:
- time >=1.5
- condition: impl(ghc <7.6)
dependencies:
- ghc-prim
tests:
test:
main: main.hs
source-dirs: tests
main: main.hs
cpp-options: -DVERSION="1.3.99"
dependencies:
- hledger-web
- hspec
- yesod-test
when:
- condition: flag(oldtime)
then:
dependencies:
- time <1.5
- old-locale
else:
dependencies:
- time >=1.5
- condition: impl(ghc <7.6)
dependencies:
- ghc-prim
stability: stable
tested-with: GHC==7.10.3, GHC==8.0