reverse and rename the blaze_html_0_5 flag to blaze_html_0_4

This commit is contained in:
Simon Michael 2013-04-19 12:40:29 -07:00
parent a32b0513bd
commit 2eabcd1360
5 changed files with 25 additions and 24 deletions

View File

@ -123,7 +123,7 @@ WEBLANGEXTS:=\
PREFERMACUSRLIBFLAGS=-L/usr/lib PREFERMACUSRLIBFLAGS=-L/usr/lib
GHCMEMFLAGS= #+RTS -M200m -RTS GHCMEMFLAGS= #+RTS -M200m -RTS
CABALMACROSFLAGS=-optP-include -optPhledger/dist/build/autogen/cabal_macros.h CABALMACROSFLAGS=-optP-include -optPhledger/dist/build/autogen/cabal_macros.h
BUILDFLAGS1:=-rtsopts $(WARNINGS) $(INCLUDEPATHS) $(PREFERMACUSRLIBFLAGS) $(GHCMEMFLAGS) $(CABALMACROSFLAGS) -DPATCHLEVEL=$(PATCHLEVEL) -DBLAZE_HTML_0_5 -DDEVELOPMENT BUILDFLAGS1:=-rtsopts $(WARNINGS) $(INCLUDEPATHS) $(PREFERMACUSRLIBFLAGS) $(GHCMEMFLAGS) $(CABALMACROSFLAGS) -DPATCHLEVEL=$(PATCHLEVEL) -DDEVELOPMENT
BUILDFLAGS:=$(BUILDFLAGS1) -DVERSION='"$(VERSION)dev"' BUILDFLAGS:=$(BUILDFLAGS1) -DVERSION='"$(VERSION)dev"'
PROFBUILDFLAGS:=-prof -fprof-auto -osuf hs_p PROFBUILDFLAGS:=-prof -fprof-auto -osuf hs_p
# sp needs different quoting: # sp needs different quoting:

View File

@ -66,18 +66,19 @@ title: hledger news
- The search field is wider - The search field is wider
- yesod devel is now supported; it uses `$LEDGER_FILE` or `~/.hledger.journal` - yesod devel is now supported; it uses `$LEDGER_FILE` or `~/.hledger.journal`
**Misc:**
* the `blaze_html_0_5` build flag has been reversed and renamed to `blaze_html_0_4`
**Add-ons:** **Add-ons:**
- The hledger-interest and hledger-irr commands have been released/updated. - The hledger-interest and hledger-irr commands have been released/updated.
- hledger-chart and hledger-vty remain unmaintained and deprecated. - hledger-chart and hledger-vty remain unmaintained and deprecated.
**Documentation:** **Documentation and infrastructure:**
- The hledger docs and website have been reorganised and updated - The hledger docs and website have been reorganised and updated
- Manuals for past releases are provided as well as the latest dev version - Manuals for past releases are provided as well as the latest dev version
**Other notes:**
- hledger has moved from darcs and darcs hub to git and github (!) - hledger has moved from darcs and darcs hub to git and github (!)
- the bug tracker has moved from google code to github - the bug tracker has moved from google code to github
- feature requests and project planning are now managed on trello - feature requests and project planning are now managed on trello

View File

@ -10,10 +10,10 @@ import Data.Maybe
import Data.Text(pack) import Data.Text(pack)
import Data.Time.Calendar import Data.Time.Calendar
import System.FilePath (takeFileName) import System.FilePath (takeFileName)
#if BLAZE_HTML_0_5 #if BLAZE_HTML_0_4
import Text.Blaze.Internal (preEscapedString)
#else
import Text.Blaze (preEscapedString) import Text.Blaze (preEscapedString)
#else
import Text.Blaze.Internal (preEscapedString)
#endif #endif
import Text.Printf import Text.Printf

View File

@ -12,10 +12,10 @@ import Data.Time.Calendar
import Data.Time.Clock import Data.Time.Clock
import Data.Time.Format import Data.Time.Format
import System.Locale (defaultTimeLocale) import System.Locale (defaultTimeLocale)
#if BLAZE_HTML_0_5 #if BLAZE_HTML_0_4
import Text.Blaze.Html (toHtml)
#else
import Text.Blaze (toHtml) import Text.Blaze (toHtml)
#else
import Text.Blaze.Html (toHtml)
#endif #endif
import Text.Hamlet import Text.Hamlet
import Yesod.Core import Yesod.Core

View File

@ -57,9 +57,9 @@ flag threaded
Description: Build with support for multithreaded execution. Description: Build with support for multithreaded execution.
Default: True Default: True
flag blaze_html_0_5 flag blaze_html_0_4
description: Use the newer 0.5 version of blaze-html and blaze-markup. description: Use the older 0.4 version of blaze-html.
default: True default: False
flag dev flag dev
@ -159,14 +159,14 @@ library
, warp , warp
, yaml , yaml
if flag(blaze_html_0_5) if flag(blaze_html_0_4)
cpp-options: -DBLAZE_HTML_0_5 cpp-options: -DBLAZE_HTML_0_4
build-depends:
blaze-html >= 0.4 && < 0.5
else
build-depends: build-depends:
blaze-html >= 0.5 && < 0.7 blaze-html >= 0.5 && < 0.7
, blaze-markup >= 0.5.1 && < 0.7 , blaze-markup >= 0.5.1 && < 0.7
else
build-depends:
blaze-html >= 0.4 && < 0.5
executable hledger-web executable hledger-web
@ -251,14 +251,14 @@ executable hledger-web
, http-conduit >= 1.8 && < 1.10 , http-conduit >= 1.8 && < 1.10
, data-default , data-default
if flag(blaze_html_0_5) if flag(blaze_html_0_4)
cpp-options: -DBLAZE_HTML_0_5 cpp-options: -DBLAZE_HTML_0_4
build-depends:
blaze-html >= 0.4 && < 0.5
else
build-depends: build-depends:
blaze-html >= 0.5 && < 0.7 blaze-html >= 0.5 && < 0.7
, blaze-markup >= 0.5.1 && < 0.7 , blaze-markup >= 0.5.1 && < 0.7
else
build-depends:
blaze-html >= 0.4 && < 0.5
test-suite test test-suite test