null+****@clear*****
null+****@clear*****
2011年 6月 28日 (火) 15:16:39 JST
Kouhei Sutou 2011-06-28 06:16:39 +0000 (Tue, 28 Jun 2011)
New Revision: 160964c8a7ca12e3497e8a3112d84396a99e2ce1
Log:
generate ChangeLog on dist and it's not included in repository.
Modified files:
Makefile.am
release/gitlog2changelog.py
Modified: Makefile.am (+2 -4)
===================================================================
--- Makefile.am 2011-06-28 06:16:10 +0000 (9f31a80)
+++ Makefile.am 2011-06-28 06:16:39 +0000 (dfec33a)
@@ -1,4 +1,4 @@
-# release: update-latest-release (commit) update-changelog (commit) tag
+# release: update-latest-release (commit) tag
ACLOCAL_AMFLAGS = $$ACLOCAL_ARGS -I .
AUTOMAKE_OPTIONS = 1.9.6
@@ -28,6 +28,7 @@ include $(srcdir)/version.sh
dist-hook:
echo "$(GROONGA_VERSION)" > $(distdir)/version
+ cd $(top_srcdir) && release/gitlog2changelog.py > $(distdir)/ChangeLog
benchmark:
cd test/benchmark && $(MAKE) $(AM_MAKEFLAGS) benchmark
@@ -44,9 +45,6 @@ win32-installer: all
nkf -Wsc $(builddir)/doc/ja/README > dist/doc/README.txt
makensis setup.nsi
-update-changelog:
- cd $(top_srcdir) && release/gitlog2changelog.py
-
tag:
cd $(top_srcdir) && git tag v$(VERSION) -a -m 'groonga $(VERSION)!!!'
Modified: release/gitlog2changelog.py (+2 -3)
===================================================================
--- release/gitlog2changelog.py 2011-06-28 06:16:10 +0000 (86728f2)
+++ release/gitlog2changelog.py 2011-06-28 06:16:39 +0000 (319e354)
@@ -2,12 +2,11 @@
# Copyright 2008 Marcus D. Hanwell <marcu****@cryos*****>
# Distributed under the terms of the GNU General Public License v2 or later
-import string, re, os
+import string, re, os, sys
# Execute git log with the desired command line options.
fin = os.popen('git log --summary --stat --no-merges --date=short', 'r')
-# Create a ChangeLog file in the current directory.
-fout = open('ChangeLog', 'w')
+fout = sys.stdout
# Set up the loop variables in order to locate the blocks we want
authorFound = False