Commit Graph

366 Commits

Author SHA1 Message Date
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