slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools: makefile updates

Browse Source
This commit is contained in:
Simon Michael 2012-04-03 17:12:47 +00:00
parent f595c2ceed
commit acc5139c54
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile
View File

@ -15,9 +15,6 @@ COVCMD=test
BENCHEXES=hledger-0.12.1 hledger-0.13 hledger-0.14-ghc6.12.3 ledger BENCHEXES=hledger-0.12.1 hledger-0.13 hledger-0.14-ghc6.12.3 ledger
#BENCHEXES=hledger #BENCHEXES=hledger
# searchpath executable used for automatic recompilation, http://joyful.com/repos/searchpath
AUTOBUILD=sp --no-exts --no-default-map ghc --make -O0
# misc. tools # misc. tools
BROWSE=google-chrome BROWSE=google-chrome
BROWSE=open -a 'Google Chrome' BROWSE=open -a 'Google Chrome'
@ -79,12 +76,16 @@ PATCHLEVEL:=$(shell expr `darcs changes --count --from-tag=\\\\\.` - 1)
WARNINGS:=-W -fwarn-tabs #-fwarn-orphans -fwarn-simple-patterns -fwarn-monomorphism-restriction -fwarn-name-shadowing WARNINGS:=-W -fwarn-tabs #-fwarn-orphans -fwarn-simple-patterns -fwarn-monomorphism-restriction -fwarn-name-shadowing
DEFINEFLAGS:= DEFINEFLAGS:=
PREFERMACUSRLIBFLAGS=-L/usr/lib PREFERMACUSRLIBFLAGS=-L/usr/lib
BUILDFLAGS:=-DMAKE $(WARNINGS) $(INCLUDEPATHS) $(PREFERMACUSRLIBFLAGS) -DPATCHLEVEL=$(PATCHLEVEL) GHCMEMFLAGS=+RTS -M200m -RTS
BUILDFLAGS:=-DMAKE $(WARNINGS) $(INCLUDEPATHS) $(PREFERMACUSRLIBFLAGS) -DPATCHLEVEL=$(PATCHLEVEL) $(GHCMEMFLAGS)
LINUXRELEASEBUILDFLAGS:=-DMAKE $(WARNINGS) $(INCLUDEPATHS) -O2 -static -optl-static -optl-pthread LINUXRELEASEBUILDFLAGS:=-DMAKE $(WARNINGS) $(INCLUDEPATHS) -O2 -static -optl-static -optl-pthread
MACRELEASEBUILDFLAGS:=-DMAKE $(WARNINGS) $(INCLUDEPATHS) $(PREFERMACUSRLIBFLAGS) -O2 # -optl-L/usr/lib MACRELEASEBUILDFLAGS:=-DMAKE $(WARNINGS) $(INCLUDEPATHS) $(PREFERMACUSRLIBFLAGS) -O2 # -optl-L/usr/lib
#WINDOWSRELEASEBUILDFLAGS:=-DMAKE $(WARNINGS) $(INCLUDEPATHS) #WINDOWSRELEASEBUILDFLAGS:=-DMAKE $(WARNINGS) $(INCLUDEPATHS)
TIME:=$(shell date +"%Y%m%d%H%M") TIME:=$(shell date +"%Y%m%d%H%M")
# searchpath executable used for automatic recompilation, http://joyful.com/repos/searchpath
AUTOBUILD=sp --no-exts --no-default-map ghc --make -O0 $(GHCMEMFLAGS)
# file defining the current release version # file defining the current release version
VERSIONFILE=VERSION VERSIONFILE=VERSION
# two or three-part version string, whatever's in VERSION # two or three-part version string, whatever's in VERSION
@ -134,16 +135,13 @@ auto: sp
rm -f bin/hledger rm -f bin/hledger
cd hledger; $(AUTOBUILD) $(MAIN) -o ../bin/hledger $(BUILDFLAGS) --run test cd hledger; $(AUTOBUILD) $(MAIN) -o ../bin/hledger $(BUILDFLAGS) --run test
autoweb: sp autoweb: sp bin/hledger-web
rm -f bin/hledger-web cd hledger-web; $(AUTOBUILD) hledger-web.hs -o ../bin/hledger-web $(BUILDFLAGS) -DDEVELOPMENT --run -B --port 5001 --base-url http://localhost:5001 -f test.journal
cd hledger-web; $(AUTOBUILD) hledger-web.hs -o ../bin/hledger-web $(BUILDFLAGS) --run -B --port 5001 --base-url http://demo.hledger.org:5001 -f test.journal
autovty: sp autovty: sp bin/hledger-vty
rm -f bin/hledger-vty
cd hledger-vty; $(AUTOBUILD) hledger-vty.hs -o ../bin/hledger-vty $(BUILDFLAGS) --run --help cd hledger-vty; $(AUTOBUILD) hledger-vty.hs -o ../bin/hledger-vty $(BUILDFLAGS) --run --help
autochart: sp autochart: sp bin/hledger-chart
rm -f bin/hledger-chart
cd hledger-chart; $(AUTOBUILD) hledger-chart.hs -o ../bin/hledger-chart $(BUILDFLAGS) --run --help cd hledger-chart; $(AUTOBUILD) hledger-chart.hs -o ../bin/hledger-chart $(BUILDFLAGS) --run --help
# check for sp and explain how to get it if not found. # check for sp and explain how to get it if not found.

4
hledger-web/Hledger/Web/Settings.hs
View File

@ -84,7 +84,7 @@ parseExtra _ o = Extra
hamlet :: QuasiQuoter hamlet :: QuasiQuoter
#if DEVELOPMENT #if DEVELOPMENT
hamlet = Text.Hamlet.hamlet -- Text.Hamlet.hamlet' when available hamlet = hamletWithSettings hamletRules defaultHamletSettings{hamletNewlines=True}
#else #else
hamlet = Text.Hamlet.hamlet hamlet = hamletWithSettings hamletRules defaultHamletSettings
#endif #endif