From e47a0e977d38a22a34606ee204d8133ef3404acb Mon Sep 17 00:00:00 2001 From: PHO Date: Thu, 28 Jul 2011 23:01:19 +0900 Subject: [PATCH] Fix breakage on newer GHC and other libraries. --- .ditz-config | 6 +++ .ditz-plugins | 1 + ...5285571ae9af254ada3f8465aaab12c134bb0.yaml | 19 ++++++++ bugs/project.yaml | 8 ++++ cabal-package.mk | 48 ++++++++++++++++--- time-w3c.cabal | 9 ++-- 6 files changed, 81 insertions(+), 10 deletions(-) create mode 100644 .ditz-config create mode 100644 .ditz-plugins create mode 100644 bugs/issue-da05285571ae9af254ada3f8465aaab12c134bb0.yaml create mode 100644 bugs/project.yaml diff --git a/.ditz-config b/.ditz-config new file mode 100644 index 0000000..e05d7f5 --- /dev/null +++ b/.ditz-config @@ -0,0 +1,6 @@ +--- !ditz.rubyforge.org,2008-03-06/config +name: PHO +email: pho@cielonegro.org +issue_dir: bugs +git_commit_url_prefix: http://git.cielonegro.org/gitweb.cgi?p=time-w3c.git;a=commit;h= +git_branch_url_prefix: http://git.cielonegro.org/gitweb.cgi?p=time-w3c.git;a=shortlog;h=refs/heads/ diff --git a/.ditz-plugins b/.ditz-plugins new file mode 100644 index 0000000..2756e1e --- /dev/null +++ b/.ditz-plugins @@ -0,0 +1 @@ +- git diff --git a/bugs/issue-da05285571ae9af254ada3f8465aaab12c134bb0.yaml b/bugs/issue-da05285571ae9af254ada3f8465aaab12c134bb0.yaml new file mode 100644 index 0000000..016b996 --- /dev/null +++ b/bugs/issue-da05285571ae9af254ada3f8465aaab12c134bb0.yaml @@ -0,0 +1,19 @@ +--- !ditz.rubyforge.org,2008-03-06/issue +title: Cabalize the test suite +desc: Cabal now supports integrated unit testing. Make use of it. +type: :task +component: time-w3c +release: +reporter: PHO +status: :unstarted +disposition: +creation_time: 2011-07-28 13:25:50.614594 Z +references: [] + +id: da05285571ae9af254ada3f8465aaab12c134bb0 +log_events: +- - 2011-07-28 13:25:51.779942 Z + - PHO + - created + - "" +git_branch: diff --git a/bugs/project.yaml b/bugs/project.yaml new file mode 100644 index 0000000..a60cc44 --- /dev/null +++ b/bugs/project.yaml @@ -0,0 +1,8 @@ +--- !ditz.rubyforge.org,2008-03-06/project +name: time-w3c +version: "0.5" +components: +- !ditz.rubyforge.org,2008-03-06/component + name: time-w3c +releases: [] + diff --git a/cabal-package.mk b/cabal-package.mk index d8bbaad..41cbbd2 100644 --- a/cabal-package.mk +++ b/cabal-package.mk @@ -14,11 +14,14 @@ RM_RF ?= rm -rf SUDO ?= sudo AUTOCONF ?= autoconf HLINT ?= hlint +HPC ?= hpc +DITZ ?= ditz CONFIGURE_ARGS ?= --disable-optimization SETUP_FILE := $(wildcard Setup.*hs) CABAL_FILE := $(wildcard *.cabal) +PKG_NAME := $(CABAL_FILE:.cabal=) ifeq ($(shell ls configure.ac 2>/dev/null),configure.ac) AUTOCONF_AC_FILE := configure.ac @@ -40,6 +43,7 @@ all: build build: setup-config build-hook ./Setup build + $(RM_RF) *.tix build-hook: @@ -70,7 +74,7 @@ Setup: $(SETUP_FILE) $(GHC) --make Setup clean: clean-hook - $(RM_RF) dist Setup *.o *.hi .setup-config *.buildinfo + $(RM_RF) dist Setup *.o *.hi .setup-config *.buildinfo *.tix .hpc $(FIND) . -name '*~' -exec rm -f {} \; clean-hook: @@ -85,11 +89,43 @@ sdist: setup-config ./Setup sdist test: build + $(RM_RF) dist/test ./Setup test + if ls *.tix >/dev/null 2>&1; then \ + $(HPC) sum --output="merged.tix" --union --exclude=Main *.tix; \ + $(HPC) markup --destdir="dist/hpc" --fun-entry-count "merged.tix"; \ + fi + +ditz: + $(DITZ) html dist/ditz + +fixme: + @$(FIND) . \ + \( -name 'dist' -or -name '.git' -or -name '_darcs' \) -prune \ + -or \ + \( -name '*.c' -or -name '*.h' -or \ + -name '*.hs' -or -name '*.lhs' -or \ + -name '*.hsc' -or -name '*.cabal' \) \ + -exec egrep -i '(fixme|thinkme)' {} \+ \ + || echo 'No FIXME or THINKME found.' lint: - $(HLINT) . --report \ - --ignore="Use string literal" \ - --ignore="Use concatMap" - -.PHONY: build build-hook setup-config setup-config-hook run clean clean-hook install doc sdist test lint + $(HLINT) . --report +# $(HLINT) . --report \ +# --ignore="Use string literal" \ +# --ignore="Use concatMap" + +push: doc ditz + if [ -d "_darcs" ]; then \ + darcs push; \ + elif [ -d ".git" ]; then \ + git push --all && git push --tags; \ + fi + rsync -av --delete \ + dist/doc/html/$(PKG_NAME)/ \ + www@nem.cielonegro.org:static.cielonegro.org/htdocs/doc/$(PKG_NAME) + rsync -av --delete \ + dist/ditz/ \ + www@nem.cielonegro.org:static.cielonegro.org/htdocs/ditz/$(PKG_NAME) + +.PHONY: build build-hook setup-config setup-config-hook run clean clean-hook install doc sdist test lint push diff --git a/time-w3c.cabal b/time-w3c.cabal index d2c5148..e1e5cff 100644 --- a/time-w3c.cabal +++ b/time-w3c.cabal @@ -15,6 +15,7 @@ Author: PHO Maintainer: PHO Stability: Experimental Homepage: http://cielonegro.org/W3CDateTime.html +Bug-Reports: http://static.cielonegro.org/ditz/time-w3c/ Category: Web Build-type: Simple Cabal-version: >= 1.6 @@ -36,10 +37,10 @@ Library Data.Time.W3C.Types Build-depends: - base >= 4.2 && < 4.3, - convertible >= 1.0 && < 1.1, - parsec >= 3.0 && < 3.1, - time >= 1.1 && < 1.2 + base == 4.3.*, + convertible == 1.0.*, + parsec == 3.1.*, + time == 1.2.* Extensions: DeriveDataTypeable -- 2.40.0