Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

* Tag uim 1.4.0-alpha again

  • Loading branch information...
commit 8fd99c0d5d1b7d811547e9a32b30e2b4d073c8ad 2 parents ba9c2eb + 50e6400
yamaken authored
Showing with 40 additions and 17 deletions.
  1. +5 −1 Makefile.am
  2. +3 −0  configure.ac
  3. +17 −15 doc/RELEASING
  4. +15 −1 make-dist.sh
6 Makefile.am
View
@@ -19,13 +19,17 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
UIM_REPOSITORY = http://anonsvn.freedesktop.org/svn/uim
TAGS_REPOSITORY = $(UIM_REPOSITORY)/tags
#RELEASE_URL = $(UIM_REPOSITORY)/trunk
-RELEASE_URL = $(TAGS_REPOSITORY)/$(PACKAGE)-$(VERSION)
+RELEASE_URL = $(TAGS_REPOSITORY)/$(distdir)
DIST_SUM_LIST = $(distdir).sum
DISTCLEANFILES = uim.pc uim.desktop \
intltool-extract intltool-merge intltool-update \
gnuify-changelog.pl $(DIST_SUM_LIST)
+MAINTAINERCLEANFILES = \
+ aclocal.m4 ltmain.sh depcomp missing install-sh \
+ intltool-extract.in intltool-merge.in intltool-update.in
+
.PHONY: FORCE sum
FORCE:
3  configure.ac
View
@@ -277,6 +277,9 @@ AX_CFLAGS_GCC_OPTION([-Wno-overlength-strings])
# Disable the problematic preprocessing on Mac OS X
AX_CFLAGS_GCC_OPTION([-no-cpp-precomp])
+# Deprecated autoconf macro used in AX_CXXFLAGS_GCC_OPTION.
+AC_DEFUN([AC_LANG_CXX], [AC_LANG([C++])])
+
AX_CXXFLAGS_GCC_OPTION([-pipe])
AX_CXXFLAGS_GCC_OPTION([-W])
AX_CXXFLAGS_GCC_OPTION([-Wall])
32 doc/RELEASING
View
@@ -31,21 +31,32 @@ release, you have to repeat the following procedure at least three times.
SSCM_URL="${TAGS_REPOSITORY}/sigscheme-0.7.2"
LIBGCROOTS_URL="${TAGS_REPOSITORY}/libgcroots-0.1.3"
+ And set appropriate $RELEASE_SUFFIX.
+
+ RELEASE_SUFFIX="-alpha"
+ RELEASE_SUFFIX="-beta"
+ RELEASE_SUFFIX=""
+
4. Export a fresh tree from svn.
svn export http://anonsvn.freedesktop.org/srv/uim/trunk
-5. Do a build test with make-dist.sh
+5. Do test.
+
+ This item needs many many description... I must fill this item later.
+
+6. Do a build test with make-dist.sh
This test is not enough, but worth doing. It is especially useful when a
new file is added. As a TODO, we should do unit testing at this point.
-6. Do test.
+7. Increment the version numbers in:
- This item needs many many description... I must fill this item later.
+ - configure.ac
+ - uim.h
+ - Project-Id-Version in po/*.po
-7. Increment the version number in configure.ac, uim.h and Project-Id-Version
- in po/*.po. Increment libtool-version.mk too if ABI is updated.
+ And increment libtool-version.mk too if ABI is updated.
8. Update NEWS and RELNOTE
@@ -70,16 +81,7 @@ release, you have to repeat the following procedure at least three times.
cd x.y.z
./make-dist.sh
- If the release is an alpha or beta, do following extra steps.
-
- Modify 'distdir' variable of Makefile.in as follows:
-
- #distdir = $(PACKAGE)-$(VERSION)
- distdir = $(PACKAGE)-$(VERSION)-alpha
-
- Make the distribution again with the -alpha or -beta suffix.
-
- make distcheck sum
+ Release suffixes such as '-alpha' and '-beta' is automatically appended.
12. Copy the source tarball to http://uim.freedesktop.org/releases
16 make-dist.sh
View
@@ -10,6 +10,7 @@ TAGS_REPOSITORY="${UIM_REPOSITORY}/tags"
SSCM_URL="${TAGS_REPOSITORY}/sigscheme-0.7.2"
#LIBGCROOTS_URL="${LIBGCROOTS_REPOSITORY}"
LIBGCROOTS_URL="${TAGS_REPOSITORY}/libgcroots-0.1.3"
+RELEASE_SUFFIX="-alpha"
CONF_COMMON="--enable-maintainer-mode --disable-warnings-into-error"
CONF_NONE="$CONF_COMMON --disable-debug --disable-fep --disable-emacs --disable-gnome-applet --disable-kde-applet --disable-pref --disable-dict --without-anthy --without-canna --without-mana --without-prime --without-m17nlib --without-scim --without-gtk2 --without-gnome2 --without-qt --without-qt-immodule --disable-compat-scm --without-eb --without-libedit"
@@ -22,7 +23,20 @@ svn export $SSCM_URL sigscheme
svn export $LIBGCROOTS_URL sigscheme/libgcroots
(cd sigscheme/libgcroots && ./autogen.sh) \
&& (cd sigscheme && ./autogen.sh) \
- && ./autogen.sh
+ && ./autogen.sh \
+|| { echo 'autogen failed.' && exit 1; }
+
+if test -n "$RELEASE_SUFFIX"; then
+ ed Makefile.in <<EOT
+/^distdir =
+d
+i
+#distdir = \$(PACKAGE)-\$(VERSION)
+distdir = \$(PACKAGE)-\$(VERSION)${RELEASE_SUFFIX}
+.
+wq
+EOT
+fi
for conf_args in "$CONF_NONE" "$CONF_DEFAULT" "$CONF_FULL"; do
echo "configure $conf_args"
Please sign in to comment.
Something went wrong with that request. Please try again.