bump version strings & bounds to 1.5

This commit is contained in:
Simon Michael 2017-12-31 10:16:49 -08:00
parent 7921f0cf44
commit 52c3884ab7
9 changed files with 25 additions and 24 deletions

View File

@ -1 +1 @@
1.4.99 1.5

View File

@ -8,7 +8,7 @@ m4_define({{_webcombined_}}, m4_ifdef({{WEB && COMBINED}},{{$1}}) )m4_dnl
m4_dnl m4_dnl
m4_define({{_author_}}, {{}})m4_dnl m4_define({{_author_}}, {{}})m4_dnl
m4_define({{_monthyear_}}, {{December 2017}})m4_dnl m4_define({{_monthyear_}}, {{December 2017}})m4_dnl
m4_define({{_version_}}, {{1.4.99}})m4_dnl m4_define({{_version_}}, {{1.5}})m4_dnl
m4_dnl m4_dnl
m4_dnl Links to dev and recent release versions of a manual. m4_dnl Links to dev and recent release versions of a manual.
m4_dnl $1 is the manual's web slug: hledger, hledger-ui, journal, csv etc. m4_dnl $1 is the manual's web slug: hledger, hledger-ui, journal, csv etc.

View File

@ -36,12 +36,12 @@ import Text.Printf
import Hledger.Query import Hledger.Query
import Hledger.Cli hiding (Reader, version) import Hledger.Cli hiding (Reader, version)
hledgerApiVersion="1.4.99" hledgerApiVersion="1.5"
-- https://github.com/docopt/docopt.hs#readme -- https://github.com/docopt/docopt.hs#readme
doc :: Docopt doc :: Docopt
doc = [docopt| doc = [docopt|
hledger-api 1.4.99 hledger-api 1.5
Serves hledger data and reports as a JSON web API. Serves hledger data and reports as a JSON web API.

View File

@ -1,5 +1,5 @@
name: hledger-api name: hledger-api
version: '1.4.99' version: '1.5'
synopsis: Web API server for the hledger accounting tool synopsis: Web API server for the hledger accounting tool
description: | description: |
This is a simple web API server for hledger data. This is a simple web API server for hledger data.
@ -32,8 +32,8 @@ data-files:
- hledger-api.info - hledger-api.info
dependencies: dependencies:
- hledger-lib >=1.4.99 && <1.5 - hledger-lib >=1.5 && <1.6
- hledger >=1.4.99 && <1.5 - hledger >=1.5 && <1.6
- base >=4.8 && <5 - base >=4.8 && <5
- aeson - aeson
- bytestring - bytestring
@ -57,4 +57,4 @@ executables:
hledger-api: hledger-api:
main: hledger-api.hs main: hledger-api.hs
ghc-options: -threaded ghc-options: -threaded
cpp-options: -DVERSION="1.4.99" cpp-options: -DVERSION="1.5"

View File

@ -1,5 +1,5 @@
name: hledger-lib name: hledger-lib
version: '1.4.99' version: '1.5'
synopsis: Core data types, parsers and functionality for the hledger accounting tools synopsis: Core data types, parsers and functionality for the hledger accounting tools
description: | description: |
This is a reusable library containing hledger's core functionality. This is a reusable library containing hledger's core functionality.

View File

@ -1,5 +1,5 @@
name : hledger-ui name : hledger-ui
version : '1.4.99' version : '1.5'
synopsis : Curses-style user interface for the hledger accounting tool synopsis : Curses-style user interface for the hledger accounting tool
description : | description : |
This is hledger's curses-style interface. This is hledger's curses-style interface.
@ -37,11 +37,11 @@ flags:
manual: false manual: false
default: true default: true
cpp-options: -DVERSION="1.4.99" cpp-options: -DVERSION="1.5"
dependencies: dependencies:
- hledger >=1.4.99 && <1.5 - hledger >=1.5 && <1.6
- hledger-lib >=1.4.99 && <1.5 - hledger-lib >=1.5 && <1.6
- ansi-terminal >=0.6.2.3 - ansi-terminal >=0.6.2.3
- async - async
- base >=4.8 && <5 - base >=4.8 && <5

View File

@ -1,5 +1,5 @@
name: hledger-web name: hledger-web
version: '1.4.99' version: '1.5'
synopsis: Web interface for the hledger accounting tool synopsis: Web interface for the hledger accounting tool
description: | description: |
This is hledger's web interface. This is hledger's web interface.
@ -62,8 +62,8 @@ flags:
default: true default: true
dependencies: dependencies:
- hledger-lib >=1.4.99 && <1.5 - hledger-lib >=1.5 && <1.6
- hledger >=1.4.99 && <1.5 - hledger >=1.5 && <1.6
- base >=4.8 && <5 - base >=4.8 && <5
- base-compat >=0.8.1 - base-compat >=0.8.1
- blaze-html - blaze-html
@ -114,7 +114,7 @@ ghc-options:
- -fno-warn-orphans - -fno-warn-orphans
library: library:
cpp-options: -DVERSION="1.4.99" cpp-options: -DVERSION="1.5"
exposed-modules: exposed-modules:
- Application - Application
- Foundation - Foundation
@ -137,7 +137,7 @@ executables:
hledger-web: hledger-web:
source-dirs: app source-dirs: app
main: main.hs main: main.hs
cpp-options: -DVERSION="1.4.99" cpp-options: -DVERSION="1.5"
dependencies: dependencies:
- hledger-web - hledger-web
when: when:
@ -150,7 +150,7 @@ tests:
test: test:
source-dirs: tests source-dirs: tests
main: main.hs main: main.hs
cpp-options: -DVERSION="1.4.99" cpp-options: -DVERSION="1.5"
dependencies: dependencies:
- hledger-web - hledger-web
- hspec - hspec

View File

@ -1,5 +1,5 @@
name: hledger name: hledger
version: '1.4.99' version: '1.5'
synopsis: Command-line interface for the hledger accounting tool synopsis: Command-line interface for the hledger accounting tool
description: | description: |
This is hledger's command-line interface. This is hledger's command-line interface.
@ -87,7 +87,7 @@ dependencies:
- tabular >=0.2 - tabular >=0.2
- time >=1.5 - time >=1.5
- utility-ht >=0.0.13 - utility-ht >=0.0.13
- hledger-lib >=1.4.99 && <1.5 - hledger-lib >=1.5 && <1.6
when: when:
- condition: (!(os(windows))) && (flag(terminfo)) - condition: (!(os(windows))) && (flag(terminfo))
@ -95,7 +95,7 @@ when:
- terminfo - terminfo
library: library:
cpp-options: -DVERSION="1.4.99" cpp-options: -DVERSION="1.5"
exposed-modules: exposed-modules:
- Hledger.Cli - Hledger.Cli
- Hledger.Cli.Main - Hledger.Cli.Main
@ -155,7 +155,7 @@ executables:
hledger: hledger:
source-dirs: app source-dirs: app
main: hledger-cli.hs main: hledger-cli.hs
cpp-options: -DVERSION="1.4.99" cpp-options: -DVERSION="1.5"
when: when:
- condition: flag(threaded) - condition: flag(threaded)
ghc-options: -threaded ghc-options: -threaded
@ -185,7 +185,7 @@ tests:
test: test:
source-dirs: test source-dirs: test
main: test.hs main: test.hs
cpp-options: -DVERSION="1.4.99" cpp-options: -DVERSION="1.5"
dependencies: dependencies:
- hledger - hledger
- bytestring - bytestring

View File

@ -12,6 +12,7 @@ function addDocVersions() {
var newpage = page=='manual' ? page : topic; var newpage = page=='manual' ? page : topic;
$('.docversions').html('Available versions: \ $('.docversions').html('Available versions: \
<a href="/'+newpage+'.html'+(page=='manual' ? newhash : '')+'">dev</a> \ <a href="/'+newpage+'.html'+(page=='manual' ? newhash : '')+'">dev</a> \
| <a href="/doc/1.5/'+newpage+'.html'+(page=='manual' ? newhash : '')+'">1.5</a> \
| <a href="/doc/1.4/'+newpage+'.html'+(page=='manual' ? newhash : '')+'">1.4</a> \ | <a href="/doc/1.4/'+newpage+'.html'+(page=='manual' ? newhash : '')+'">1.4</a> \
| <a href="/doc/1.3/'+newpage+'.html'+(page=='manual' ? newhash : '')+'">1.3</a> \ | <a href="/doc/1.3/'+newpage+'.html'+(page=='manual' ? newhash : '')+'">1.3</a> \
| <a href="/doc/1.2/'+newpage+'.html'+(page=='manual' ? newhash : '')+'">1.2</a> \ | <a href="/doc/1.2/'+newpage+'.html'+(page=='manual' ? newhash : '')+'">1.2</a> \