From c18f54de7c1ad43b1addae5ebdbf541fa93aa7b8 Mon Sep 17 00:00:00 2001 From: PHO Date: Fri, 26 Aug 2011 19:02:19 +0900 Subject: [PATCH] ditz issues --- .ditz-plugins | 1 + .gitignore | 1 + ...b4c20935bf29db052a35d75039c638817227b.yaml | 18 +++++++ ...594f249504e28212f18a8a5c6b8a708b99f79.yaml | 19 ++++++++ bugs/project.yaml | 16 +++++++ cabal-package.mk | 47 ++++++++++++++++--- 6 files changed, 96 insertions(+), 6 deletions(-) create mode 100644 .ditz-plugins create mode 100644 bugs/issue-85eb4c20935bf29db052a35d75039c638817227b.yaml create mode 100644 bugs/issue-c8c594f249504e28212f18a8a5c6b8a708b99f79.yaml create mode 100644 bugs/project.yaml 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/.gitignore b/.gitignore index f76a6e2..13f30d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.hi *.o +.ditz-config Setup dist diff --git a/bugs/issue-85eb4c20935bf29db052a35d75039c638817227b.yaml b/bugs/issue-85eb4c20935bf29db052a35d75039c638817227b.yaml new file mode 100644 index 0000000..1213a44 --- /dev/null +++ b/bugs/issue-85eb4c20935bf29db052a35d75039c638817227b.yaml @@ -0,0 +1,18 @@ +--- !ditz.rubyforge.org,2008-03-06/issue +title: Use attoparsec, ascii and blaze-builder +desc: I want time-http to run fast, very fast. +type: :task +component: time-http +release: time-http-0.2 +reporter: PHO +status: :unstarted +disposition: +creation_time: 2011-08-26 09:53:57.719170 Z +references: [] + +id: 85eb4c20935bf29db052a35d75039c638817227b +log_events: +- - 2011-08-26 09:53:59.079180 Z + - PHO + - created + - "" diff --git a/bugs/issue-c8c594f249504e28212f18a8a5c6b8a708b99f79.yaml b/bugs/issue-c8c594f249504e28212f18a8a5c6b8a708b99f79.yaml new file mode 100644 index 0000000..4294f70 --- /dev/null +++ b/bugs/issue-c8c594f249504e28212f18a8a5c6b8a708b99f79.yaml @@ -0,0 +1,19 @@ +--- !ditz.rubyforge.org,2008-03-06/issue +title: Create a test suite using QuickCheck +desc: With great library comes great test suite. +type: :task +component: time-http +release: time-http-0.2 +reporter: PHO +status: :unstarted +disposition: +creation_time: 2011-08-26 09:56:40.231955 Z +references: [] + +id: c8c594f249504e28212f18a8a5c6b8a708b99f79 +log_events: +- - 2011-08-26 09:56:41.012217 Z + - PHO + - created + - "" +git_branch: diff --git a/bugs/project.yaml b/bugs/project.yaml new file mode 100644 index 0000000..aff7ff9 --- /dev/null +++ b/bugs/project.yaml @@ -0,0 +1,16 @@ +--- !ditz.rubyforge.org,2008-03-06/project +name: time-http +version: "0.5" +components: +- !ditz.rubyforge.org,2008-03-06/component + name: time-http +releases: +- !ditz.rubyforge.org,2008-03-06/release + name: time-http-0.2 + status: :unreleased + release_time: + log_events: + - - 2011-08-26 09:52:03.819024 Z + - PHO + - created + - "" diff --git a/cabal-package.mk b/cabal-package.mk index d8bbaad..2363b98 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,42 @@ 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 + +push: doc ditz + if [ -d "_darcs" ]; then \ + darcs push; \ + elif [ -d ".git" ]; then \ + git push --all && git push --tags; \ + fi + if [ -d "dist/doc" ]; then \ + rsync -av --delete \ + dist/doc/html/$(PKG_NAME)/ \ + www@nem.cielonegro.org:static.cielonegro.org/htdocs/doc/$(PKG_NAME); \ + fi + 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 -- 2.40.0