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

2017-08-25 16:31:54 -07:00 · 2017-08-25 16:31:54 -07:00 · c3ba45cd48
commit c3ba45cd48
parent 8e35bfdfc8
5 changed files with 120 additions and 113 deletions
--- a/hledger-api/package.yaml
+++ b/hledger-api/package.yaml
@ -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
--- a/hledger-ui/hledger-ui.cabal
+++ b/hledger-ui/hledger-ui.cabal
@ -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
--- a/hledger-ui/package.yaml
+++ b/hledger-ui/package.yaml
@ -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,18 +40,9 @@ 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"
-executables:
-  hledger-ui:
-    source-dirs: .
-    main: hledger-ui.hs
-    ghc-options:
-      -Wall
-      -fno-warn-unused-do-bind
-      -fno-warn-name-shadowing
-      -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
@ -72,6 +68,7 @@ executables:
 - 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.
@ -90,8 +87,6 @@ executables:
     dependencies:
       - brick >= 0.12 && < 0.25
       - vty >= 5.5 && < 5.18
-      - condition: flag(threaded)
-        ghc-options: -threaded
 - condition: flag(oldtime)
   then:
     dependencies:
@ -100,5 +95,18 @@ executables:
   else:
     dependencies:
       - time >= 1.5
-stability   : stable
-tested-with : GHC==7.10.3, GHC==8.0
+
+executables:
+  hledger-ui:
+    source-dirs: .
+    main: hledger-ui.hs
+    ghc-options:
+      -Wall
+      -fno-warn-unused-do-bind
+      -fno-warn-name-shadowing
+      -fno-warn-missing-signatures
+      -fno-warn-type-defaults
+      -fno-warn-orphans
+    when:
+    - condition: flag(threaded)
+      ghc-options: -threaded
--- a/hledger-web/hledger-web.cabal
+++ b/hledger-web/hledger-web.cabal
@ -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
--- a/hledger-web/package.yaml
+++ b/hledger-web/package.yaml
@ -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