about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2009-08-29 13:58:26 -0700
committerEric Wong <normalperson@yhbt.net>2009-08-29 13:58:26 -0700
commitde46287e9ea70e63e77d17c862ee6bf5ab105e96 (patch)
treeefa4cd12abe20c50cbfbf3651d7eaa0bd6235109
parentd7cbdb6d59434145ed7293f97578feea83a47bc2 (diff)
downloadclogger-de46287e9ea70e63e77d17c862ee6bf5ab105e96.tar.gz
* pass correct arguments for changes
* correctly generate change log from git
* add blank line after description in release notes
-rw-r--r--GNUmakefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 913f821..8be93c8 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -44,10 +44,11 @@ release_changes := release_changes-$(VERSION).txt
 $(release_changes): verify
         git diff --stat $(vPREV) v$(VERSION) > $@+
         echo >> $@+
-        git log $(vPREV) v$(VERSION) >> $@+
+        git log $(vPREV)..v$(VERSION) >> $@+
         $(VISUAL) $@+ && test -s $@+ && mv $@+ $@
 $(release_notes): verify package
         gem spec pkg/clogger-$(VERSION).gem description | sed -ne '/\w/p' > $@+
+        echo >> $@+
         git cat-file tag v$(VERSION) | awk 'p>1{print $$0}/^$$/{++p}' >> $@+
         $(VISUAL) $@+ && test -s $@+ && mv $@+ $@
 verify:
@@ -65,11 +66,11 @@ package: verify
 
 # not using Hoe's release system since we release 2 gems but only one tgz
 release: package Manifest.txt $(release_notes) $(release_changes)
-        rubyforge add_release -f -n $(release_notes) -c $(release_changes) \
+        rubyforge add_release -f -n $(release_notes) -a $(release_changes) \
           clogger clogger $(VERSION) pkg/clogger-$(VERSION).gem
         rubyforge add_file \
           clogger clogger $(VERSION) pkg/clogger-$(VERSION).tgz
-        rubyforge add_release -f -n $(release_notes) -c $(release_changes) \
+        rubyforge add_release -f -n $(release_notes) -a $(release_changes) \
           clogger clogger_ext $(VERSION) pkg/clogger_ext-$(VERSION).gem
 endif