Commit Graph

418 Commits

Author SHA1 Message Date
Simon Michael
f6be82e153 tools: fix tagrelease rule 2013-06-24 08:05:34 -07:00
Simon Michael
080eb866ec web: clean up language extensions a bit, make autoweb works again 2013-06-04 18:23:55 -07:00
Simon Michael
d95ba9c514 docs: add 0.20 to past manuals 2013-06-02 08:57:44 -07:00
Simon Michael
95950f6e51 Merge branch 'master' of github.com:simonmichael/hledger 2013-05-04 09:07:22 -07:00
Simon Michael
8139528e83 tools: clarify tools/simplebench.hs's required libs 2013-05-04 09:07:00 -07:00
Simon Michael
017251a46a tools: make "bench" verbose like "quickbench" 2013-05-04 09:00:52 -07:00
Simon Michael
698fbbb81f Merge branch 'master' of github.com:simonmichael/hledger 2013-05-04 08:37:18 -07:00
Simon Michael
473f752106 tools: update (quick)bench tests a little
Today I'm seeing relative performance numbers like this (linode 1G VPS, 32-bit GNU/Linux):

+-------------------------------------------++--------------+--------------+--------------+---------------------+
|                                           || hledger-0.18 | hledger-0.19 | hledger-0.20 | ledger-3.0-20130215 |
+===========================================++==============+==============+==============+=====================+
| -f data/100x100x10.journal     balance    ||         0.16 |         0.04 |         0.05 |                0.02 |
| -f data/1000x1000x10.journal   balance    ||         8.26 |         0.34 |         0.47 |                0.07 |
| -f data/10000x1000x10.journal  balance    ||        11.85 |         2.59 |         3.94 |                0.31 |
| -f data/10000x1000x10.journal  balance aa ||         3.73 |         3.49 |         4.72 |                0.23 |
| -f data/100x100x10.journal     register   ||         0.07 |         0.07 |         0.07 |                0.07 |
| -f data/1000x1000x10.journal   register   ||         0.56 |         0.51 |         0.70 |                0.54 |
| -f data/100x100x10.journal     print      ||         0.06 |         0.04 |         0.06 |                0.01 |
| -f data/1000x1000x10.journal   print      ||         0.37 |         0.34 |         0.49 |                0.07 |
| -f data/10000x1000x10.journal  print      ||         3.84 |         3.54 |         4.62 |                0.55 |
+-------------------------------------------++--------------+--------------+--------------+---------------------+
2013-05-03 13:18:05 -07:00
Simon Michael
c2d93f2c68 Merge branch 'master' of github.com:simonmichael/hledger 2013-05-03 12:01:37 -07:00
Simon Michael
9b58df70a6 tools: include Makefile.local if present 2013-05-03 12:00:05 -07:00
Simon Michael
c8f2f836a9 tools: don't mess with download page when updating version 2013-05-03 06:48:31 -07:00
Simon Michael
e2f6a26d66 tools: be aware of cabal macros when generating haddock 2013-05-03 05:54:01 -07:00
Simon Michael
0d17d31af4 tools: make ghciweb fixes 2013-04-19 14:55:36 -07:00
Simon Michael
2eabcd1360 reverse and rename the blaze_html_0_5 flag to blaze_html_0_4 2013-04-19 12:40:29 -07:00
Simon Michael
91c622ab39 simplify PATCHLEVEL assignment 2013-04-08 11:31:24 -07:00
Simon Michael
c344dcd0cd site: update old docs setup for git 2013-04-06 12:39:35 -07:00
Simon Michael
0140cf62ab don't require that hacky last_release tag for PATCHLEVEL, needs more thought 2013-04-06 12:38:25 -07:00
Simon Michael
7742bd2104 profiling in auto builds has stopped working, turn it off 2013-04-05 20:55:01 -07:00
Simon Michael
df561f1563 tools: calculate patch level using git describe now.
Patch level is now the number of commits since the last_release tag,
avoiding interference from misc other tags.
2013-04-05 20:45:22 -07:00
Simon Michael
53f602c4cf tools: fix make test and others now that we're using cabal macros like MIN_VERSION_directory 2013-04-04 01:22:14 +00:00
Simon Michael
17ef7295b6 tools: mark download page as containing an updatable version number 2013-04-01 21:25:27 +00:00
Simon Michael
caa48b35c2 tools: oldsource/cleanoldsource make rules for site 2013-03-31 14:58:04 +00:00
Simon Michael
4e4a283a84 tools: don't define commithook target in makefile, that's repo-specific 2013-03-11 18:39:36 +00:00
Simon Michael
95e6dae18a tools: better auto build rule, "make auto-CMD" runs CMD on each rebuild 2013-02-25 20:40:03 +00:00
Simon Michael
34390f9af6 tools: include profiling info in the "auto" dev builds, why not 2013-02-25 20:38:20 +00:00
Simon Michael
ab53dd0813 tools: test hackage upload 2013-01-11 13:32:42 +00:00
Simon Michael
7f1f392166 tools: run built-in tests with a pattern 2013-01-11 13:32:27 +00:00
Simon Michael
db8cb417fe tools: link hledger-web dirs to top level for bin/hledger-webdev also 2013-01-11 13:30:15 +00:00
Simon Michael
023fe4f142 docs: note hledger's include does not support glob patterns 2013-01-04 21:31:36 +00:00
Simon Michael
1e41ba619a tools: exclude hledger-web from make install by default, as it's harder 2012-12-28 17:15:23 +00:00
Simon Michael
a7358e4497 tools: symlink more dirs for web dev builds 2012-11-27 23:52:47 +00:00
Simon Michael
8d973ac3b3 tools: upload to hackage more quietly 2012-11-17 04:31:38 +00:00
Simon Michael
34baea6302 tools: packdeps (/checkdeps) rule for checking all packages 2012-11-18 22:51:00 +00:00
Simon Michael
ea212ba2d1 tools: add "dev" suffix to version string of dev builds 2012-11-18 22:52:16 +00:00
Simon Michael
64cdd1a434 tools: also tag web handlers 2012-11-19 21:48:19 +00:00
Simon Michael
c70ba1a979 tools: fix web dev build 2012-11-19 23:18:22 +00:00
Simon Michael
79f0e98186 tools: fix haddock generation (web excluded) 2012-11-19 23:36:36 +00:00
Simon Michael
93978fcf81 tools: web dev build fixes 2012-11-23 20:49:17 +00:00
Simon Michael
300ef7c536 tools: web dev build uses RecordWildCards 2012-11-20 02:25:14 +00:00
Simon Michael
7d92fa6a7f tools: fix manual version number setting 2012-11-24 15:59:42 +00:00
Simon Michael
2addc934fc tools: add more web source files 2012-11-17 01:26:08 +00:00
Simon Michael
92ea44dcb8 tools: update web building rules 2012-11-16 18:49:00 +00:00
Simon Michael
af03481385 tools: more sample journals 2012-10-13 19:47:39 +00:00
Simon Michael
3fe66ab6ec tools: more makefile cleanups, drop --make 2012-10-21 21:22:27 +00:00
Simon Michael
4752726585 tools: rename hledgerp to hledgerprof 2012-10-21 21:24:06 +00:00
Simon Michael
97a8ed23df tools: makefile updates & cleanups 2012-10-21 21:09:24 +00:00
Simon Michael
e701c2b1cb tools: rsync refactor 2012-09-28 17:35:07 +00:00
Simon Michael
2b8d759db1 rename developer build to hledgerdev, avoiding confusion with production hledger 2012-10-21 18:23:23 +00:00
Simon Michael
3e28f6001f tools: more top-level build fixes; remove chart/vty rules 2012-10-13 19:47:16 +00:00
Simon Michael
f03b020e2f set version with CPP instead of cabal-file-th; make building more robust
hledger and hledger-web were reading their version number (and program
name) from their cabal files at compile time using cabal-file-th,
which allowed the version number be maintained in one place (per
package).

This meant you had to be in same directory as the cabal file when
building, which made life more complicated, eg emacs compilation mode
could not jump to errors. Also, it slowed down building slightly, and
is a factor in hledger Debian packages being unavailable on a number
of platforms (we also use TH for report templates).

Now, the build version is set with a CPP VERSION flag, which seems
simpler overall. For cabal builds, this needs to be configured
manually in a few more places in each cabal file. For makefile builds,
it is set it to the name of the most recent darcs tag (which should be
more useful than the old behaviour). If not set, it defaults to the
blank string, useful eg for haddock. And, all makefile builds now run
from the top directory.
2012-10-13 19:21:17 +00:00
Simon Michael
257732bf43 tools: build rule updates 2012-10-08 16:52:49 +00:00
Sergei Trofimovich
a433910a60 Makefile: allow passing arbitrary HCFLAGS as ghc options
It is handly to check things inplace:

hledger $ make
cd hledger; ghc --make hledger-cli.hs -o ../bin/hledger -DMAKE -W -fwarn-tabs -fno-warn-name-shadowing  -i../hledger-lib -i../hledger -i../hledger-web  -L/usr/lib -DPATCHLEVEL=0 +RTS -M200m -RTS

../hledger-lib/Hledger/Utils.hs:30:8:
    Ambiguous module name `Control.Monad.Error':
      it was found in multiple packages: mtl-2.1.2 monads-fd-0.1.0.4
make: *** [bin/hledger] Error 1
hledger $ make HCFLAGS="-hide-package monads-fd"
<all ok>
2012-08-21 07:17:24 +00:00
Simon Michael
577981367b tools: version fix 2012-10-21 22:23:06 +00:00
Simon Michael
6704d3ae0e tools: include docs in tags 2012-03-11 18:39:26 +00:00
Simon Michael
08bb23bcfc site: more dev doc fixes 2012-03-11 20:16:45 +00:00
Simon Michael
95916e1f60 tools: view framed haddock by default 2012-03-29 23:38:36 +00:00
Simon Michael
396f8cfa9b tools: drop old PRODUCTION flag 2012-04-03 17:25:24 +00:00
Simon Michael
a55046b4d6 tools: make autotest-PAT to auto-compile & run only tests matching PAT 2012-05-27 18:15:36 +00:00
Simon Michael
130909c473 tools: makefile updates 2012-05-14 19:24:03 +00:00
Simon Michael
8cbfad7e20 tools: allow auto build & test with older GHC versions 2012-05-06 20:39:47 +00:00
Simon Michael
acc5139c54 tools: makefile updates 2012-04-03 17:12:47 +00:00
Simon Michael
f595c2ceed tools: makefile updates 2012-03-05 07:23:35 +00:00
Simon Michael
e12e8c0c0f tools: make quite sure auto builds as quickly as possible 2012-03-11 18:41:24 +00:00
Simon Michael
f923789003 remove 6.12.3 from make rule 2012-05-29 00:53:52 +00:00
Simon Michael
7bf4f2b747 tools: makefile updates 2012-03-29 20:41:47 +00:00
Simon Michael
88f5eaa03c tools: make tweaks, use a known-good version of shelltest 2012-03-28 18:16:46 +00:00
Simon Michael
e093431b4d tools: easier building and testing with multiple GHC versions 2012-03-26 18:18:18 +00:00
Simon Michael
7f3b990394 docs: fix api docs 2012-03-07 16:05:04 +00:00
Simon Michael
51504e5711 NOTES -> NOTES.org 2012-02-23 14:47:10 +00:00
Simon Michael
471293c0d7 tools: fix make ghci 2012-01-04 12:01:21 +00:00
Simon Michael
795d85f36e tools: update/simplify make install 2012-01-29 18:36:51 +00:00
Simon Michael
4d4e6355b5 tools: fix make clean 2012-01-30 04:30:41 +00:00
Simon Michael
2f9669c248 tools: make clean should not remove virthualenv files 2012-01-29 18:52:31 +00:00
Simon Michael
679c9fce8f begin demoting hledger-vty and hledger-chart to unmaintained "extras" status 2012-01-30 04:22:11 +00:00
Simon Michael
b151eef2b7 tools: fixes for version updating in web pages 2012-01-31 05:17:15 +00:00
Simon Michael
c686645fab refactor: update version number handling 2012-01-31 06:01:31 +00:00
Simon Michael
df7fc8877f tools: adapt makefile for cabal-file-th, builds now happen from package dirs 2011-10-19 19:55:01 +00:00
Simon Michael
aa30f25887 tools: one more make fix 2011-10-19 20:00:08 +00:00
Simon Michael
5bd0dcc113 tools: update web file paths 2011-09-12 22:45:02 +00:00
Simon Michael
f2ce07145f tools: hledger-web-production build 2011-09-13 00:10:00 +00:00
Simon Michael
48db255444 tools: hakyll.hs -> site.hs to keep it working on mac 2011-09-22 22:24:02 +00:00
Simon Michael
7e753e13b5 tools: dayssincerelease.hs -> dayssincetag.hs 2011-09-25 18:29:23 +00:00
Simon Michael
7768efd0b5 tools: wine reminder 2011-09-26 20:51:09 +00:00
Simon Michael
8cb9774d2a docs: fix wrong version 2011-09-02 15:17:22 +00:00
Simon Michael
fcaa62d931 tools: set-up-rc-repo make rule 2011-04-22 23:05:54 +00:00
Simon Michael
4f3f5c0132 site: update haddock as well as website on each commit 2011-06-03 17:08:09 +00:00
Simon Michael
555a594bdf tools: makefile fixes, don't break make when hledger source has errors 2011-06-06 19:07:03 +00:00
Simon Michael
343b5b0a4c tools: update binary building rules 2011-04-22 22:57:00 +00:00
Trygve Laugstol
337b5626f2 Makefile: Adding ghci-vty target to get a debug prompt for hledger-vty. 2011-06-20 20:36:50 +00:00
Simon Michael
cd68f43be3 cli: rename hledger.hs (but not the executable) to avoid mac build issues 2011-07-17 23:21:48 +00:00
Simon Michael
81db822424 tools: include missing source files in tags etc. 2011-07-19 00:56:15 +00:00
Simon Michael
9ea1f4a98b tools: update file lists 2011-08-07 22:14:14 +00:00
Simon Michael
b2c4b8bfea tools: include web templates in tags 2011-06-04 17:01:45 +00:00
Simon Michael
452ea75432 tools: remove local stuff 2011-08-07 22:17:59 +00:00
Simon Michael
46d53f4fcd tools: fix autotest rule 2011-08-09 01:54:47 +00:00
Simon Michael
ec7e1f7c49 tools: sp macro 2011-08-07 22:18:54 +00:00
Simon Michael
6a895d94cc tools: check for sp and explain how to get it when needed 2011-06-23 18:15:01 +00:00
Simon Michael
a447e2c56b tools: update functest rule for shelltest 1.0, hide successes 2011-08-15 15:22:01 +00:00
Simon Michael
76a661e855 tools: update test: rule for shelltestrunner head 2011-06-14 22:32:26 +00:00
Simon Michael
e6e7cef85c tools: easier browser switching 2011-06-13 19:50:10 +00:00