From a05e7a5a671af25b220eb4f152ad935687faef1a Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 24 Jun 2013 15:42:12 -0500 Subject: [PATCH 1/5] yesod-platform dependency is unnecessary --- hledger-web/hledger-web.cabal | 1 - 1 file changed, 1 deletion(-) diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index 613e1514f..4490c2185 100644 --- a/hledger-web/hledger-web.cabal +++ b/hledger-web/hledger-web.cabal @@ -139,7 +139,6 @@ library , yaml , yesod , yesod-core - , yesod-platform >= 1.2.0.1 && < 1.3 , yesod-static , json From c2cdead4efb66fa240930d66e7834e4eebf970ab Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Wed, 10 Jul 2013 08:23:32 -0700 Subject: [PATCH 2/5] web: remove another yesod-platform dependency --- hledger-web/hledger-web.cabal | 1 - 1 file changed, 1 deletion(-) diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index 4490c2185..bd98d6a05 100644 --- a/hledger-web/hledger-web.cabal +++ b/hledger-web/hledger-web.cabal @@ -230,7 +230,6 @@ executable hledger-web , yaml , yesod , yesod-core - , yesod-platform >= 1.2.0.1 && < 1.3 , yesod-static , json From b3c3b6523ee95729a61d2def7e55529faeef51f1 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Wed, 10 Jul 2013 08:27:18 -0700 Subject: [PATCH 3/5] docs: release notes --- NEWS.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/NEWS.md b/NEWS.md index f455fea18..ebb7e0510 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,6 +4,12 @@ title: hledger news # News +## 2013/7/10 hledger-web 0.21.3 + + - drop yesod-platform dependency, it is not worthwhile. The other + yesod dependencies are currently without version ranges, so cabal + install might require --constraint to restrict them in some cases. + ## 2013/6/23 hledger 0.21.3 - csv: fix wrong application of multiple assignments in a conditional block From 8feca2fa84af3704f02c5336498504fffc126ec7 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Wed, 10 Jul 2013 15:28:34 -0700 Subject: [PATCH 4/5] tools: fix hackageupload-dry --- Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 26eaf3342..481171c94 100644 --- a/Makefile +++ b/Makefile @@ -816,11 +816,10 @@ DOWNLOAD.md: $(VERSIONFILE) tagrelease: git tag -a $(VERSION) -# display a hackage upload command reminder -hackageupload: - for p in $(PACKAGES); do cabal upload $$p/dist/$$p-$(VERSION).tar.gz -v2; done - hackageupload-dry: + for p in $(PACKAGES); do cabal upload $$p/dist/$$p-$(VERSION).tar.gz -v2 --check; done + +hackageupload: for p in $(PACKAGES); do cabal upload $$p/dist/$$p-$(VERSION).tar.gz -v2; done # send unpushed patches to the mail list From 3f3e9fcc0680a77d1ca2891bd176c4a6591678a2 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Wed, 10 Jul 2013 15:29:00 -0700 Subject: [PATCH 5/5] tools: new sloc, cloc targets --- Makefile | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 481171c94..a59007983 100644 --- a/Makefile +++ b/Makefile @@ -887,11 +887,27 @@ showreleaseauthors: @darcs changes --from-tag $(FROMTAG) |grep '^\w' |cut -c 31- |sort |uniq @echo -showloc sloccount: +showloc: @echo Current lines of code including tests: @sloccount `ls $(SOURCEFILES)` | grep haskell: @echo +sloc: + @sloccount hledger-lib hledger hledger-web + +cloc: + @echo + @echo "Lines of code as of `date`:" + @echo + @echo "hledger-lib, hledger" + @cloc -q hledger-lib hledger 2>&1 | grep -v 'defined(' + @echo + @echo "hledger-web" + @cloc -q hledger-web 2>&1 | grep -v 'defined(' + @echo + @echo "hledger-lib, hledger, hledger-web" + @cloc -q hledger-lib hledger hledger-web 2>&1 | grep -v 'defined(' + showtestcount: @echo "Unit tests:" @hledger test 2>&1 | cut -d' ' -f2