openharmony/third_party_gettext
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_gettext.git synced 2026-07-21 16:45:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

build: Use git-version-gen intead of version.sh

Browse Source 
* version.sh: Remove.
* autogen.sh: Import git-version-gen from Gnulib.
* Makefile.am (EXTRA_DIST): Add $(top_srcdir)/.version.
(BUILT_SOURCES): Likewise.
($(top_srcdir)/.version): New rule.
(dist-hook): New rule.
* configure.ac: Use git-version-gen in AC_INIT.
* gettext-runtime/configure.ac: Likewise.
* gettext-tools/configure.ac: Likewise.
* gettext-tools/examples/configure.ac: Likewise.
* gettext-runtime/man/Makefile.am: Refer to .version instead of
version.sh.
* gettext-tools/doc/Makefile.am: Likewise.
* gettext-tools/man/Makefile.am: Likewise.
This commit is contained in:
Daiki Ueno
2014-04-22 11:19:38 +09:00
parent 1431ba78ad
commit fbf4e276c8
17 changed files with 75 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+12
View File
@@ -1,3 +1,15 @@
2014-04-22 Daiki Ueno <ueno@gnu.org>
build: Use git-version-gen intead of version.sh
* version.sh: Remove.
* autogen.sh: Import git-version-gen from Gnulib.
* Makefile.am (EXTRA_DIST): Remove version.sh and add
$(top_srcdir)/.version.
(BUILT_SOURCES): Add $(top_srcdir)/.version.
($(top_srcdir)/.version): New rule.
(dist-hook): New rule.
* configure.ac: Use git-version-gen in AC_INIT.
2014-04-21 Daiki Ueno <ueno@gnu.org>
autogen.sh: Split the regeneration of data files into update.sh
Makefile.am
+10 -2
View File
@@ -22,8 +22,7 @@ ACLOCAL_AMFLAGS = -I m4
SUBDIRS = gnulib-local gettext-runtime gettext-tools
EXTRA_DIST = \
version.sh DEPENDENCIES PACKAGING HACKING ChangeLog.0 autogen.sh \
update-po.sh \
DEPENDENCIES PACKAGING HACKING ChangeLog.0 autogen.sh update-po.sh \
build-aux/ac-help.sed build-aux/moopp \
m4/fixautomake.m4 m4/woe32-dll.m4 \
m4/libtool.m4
@@ -119,3 +118,12 @@ EXTRA_DIST += os2/README.OS2 os2/Makefile os2/backward.def os2/configure.awk
# Woe32 support.
EXTRA_DIST += README.woe32 windows/windres-options windows/gettext.rc
# Versioning based on Git release tags.
EXTRA_DIST += $(top_srcdir)/.version
BUILT_SOURCES = $(top_srcdir)/.version
$(top_srcdir)/.version:
echo $(VERSION) > $@-t && mv $@-t $@
dist-hook:
echo $(VERSION) > $(distdir)/.tarball-version
autogen.sh
+2
View File
@@ -370,7 +370,9 @@ if ! $skip_gnulib; then
'
$GNULIB_TOOL --dir=gettext-tools --source-base=libgettextpo --m4-base=libgettextpo/gnulib-m4 --macro-prefix=gtpo --makefile-name=Makefile.gnulib --libtool --local-dir=gnulib-local --local-symlink \
--import $GNULIB_MODULES_LIBGETTEXTPO $GNULIB_MODULES_LIBGETTEXTPO_OTHER || exit $?
# Import build tools. We use --copy-file to avoid directory creation.
$GNULIB_TOOL --copy-file tests/init.sh gettext-tools || exit $?
$GNULIB_TOOL --copy-file build-aux/git-version-gen || exit $?
fi
fi
configure.ac
+3 -3
View File
@@ -17,11 +17,11 @@ dnl along with this program. If not, see <http://www.gnu.org/licenses/>.
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.62])
AC_INIT
AC_INIT([gettext],
m4_esyscmd([build-aux/git-version-gen .tarball-version]),
[bug-gnu-gettext@gnu.org])
AC_CONFIG_SRCDIR([gettext-tools/src/msgfmt.c])
AC_CONFIG_AUX_DIR([build-aux])
. $srcdir/version.sh
gl_INIT_PACKAGE([gettext], [$VERSION_NUMBER])
AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests])
dnl Override automake's tar command used for creating distributions.
gettext-runtime/ChangeLog
+5
View File
@@ -1,3 +1,8 @@
2014-04-22 Daiki Ueno <ueno@gnu.org>
build: Use git-version-gen intead of version.sh
* configure.ac: Use git-version-gen in AC_INIT.
2013-07-07 Daiki Ueno <ueno@gnu.org>
* NEWS: Mention setlocale() change on Mac OS X.
gettext-runtime/configure.ac
+3 -3
View File
@@ -17,11 +17,11 @@ dnl along with this program. If not, see <http://www.gnu.org/licenses/>.
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.62])
AC_INIT
AC_INIT([gettext-runtime],
m4_esyscmd([../build-aux/git-version-gen ../.tarball-version]),
[bug-gnu-gettext@gnu.org])
AC_CONFIG_SRCDIR([intl/dcigettext.c])
AC_CONFIG_AUX_DIR([../build-aux])
. $srcdir/../version.sh
gl_INIT_PACKAGE([gettext-runtime], [$VERSION_NUMBER])
AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests])
AC_CONFIG_HEADERS([config.h])
gettext-runtime/man/ChangeLog
+5
View File
@@ -1,3 +1,8 @@
2014-04-22 Daiki Ueno <ueno@gnu.org>
build: Use git-version-gen intead of version.sh
* Makefile.am: Refer to .version instead of version.sh.
2013-06-10 Daiki Ueno <ueno@gnu.org>
* Makefile.am: Use $(MKDIR_P) instead of $(mkdir_p).
gettext-runtime/man/Makefile.am
+7 -8
View File
@@ -92,11 +92,10 @@ ngettext.1.in: ngettext.x
envsubst.1: envsubst.x
$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/envsubst$(EXEEXT) $(srcdir)/envsubst.x envsubst.1
# Depend on version.sh to get version number changes.
$(man_MAN1IN) $(man_MAN1OTHER): help2man $(top_srcdir)/../version.sh
$(man_MAN1IN) $(man_MAN1OTHER): help2man $(top_srcdir)/../.version
# Update them also during "make dist", in order to propagate added command
# line options that were added, even if version.sh didn't change.
# line options that were added, even if .version didn't change.
UPDATEMODE =
update-man1:
$(MAKE) $(man_MAN1IN) $(man_MAN1OTHER) UPDATEMODE=--update
@@ -104,19 +103,19 @@ update-man1:
# Hidden from automake, but really activated. Works around an automake-1.5 bug.
#distdir: update-man1
gettext.3: gettext.3.in $(top_srcdir)/../version.sh
gettext.3: gettext.3.in $(top_srcdir)/../.version
sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/gettext.3.in > t-$@
mv t-$@ $@
ngettext.3: ngettext.3.in $(top_srcdir)/../version.sh
ngettext.3: ngettext.3.in $(top_srcdir)/../.version
sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/ngettext.3.in > t-$@
mv t-$@ $@
textdomain.3: textdomain.3.in $(top_srcdir)/../version.sh
textdomain.3: textdomain.3.in $(top_srcdir)/../.version
sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/textdomain.3.in > t-$@
mv t-$@ $@
bindtextdomain.3: bindtextdomain.3.in $(top_srcdir)/../version.sh
bindtextdomain.3: bindtextdomain.3.in $(top_srcdir)/../.version
sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/bindtextdomain.3.in > t-$@
mv t-$@ $@
bind_textdomain_codeset.3: bind_textdomain_codeset.3.in $(top_srcdir)/../version.sh
bind_textdomain_codeset.3: bind_textdomain_codeset.3.in $(top_srcdir)/../.version
sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/bind_textdomain_codeset.3.in > t-$@
mv t-$@ $@
gettext-tools/ChangeLog
+5
View File
@@ -1,3 +1,8 @@
2014-04-22 Daiki Ueno <ueno@gnu.org>
build: Use git-version-gen intead of version.sh
* configure.ac: Use git-version-gen in AC_INIT.
2014-03-11 Daiki Ueno <ueno@gnu.org>
* configure.ac: Remove unnecessary make-variable expansion,
gettext-tools/configure.ac
+3 -9
View File
@@ -17,11 +17,11 @@ dnl along with this program. If not, see <http://www.gnu.org/licenses/>.
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.62])
AC_INIT
AC_INIT([gettext-tools],
m4_esyscmd([../build-aux/git-version-gen ../.tarball-version]),
[bug-gnu-gettext@gnu.org])
AC_CONFIG_SRCDIR([src/msgfmt.c])
AC_CONFIG_AUX_DIR([../build-aux])
. $srcdir/../version.sh
gl_INIT_PACKAGE([gettext-tools], [$VERSION_NUMBER])
AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests])
AC_CONFIG_HEADERS([config.h])
@@ -499,12 +499,6 @@ AC_SUBST([TESTLIBASPRINTF])
dnl Generate the version information file in the intl/ directory.
test -d intl || mkdir intl
echo "GNU gettext library from gettext-$VERSION" > intl/VERSION
cat > intl/ChangeLog.inst <<EOF
$RELEASE_DATE GNU <bug-gnu-gettext@gnu.org>
* Version $VERSION released.
EOF
AC_CONFIG_SUBDIRS([examples])
gettext-tools/doc/ChangeLog
+5
View File
@@ -1,3 +1,8 @@
2014-04-22 Daiki Ueno <ueno@gnu.org>
build: Use git-version-gen intead of version.sh
* Makefile.am: Refer to .version instead of version.sh.
2014-04-15 Daiki Ueno <ueno@gnu.org>
* msgfilter.texi: Document 'quot' and 'boldquot' built-in filters.
gettext-tools/doc/Makefile.am
+1 -1
View File
@@ -71,7 +71,7 @@ iso-3166.texi: ISO_3166 iso-3166.sed
# The dependencies of stamp-vti generated by automake are incomplete.
# So we have to duplicate the entire rule which would otherwise be generated
# by automake.
$(srcdir)/stamp-vti: $(info_TEXINFOS) $(gettext_TEXINFOS) $(top_srcdir)/../version.sh
$(srcdir)/stamp-vti: $(info_TEXINFOS) $(gettext_TEXINFOS) $(top_srcdir)/../.version
(dir=.; test -f ./gettext.texi || dir=$(srcdir); \
set `$(SHELL) $(top_srcdir)/../build-aux/mdate-sh $$dir/gettext.texi`; \
echo "@set UPDATED $$1 $$2 $$3"; \
gettext-tools/examples/ChangeLog
+5
View File
@@ -1,3 +1,8 @@
2014-04-22 Daiki Ueno <ueno@gnu.org>
build: Use git-version-gen intead of version.sh
* configure.ac: Use git-version-gen in AC_INIT.
2014-04-21 Daiki Ueno <ueno@gnu.org>
examples: Quote shell variables in hello-java*/configure
gettext-tools/examples/configure.ac
+3 -3
View File
@@ -17,11 +17,11 @@ dnl along with this program. If not, see <http://www.gnu.org/licenses/>.
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.57])
AC_INIT
AC_INIT([gettext-examples],
m4_esyscmd([../../build-aux/git-version-gen ../../.tarball-version]),
[bug-gnu-gettext@gnu.org])
AC_CONFIG_SRCDIR([installpaths.in])
AC_CONFIG_AUX_DIR([../../build-aux])
. $srcdir/../../version.sh
gl_INIT_PACKAGE([gettext-examples], [$VERSION_NUMBER])
AM_INIT_AUTOMAKE([silent-rules])
dnl Installation directories.
gettext-tools/man/ChangeLog
+4
View File
@@ -1,3 +1,7 @@
2014-04-22 Daiki Ueno <ueno@gnu.org>
* Makefile.am: Refer to .version instead of version.sh.
2013-06-10 Daiki Ueno <ueno@gnu.org>
* Makefile.am: Use $(MKDIR_P) instead of $(mkdir_p).
gettext-tools/man/Makefile.am
+2 -3
View File
@@ -114,11 +114,10 @@ gettextize.1: gettextize.x
autopoint.1: autopoint.x
$(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../misc/autopoint $(srcdir)/autopoint.x autopoint.1
# Depend on version.sh to get version number changes.
$(man_MAN1): help2man $(top_srcdir)/../version.sh
$(man_MAN1): help2man $(top_srcdir)/../.version
# Update them also during "make dist", in order to propagate added command
# line options that were added, even if version.sh didn't change.
# line options that were added, even if .version didn't change.
UPDATEMODE =
update-man1:
$(MAKE) $(man_MAN1) UPDATEMODE=--update
version.sh
-3
View File
@@ -1,3 +0,0 @@
# Version number and release date.
VERSION_NUMBER=0.18.3
RELEASE_DATE=2013-07-07 # in "date +%Y-%m-%d" format