From: PHO <pho@cielonegro.org>
Date: Thu, 1 Dec 2011 02:21:05 +0000 (+0900)
Subject: ditz: open time-http-3
X-Git-Tag: RELEASE-0.3~2
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=901a3635d37e25a2d4c2e1562c32c68c410fbdd3;p=time-http.git

ditz: open time-http-3
---

diff --git a/bugs/issue-0a3272772c73cf31486eb2b6691fa38232d3c4c5.yaml b/bugs/issue-0a3272772c73cf31486eb2b6691fa38232d3c4c5.yaml
new file mode 100644
index 0000000..8792f58
--- /dev/null
+++ b/bugs/issue-0a3272772c73cf31486eb2b6691fa38232d3c4c5.yaml
@@ -0,0 +1,19 @@
+--- !ditz.rubyforge.org,2008-03-06/issue 
+title: Use tagged and convertible
+desc: It ain't cool to have a bunch of individual functions like toAscii / fromAscii.
+type: :task
+component: time-http
+release: time-http-0.3
+reporter: PHO <pho@cielonegro.org>
+status: :unstarted
+disposition: 
+creation_time: 2011-12-01 01:58:17.790699 Z
+references: []
+
+id: 0a3272772c73cf31486eb2b6691fa38232d3c4c5
+log_events: 
+- - 2011-12-01 01:58:18.629979 Z
+  - PHO <pho@cielonegro.org>
+  - created
+  - ""
+git_branch: 
diff --git a/bugs/project.yaml b/bugs/project.yaml
index d14f492..d32c842 100644
--- a/bugs/project.yaml
+++ b/bugs/project.yaml
@@ -18,3 +18,12 @@ releases:
     - PHO <pho@cielonegro.org>
     - released
     - Done.
+- !ditz.rubyforge.org,2008-03-06/release 
+  name: time-http-0.3
+  status: :unreleased
+  release_time: 
+  log_events: 
+  - - 2011-12-01 01:56:31.200996 Z
+    - PHO <pho@cielonegro.org>
+    - created
+    - Use tagged and convertible.
diff --git a/cabal-package.mk b/cabal-package.mk
index e412139..bec1d14 100644
--- a/cabal-package.mk
+++ b/cabal-package.mk
@@ -18,6 +18,11 @@ HPC      ?= hpc
 DITZ     ?= ditz
 
 CONFIGURE_ARGS ?= --disable-optimization
+HADDOCK_OPTS   ?= --hyperlink-source
+HLINT_OPTS     ?= \
+	--hint=Default --hint=Dollar --hint=Generalise \
+	--cross \
+	--report=dist/report.html
 
 SETUP_FILE := $(wildcard Setup.*hs)
 CABAL_FILE := $(wildcard *.cabal)
@@ -73,6 +78,10 @@ $(BUILDINFO_FILE): $(BUILDINFO_IN_FILE) configure
 Setup: $(SETUP_FILE)
 	$(GHC) --make Setup
 
+reconfigure:
+	rm -f dist/setup-config
+	$(MAKE) setup-config
+
 clean: clean-hook
 	$(RM_RF) dist Setup *.o *.hi .setup-config *.buildinfo *.tix .hpc
 	$(FIND) . -name '*~' -exec rm -f {} \;
@@ -80,7 +89,7 @@ clean: clean-hook
 clean-hook:
 
 doc: setup-config
-	./Setup haddock
+	./Setup haddock $(HADDOCK_OPTS)
 
 install: build
 	$(SUDO) ./Setup install
@@ -96,16 +105,7 @@ test: build
 		$(HPC) markup --destdir="dist/hpc" --fun-entry-count "merged.tix"; \
 	fi
 
-ditz:
-	$(DITZ) html dist/ditz
-
-ChangeLog:
-	rm -f $@
-	$(DITZ) releases | awk '{print $$1}' | sort --reverse | while read i; do \
-		$(DITZ) changelog $$i >> $@; \
-	done
-	head $@
-
+# -- Find FIXME Tags ----------------------------------------------------------
 fixme:
 	@$(FIND) . \
 		\( -name 'dist' -or -name '.git' -or -name '_darcs' \) -prune \
@@ -113,12 +113,30 @@ fixme:
 		\( -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.'
+		-exec egrep 'FIXME|THINKME|TODO' {} \+ \
+		|| echo 'No FIXME, THINKME, nor TODO found.'
 
+# -- HLint --------------------------------------------------------------------
+HLINT_TARGETS ?= $$(find -E . -type d -name dist -prune -o -regex '.*\.(hsc?|lhs)' -print)
 lint:
-	$(HLINT) . --cross --report
+	$(HLINT) $(HLINT_TARGETS) $(HLINT_OPTS)
+
+# -- Ditz the Distributed Issue Tracker ---------------------------------------
+ifeq (,$(wildcard .ditz-config))
+ditz:
+else
+ditz:
+	$(DITZ) html dist/ditz
 
+ChangeLog:
+	rm -f $@
+	$(DITZ) releases | awk '{print $$1}' | sort --reverse | while read i; do \
+		$(DITZ) changelog $$i >> $@; \
+	done
+	head $@
+endif
+
+# -- Pushing to remote hosts --------------------------------------------------
 push: push-repo push-ditz push-doc
 
 push-repo:
@@ -129,9 +147,11 @@ push-repo:
 	fi
 
 push-ditz: ditz
-	rsync -av --delete \
-		dist/ditz/ \
-		www@nem.cielonegro.org:static.cielonegro.org/htdocs/ditz/$(PKG_NAME)
+	if [ -d "dist/ditz" ]; then \
+		rsync -av --delete \
+			dist/ditz/ \
+			www@nem.cielonegro.org:static.cielonegro.org/htdocs/ditz/$(PKG_NAME); \
+	fi
 
 push-doc: doc
 	if [ -d "dist/doc" ]; then \
@@ -140,6 +160,7 @@ push-doc: doc
 			www@nem.cielonegro.org:static.cielonegro.org/htdocs/doc/$(PKG_NAME); \
 	fi
 
+# -- Phony Targets ------------------------------------------------------------
 .PHONY: build build-hook setup-config setup-config-hook run clean clean-hook \
 		install doc sdist test lint push push-repo push-ditz push-doc \
 		ChangeLog