updating things to prepare EsounD-0.2

diff --git a/EsounD.cabal b/EsounD.cabal
index c24489f50e13759e81cde4bbd69bf90d5bfd47b9..e69a42324d53e622bd77a2de523642aae967756e 100644 (file)
--- a/EsounD.cabal
+++ b/EsounD.cabal
@@ -16,6 +16,7 @@ Cabal-Version: >= 1.6
 Build-Type: Simple
 Extra-Source-Files:
     COPYING
 Build-Type: Simple
 Extra-Source-Files:
     COPYING

+    NEWS

 
 Source-Repository head
     Type: git
 
 Source-Repository head
     Type: git

diff --git a/NEWS b/NEWS
new file mode 100644 (file)
index 0000000..9d206a5
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,2 @@
+== EsounD-0.2 / 2011-05-11
+* Replace use of MonadPeelIO with MonadControlIO (Thanks: Bas van Dijk)

diff --git a/bugs/issue-5c1f9155776630719beb254e936b4d87d9a4d00f.yaml b/bugs/issue-5c1f9155776630719beb254e936b4d87d9a4d00f.yaml
index 6b961ff66848ffee57d1b88a608c4d9277afa32a..110cec01afef5d37756256ac43ed426e81b86c56 100644 (file)
--- a/bugs/issue-5c1f9155776630719beb254e936b4d87d9a4d00f.yaml
+++ b/bugs/issue-5c1f9155776630719beb254e936b4d87d9a4d00f.yaml
@@ -5,8 +5,8 @@ type: :task
 component: EsounD
 release: EsounD-0.2
 reporter: PHO <pho@cielonegro.org>
 component: EsounD
 release: EsounD-0.2
 reporter: PHO <pho@cielonegro.org>

-status: :unstarted
-disposition: 
+status: :closed
+disposition: :fixed

 creation_time: 2011-05-11 00:05:07.869855 Z
 references: []
 
 creation_time: 2011-05-11 00:05:07.869855 Z
 references: []
 


@@ -16,4 +16,8 @@ log_events:
   - PHO <pho@cielonegro.org>
   - created
   - ""
   - PHO <pho@cielonegro.org>
   - created
   - ""

+- - 2011-05-11 00:09:32.628049 Z
+  - PHO <pho@cielonegro.org>
+  - closed with disposition fixed
+  - Done.

 git_branch: 
 git_branch: 

diff --git a/bugs/project.yaml b/bugs/project.yaml
index b1d5853f123de1088b95511d6ad4caf66719a71c..e7619f377c693b14e316995e212d73ec503456f8 100644 (file)
--- a/bugs/project.yaml
+++ b/bugs/project.yaml
@@ -7,10 +7,14 @@ components:
 releases: 
 - !ditz.rubyforge.org,2008-03-06/release 
   name: EsounD-0.2
 releases: 
 - !ditz.rubyforge.org,2008-03-06/release 
   name: EsounD-0.2

-  status: :unreleased
-  release_time: 
+  status: :released
+  release_time: 2011-05-11 00:10:13.445538 Z

   log_events: 
   - - 2011-05-11 00:03:04.500665 Z
     - PHO <pho@cielonegro.org>
     - created
     - Use regions-0.9.* instead of regions-0.8.*
   log_events: 
   - - 2011-05-11 00:03:04.500665 Z
     - PHO <pho@cielonegro.org>
     - created
     - Use regions-0.9.* instead of regions-0.8.*

+  - - 2011-05-11 00:10:13.445564 Z
+    - PHO <pho@cielonegro.org>
+    - released
+    - ""

diff --git a/cabal-package.mk b/cabal-package.mk
index d8bbaad16ee155ad694cb2b90652a37fdb10636e..585fc30b5684cf9a145d8f4786e44184551f7605 100644 (file)
--- a/cabal-package.mk
+++ b/cabal-package.mk
@@ -14,6 +14,8 @@ RM_RF    ?= rm -rf
 SUDO     ?= sudo
 AUTOCONF ?= autoconf
 HLINT    ?= hlint
 SUDO     ?= sudo
 AUTOCONF ?= autoconf
 HLINT    ?= hlint

+HPC      ?= hpc
+DITZ     ?= ditz

 
 CONFIGURE_ARGS ?= --disable-optimization
 
 
 CONFIGURE_ARGS ?= --disable-optimization
 


@@ -40,6 +42,7 @@ all: build
 
 build: setup-config build-hook
        ./Setup build
 
 build: setup-config build-hook
        ./Setup build

+       $(RM_RF) *.tix

 
 build-hook:
 
 
 build-hook:
 


@@ -70,7 +73,7 @@ Setup: $(SETUP_FILE)
        $(GHC) --make Setup
 
 clean: clean-hook
        $(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:
        $(FIND) . -name '*~' -exec rm -f {} \;
 
 clean-hook:


@@ -85,11 +88,30 @@ sdist: setup-config
        ./Setup sdist
 
 test: build
        ./Setup sdist
 
 test: build

+       $(RM_RF) dist/test

        ./Setup 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:
 
 lint:

-       $(HLINT) . --report \
-               --ignore="Use string literal" \
-               --ignore="Use concatMap"
+       $(HLINT) . --report
+#      $(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
 
 .PHONY: build build-hook setup-config setup-config-hook run clean clean-hook install doc sdist test lint