From 16b19d4fa159f02c7bfd0d17779cb8f93b782582 Mon Sep 17 00:00:00 2001
From: Yuto Hayamizu <y.hayamizu@gmail.com>
Date: Tue, 29 Dec 2009 21:14:53 +0900
Subject: [PATCH] updated release script

---
 Makefile      | 27 +++++++++++++++++++--------
 howto/release |  2 +-
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index edf0da5e..46f6000a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,11 @@
 
 EMACS ?= emacs
 
-DISTRIB_FILES = twittering-mode.el README NEWS INSTALL win-curl
+DISTRIB_FILES = twittering-mode.el \
+		README README.ja \
+		NEWS NEWS.ja \
+		INSTALL INSTALL.ja \
+		win-curl
 
 .PHONY: all check clean update-po release
 
@@ -14,25 +18,32 @@ check:
 	./test/run-test.sh -y
 
 clean : 
-	rm -f twittering-mode.elc README NEWS *.zip *.tar.gz
+	rm -f twittering-mode.elc README *.zip *.tar.gz
 
-DISTRIB_DIR = twittering-mode-$$(cat VERSION)
+VERSION = $$(cat VERSION)
+DISTRIB_DIR = twittering-mode-$(VERSION)
 
 README: README.markdown
 	cp $< $@
-NEWS: NEWS.markdown
-	cp $< $@
 release: $(DISTRIB_FILES)
 	@(! [ -z "$${SF_USERNAME}" ] || (echo "Environmental variable 'SF_USERNAME', which is a username of sf.net, is required."; false))
 	@echo -n "updated VERSION and LAST-VERSION files? [y or n]: "; read ans; [ "$${ans}" = "y" ]
-	@echo -n "wrote NEWS.markdown file? [y or n]: "; read ans; [ "$${ans}" = "y" ]
-	@echo -n "made a tag '$(DISTRIB_DIR)'? [y or n]: "; read ans; [ "$${ans}" = "y" ]
+	@echo -n "wrote NEWS file? [y or n]: "; read ans; [ "$${ans}" = "y" ]
+	@echo -n "made a tag 'v$(VERSION)'? [y or n]: "; read ans; \
+	  if [ "$${ans}" != "y" ]; then \
+	    echo -n "  make it now? [y or n]: "; read ans; \
+	    if [ "$${ans}" = "y" ]; then \
+	      echo git tag -a -m '"Release tag: v$(VERSION)"' v$(VERSION); \
+	      git tag -a -m "Release tag: v$(VERSION)" v$(VERSION); \
+	    else \
+	      false; \
+	    fi; \
+	  fi
 	ruby misc/vernum-updater.rb \
 	  --prev-version=$$(cat LAST-VERSION) --next-version=$$(cat VERSION) \
 	  VERSION twittering-mode.el doc/web/index.html
 	@([ -d $(DISTRIB_DIR) ] && rm -rf $(DISTRIB_DIR)) || true
 	mkdir $(DISTRIB_DIR)
-	cp README.markdown $(DISTRIB_DIR)/
 	cp -r -t $(DISTRIB_DIR)/ $(DISTRIB_FILES)
 	zip -r $(DISTRIB_DIR).zip $(addprefix $(DISTRIB_DIR)/,$(DISTRIB_FILES))
 	tar czvf $(DISTRIB_DIR).tar.gz $(addprefix $(DISTRIB_DIR)/,$(DISTRIB_FILES))
diff --git a/howto/release b/howto/release
index 8ae87785..6ede4252 100644
--- a/howto/release
+++ b/howto/release
@@ -7,7 +7,7 @@
 - Add new version number to `/NEWS` and describe updates.
 - Update version numbers on web pages(`/doc/web/index.text`).
 - Change the version number in `/VERSION` to next (expected) version number.
-- Make a tag `release-<VERSION>`
+- Make a tag `v<VERSION>`
 - Upload new source files to souceforge.net
 - Publish web pages(`cd doc/web; make upload`).
 - Release announce on MLs.