bump version to 1.2
This commit is contained in:
Simon Michael
parent
ed93026f48
commit
1850fb732f
@ -7,8 +7,8 @@ m4_define({{_webseparate_}}, m4_ifdef({{WEB && SEPARATE}},{{$1}}) )m4_dnl
|
||||
m4_define({{_webcombined_}}, m4_ifdef({{WEB && COMBINED}},{{$1}}) )m4_dnl
|
||||
m4_dnl
|
||||
m4_define({{_author_}}, {{}})m4_dnl
|
||||
m4_define({{_monthyear_}}, {{January 2017}})m4_dnl
|
||||
m4_define({{_version_}}, {{dev}})m4_dnl
|
||||
m4_define({{_monthyear_}}, {{March 2017}})m4_dnl
|
||||
m4_define({{_version_}}, {{1.2}})m4_dnl
|
||||
m4_dnl
|
||||
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.
|
||||
@ -20,6 +20,7 @@ This doc is for version **_version_**.
|
||||
m4_dnl Too painful for static generation, insert from site.js instead
|
||||
m4_dnl Available versions:
|
||||
m4_dnl <a href="/$1.html">dev</a>
|
||||
m4_dnl | <a href="/doc/1.2/$1.html">1.2</a>
|
||||
m4_dnl | <a href="/doc/1.1/$1.html">1.1</a>
|
||||
m4_dnl | <a href="/doc/1.0/$1.html">1.0</a>
|
||||
m4_dnl | <a href="/doc/0.27/manual.html#$1">0.27</a>
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
-- see: https://github.com/sol/hpack
|
||||
|
||||
name: hledger-api
|
||||
version: 1.1.98
|
||||
version: 1.2
|
||||
synopsis: Web API server for the hledger accounting tool
|
||||
description: This is a simple web API server for hledger data.
|
||||
It comes with a series of simple client-side web app examples.
|
||||
@ -44,10 +44,10 @@ source-repository head
|
||||
executable hledger-api
|
||||
main-is: hledger-api.hs
|
||||
ghc-options: -threaded
|
||||
cpp-options: -DVERSION="1.1.98"
|
||||
cpp-options: -DVERSION="1.2"
|
||||
build-depends:
|
||||
hledger-lib >= 1.1.98 && < 1.2
|
||||
, hledger >= 1.1.98 && < 1.2
|
||||
hledger-lib >= 1.2 && < 1.3
|
||||
, hledger >= 1.2 && < 1.3
|
||||
, base >=4.8 && <5
|
||||
, aeson
|
||||
, bytestring
|
||||
|
||||
@ -35,12 +35,12 @@ import Text.Printf
|
||||
import Hledger.Query
|
||||
import Hledger.Cli hiding (Reader, version)
|
||||
|
||||
hledgerApiVersion="1.1.98"
|
||||
hledgerApiVersion="1.2"
|
||||
|
||||
-- https://github.com/docopt/docopt.hs#readme
|
||||
doc :: Docopt
|
||||
doc = [docopt|
|
||||
hledger-api 1.1.98
|
||||
hledger-api 1.2
|
||||
|
||||
Serves hledger data and reports as a JSON web API.
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
name: hledger-api
|
||||
version: '1.1.98'
|
||||
version: '1.2'
|
||||
synopsis: Web API server for the hledger accounting tool
|
||||
description: |
|
||||
This is a simple web API server for hledger data.
|
||||
@ -27,8 +27,8 @@ data-files:
|
||||
- doc/hledger-api.1.txt
|
||||
- doc/hledger-api.1.info
|
||||
dependencies:
|
||||
- hledger-lib >= 1.1.98 && < 1.2
|
||||
- hledger >= 1.1.98 && < 1.2
|
||||
- hledger-lib >= 1.2 && < 1.3
|
||||
- hledger >= 1.2 && < 1.3
|
||||
- base >=4.8 && <5
|
||||
- aeson
|
||||
- bytestring
|
||||
@ -51,6 +51,6 @@ executables:
|
||||
hledger-api:
|
||||
main: hledger-api.hs
|
||||
ghc-options: -threaded
|
||||
cpp-options: -DVERSION="1.1.98"
|
||||
cpp-options: -DVERSION="1.2"
|
||||
stability: alpha
|
||||
tested-with: GHC==7.10.3, GHC==8.0
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
-- see: https://github.com/sol/hpack
|
||||
|
||||
name: hledger-lib
|
||||
version: 1.1.98
|
||||
version: 1.2
|
||||
synopsis: Core data types, parsers and functionality for the hledger accounting tools
|
||||
description: This is a reusable library containing hledger's core functionality.
|
||||
.
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
name: hledger-lib
|
||||
version: '1.1.98'
|
||||
version: '1.2'
|
||||
synopsis: Core data types, parsers and functionality for the hledger accounting tools
|
||||
description: |
|
||||
This is a reusable library containing hledger's core functionality.
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
-- see: https://github.com/sol/hpack
|
||||
|
||||
name: hledger-ui
|
||||
version: 1.1.98
|
||||
version: 1.2
|
||||
synopsis: Curses-style user interface for the hledger accounting tool
|
||||
description: This is hledger's curses-style interface.
|
||||
It is simpler and more convenient for browsing data than the command-line interface,
|
||||
@ -55,10 +55,10 @@ executable hledger-ui
|
||||
hs-source-dirs:
|
||||
./.
|
||||
ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
|
||||
cpp-options: -DVERSION="1.1.98"
|
||||
cpp-options: -DVERSION="1.2"
|
||||
build-depends:
|
||||
hledger >= 1.1.98 && < 1.2
|
||||
, hledger-lib >= 1.1.98 && < 1.2
|
||||
hledger >= 1.2 && < 1.3
|
||||
, hledger-lib >= 1.2 && < 1.3
|
||||
, ansi-terminal >= 0.6.2.3 && < 0.7
|
||||
, async
|
||||
, base >= 4.8 && < 5
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
name : hledger-ui
|
||||
version : '1.1.98'
|
||||
version : '1.2'
|
||||
synopsis : Curses-style user interface for the hledger accounting tool
|
||||
description : |
|
||||
This is hledger's curses-style interface.
|
||||
@ -35,7 +35,7 @@ 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.1.98"
|
||||
cpp-options: -DVERSION="1.2"
|
||||
executables:
|
||||
hledger-ui:
|
||||
source-dirs: .
|
||||
@ -48,8 +48,8 @@ executables:
|
||||
-fno-warn-type-defaults
|
||||
-fno-warn-orphans
|
||||
dependencies:
|
||||
- hledger >= 1.1.98 && < 1.2
|
||||
- hledger-lib >= 1.1.98 && < 1.2
|
||||
- hledger >= 1.2 && < 1.3
|
||||
- hledger-lib >= 1.2 && < 1.3
|
||||
- ansi-terminal >= 0.6.2.3 && < 0.7
|
||||
- async
|
||||
- base >= 4.8 && < 5
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
-- see: https://github.com/sol/hpack
|
||||
|
||||
name: hledger-web
|
||||
version: 1.1.98
|
||||
version: 1.2
|
||||
synopsis: Web interface for the hledger accounting tool
|
||||
description: This is hledger's web interface.
|
||||
It provides a more user-friendly and collaborative UI than the
|
||||
@ -125,10 +125,10 @@ flag threaded
|
||||
|
||||
library
|
||||
ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
|
||||
cpp-options: -DVERSION="1.1.98"
|
||||
cpp-options: -DVERSION="1.2"
|
||||
build-depends:
|
||||
hledger-lib >= 1.1.98 && < 1.2
|
||||
, hledger >= 1.1.98 && < 1.2
|
||||
hledger-lib >= 1.2 && < 1.3
|
||||
, hledger >= 1.2 && < 1.3
|
||||
, base >=4.8 && <5
|
||||
, base-compat >=0.8.1
|
||||
, blaze-html
|
||||
@ -199,10 +199,10 @@ executable hledger-web
|
||||
hs-source-dirs:
|
||||
app
|
||||
ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
|
||||
cpp-options: -DVERSION="1.1.98"
|
||||
cpp-options: -DVERSION="1.2"
|
||||
build-depends:
|
||||
hledger-lib >= 1.1.98 && < 1.2
|
||||
, hledger >= 1.1.98 && < 1.2
|
||||
hledger-lib >= 1.2 && < 1.3
|
||||
, hledger >= 1.2 && < 1.3
|
||||
, base >=4.8 && <5
|
||||
, base-compat >=0.8.1
|
||||
, blaze-html
|
||||
@ -234,7 +234,7 @@ executable hledger-web
|
||||
, yesod-static
|
||||
, json
|
||||
, parsec >=3
|
||||
, hledger-web == 1.1.98
|
||||
, hledger-web == 1.2
|
||||
if flag(library-only)
|
||||
buildable: False
|
||||
if flag(threaded)
|
||||
@ -261,10 +261,10 @@ test-suite test
|
||||
hs-source-dirs:
|
||||
tests
|
||||
ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
|
||||
cpp-options: -DVERSION="1.1.98"
|
||||
cpp-options: -DVERSION="1.2"
|
||||
build-depends:
|
||||
hledger-lib >= 1.1.98 && < 1.2
|
||||
, hledger >= 1.1.98 && < 1.2
|
||||
hledger-lib >= 1.2 && < 1.3
|
||||
, hledger >= 1.2 && < 1.3
|
||||
, base >=4.8 && <5
|
||||
, base-compat >=0.8.1
|
||||
, blaze-html
|
||||
@ -295,7 +295,7 @@ test-suite test
|
||||
, yesod-form
|
||||
, yesod-static
|
||||
, json
|
||||
, hledger-web == 1.1.98
|
||||
, hledger-web == 1.2
|
||||
, hspec
|
||||
, yesod-test
|
||||
if flag(oldtime)
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
name: hledger-web
|
||||
version: '1.1.98'
|
||||
version: '1.2'
|
||||
synopsis: Web interface for the hledger accounting tool
|
||||
description: |
|
||||
This is hledger's web interface.
|
||||
@ -60,8 +60,8 @@ flags:
|
||||
manual: false
|
||||
default: false
|
||||
dependencies:
|
||||
- hledger-lib >= 1.1.98 && < 1.2
|
||||
- hledger >= 1.1.98 && < 1.2
|
||||
- hledger-lib >= 1.2 && < 1.3
|
||||
- hledger >= 1.2 && < 1.3
|
||||
- base >=4.8 && <5
|
||||
- base-compat >=0.8.1
|
||||
- blaze-html
|
||||
@ -100,7 +100,7 @@ ghc-options:
|
||||
- -fno-warn-type-defaults
|
||||
- -fno-warn-orphans
|
||||
library:
|
||||
cpp-options: -DVERSION="1.1.98"
|
||||
cpp-options: -DVERSION="1.2"
|
||||
exposed-modules:
|
||||
- Application
|
||||
- Foundation
|
||||
@ -139,10 +139,10 @@ executables:
|
||||
hledger-web:
|
||||
main: main.hs
|
||||
source-dirs: app
|
||||
cpp-options: -DVERSION="1.1.98"
|
||||
cpp-options: -DVERSION="1.2"
|
||||
dependencies:
|
||||
- parsec >=3
|
||||
- hledger-web == 1.1.98
|
||||
- hledger-web == 1.2
|
||||
when:
|
||||
- condition: flag(library-only)
|
||||
buildable: false
|
||||
@ -167,9 +167,9 @@ tests:
|
||||
test:
|
||||
main: main.hs
|
||||
source-dirs: tests
|
||||
cpp-options: -DVERSION="1.1.98"
|
||||
cpp-options: -DVERSION="1.2"
|
||||
dependencies:
|
||||
- hledger-web == 1.1.98
|
||||
- hledger-web == 1.2
|
||||
- hspec
|
||||
- yesod-test
|
||||
when:
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
-- see: https://github.com/sol/hpack
|
||||
|
||||
name: hledger
|
||||
version: 1.1.98
|
||||
version: 1.2
|
||||
synopsis: Command-line interface for the hledger accounting tool
|
||||
description: This is hledger's command-line interface.
|
||||
Its basic function is to read a plain text file describing
|
||||
@ -80,7 +80,7 @@ flag threaded
|
||||
|
||||
library
|
||||
ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
|
||||
cpp-options: -DVERSION="1.1.98"
|
||||
cpp-options: -DVERSION="1.2"
|
||||
build-depends:
|
||||
base >=4.8 && <5
|
||||
, base-compat >=0.8.1
|
||||
@ -92,7 +92,7 @@ library
|
||||
, process
|
||||
, temporary
|
||||
, tabular >=0.2 && <0.3
|
||||
, hledger-lib >= 1.1.98 && < 1.2
|
||||
, hledger-lib >= 1.2 && < 1.3
|
||||
, bytestring
|
||||
, containers
|
||||
, unordered-containers
|
||||
@ -165,7 +165,7 @@ executable hledger
|
||||
hs-source-dirs:
|
||||
app
|
||||
ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
|
||||
cpp-options: -DVERSION="1.1.98"
|
||||
cpp-options: -DVERSION="1.2"
|
||||
build-depends:
|
||||
base >=4.8 && <5
|
||||
, base-compat >=0.8.1
|
||||
@ -177,8 +177,8 @@ executable hledger
|
||||
, process
|
||||
, temporary
|
||||
, tabular >=0.2 && <0.3
|
||||
, hledger-lib >= 1.1.98 && < 1.2
|
||||
, hledger == 1.1.98
|
||||
, hledger-lib >= 1.2 && < 1.3
|
||||
, hledger == 1.2
|
||||
, bytestring
|
||||
, containers
|
||||
, unordered-containers
|
||||
@ -227,7 +227,7 @@ test-suite test
|
||||
hs-source-dirs:
|
||||
test
|
||||
ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
|
||||
cpp-options: -DVERSION="1.1.98"
|
||||
cpp-options: -DVERSION="1.2"
|
||||
build-depends:
|
||||
base >=4.8 && <5
|
||||
, base-compat >=0.8.1
|
||||
@ -239,8 +239,8 @@ test-suite test
|
||||
, process
|
||||
, temporary
|
||||
, tabular >=0.2 && <0.3
|
||||
, hledger-lib >= 1.1.98 && < 1.2
|
||||
, hledger == 1.1.98
|
||||
, hledger-lib >= 1.2 && < 1.3
|
||||
, hledger == 1.2
|
||||
, bytestring
|
||||
, containers
|
||||
, unordered-containers
|
||||
@ -300,8 +300,8 @@ benchmark bench
|
||||
, process
|
||||
, temporary
|
||||
, tabular >=0.2 && <0.3
|
||||
, hledger-lib >= 1.1.98 && < 1.2
|
||||
, hledger == 1.1.98
|
||||
, hledger-lib >= 1.2 && < 1.3
|
||||
, hledger == 1.2
|
||||
, criterion
|
||||
, html
|
||||
, timeit
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
name: hledger
|
||||
version: '1.1.98'
|
||||
version: '1.2'
|
||||
synopsis: Command-line interface for the hledger accounting tool
|
||||
description: |
|
||||
This is hledger's command-line interface.
|
||||
@ -81,7 +81,7 @@ ghc-options:
|
||||
- -fno-warn-type-defaults
|
||||
- -fno-warn-orphans
|
||||
library:
|
||||
cpp-options: -DVERSION="1.1.98"
|
||||
cpp-options: -DVERSION="1.2"
|
||||
exposed-modules:
|
||||
- Hledger.Cli
|
||||
- Hledger.Cli.Main
|
||||
@ -106,7 +106,7 @@ library:
|
||||
- Hledger.Cli.Stats
|
||||
- Text.Tabular.AsciiWide
|
||||
dependencies:
|
||||
- hledger-lib >= 1.1.98 && < 1.2
|
||||
- hledger-lib >= 1.2 && < 1.3
|
||||
- bytestring
|
||||
- containers
|
||||
- unordered-containers
|
||||
@ -154,10 +154,10 @@ executables:
|
||||
hledger:
|
||||
main: hledger-cli.hs
|
||||
source-dirs: app
|
||||
cpp-options: -DVERSION="1.1.98"
|
||||
cpp-options: -DVERSION="1.2"
|
||||
dependencies:
|
||||
- hledger-lib >= 1.1.98 && < 1.2
|
||||
- hledger == 1.1.98
|
||||
- hledger-lib >= 1.2 && < 1.3
|
||||
- hledger == 1.2
|
||||
- bytestring
|
||||
- containers
|
||||
- unordered-containers
|
||||
@ -205,10 +205,10 @@ tests:
|
||||
test:
|
||||
main: test.hs
|
||||
source-dirs: test
|
||||
cpp-options: -DVERSION="1.1.98"
|
||||
cpp-options: -DVERSION="1.2"
|
||||
dependencies:
|
||||
- hledger-lib >= 1.1.98 && < 1.2
|
||||
- hledger == 1.1.98
|
||||
- hledger-lib >= 1.2 && < 1.3
|
||||
- hledger == 1.2
|
||||
- bytestring
|
||||
- containers
|
||||
- unordered-containers
|
||||
@ -257,8 +257,8 @@ benchmarks:
|
||||
main: bench.hs
|
||||
source-dirs: bench
|
||||
dependencies:
|
||||
- hledger-lib >= 1.1.98 && < 1.2
|
||||
- hledger == 1.1.98
|
||||
- hledger-lib >= 1.2 && < 1.3
|
||||
- hledger == 1.2
|
||||
- criterion
|
||||
- html
|
||||
- timeit
|
||||
|
||||
@ -12,6 +12,7 @@ function addDocVersions() {
|
||||
var newpage = page=='manual' ? page : topic;
|
||||
$('.docversions').html('Available versions: \
|
||||
<a href="/'+newpage+'.html'+(page=='manual' ? newhash : '')+'">dev</a> \
|
||||
| <a href="/doc/1.2/'+newpage+'.html'+(page=='manual' ? newhash : '')+'">1.2</a> \
|
||||
| <a href="/doc/1.1/'+newpage+'.html'+(page=='manual' ? newhash : '')+'">1.1</a> \
|
||||
| <a href="/doc/1.0/'+newpage+'.html'+(page=='manual' ? newhash : '')+'">1.0</a> \
|
||||
| <a href="/doc/0.27/manual.html'+(topic=='manual' ? '' : ('#'+topic))+'">0.27</a> \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user