diff options
| -rw-r--r-- | .bzrignore | 5 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | Makefile.in.in | 11 | ||||
| -rwxr-xr-x | autogen.sh | 26 | ||||
| -rw-r--r-- | doc/I18N-HOWTO | 26 | ||||
| -rw-r--r-- | doc/intltool-extract.8 | 18 | ||||
| -rw-r--r-- | doc/intltool-merge.8 | 30 | ||||
| -rw-r--r-- | doc/intltool-update.8 | 8 | ||||
| -rw-r--r-- | doc/intltoolize.8 | 10 | ||||
| -rw-r--r-- | intltool.m4 | 25 | ||||
| -rw-r--r-- | tests/cases/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/results/Makefile.am | 1 |
12 files changed, 60 insertions, 104 deletions
@@ -1,11 +1,14 @@ +ChangeLog Makefile Makefile.in +config.* intltool-extract intltool-merge intltool-prepare intltool-update intltoolize tests/selftest.pl -*.gz *.bz2 +*.gz +*.xz diff --git a/Makefile.am b/Makefile.am index f1c3d58..89872f1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -47,5 +47,5 @@ ChangeLog: echo "ChangeLog can only be generated in a check-out."; \ exit 1; \ else \ - $(BZR) log > $@; \ + $(BZR) log --gnu-changelog -l 50 > $@; \ fi diff --git a/Makefile.in.in b/Makefile.in.in index 06a8cfe..fcd2c3b 100644 --- a/Makefile.in.in +++ b/Makefile.in.in @@ -33,8 +33,7 @@ exec_prefix = @exec_prefix@ datadir = @datadir@ datarootdir = @datarootdir@ libdir = @libdir@ -DATADIRNAME = @DATADIRNAME@ -itlocaledir = $(prefix)/$(DATADIRNAME)/locale +localedir = @localedir@ subdir = po install_sh = @install_sh@ # Automake >= 1.8 provides @mkdir_p@. @@ -80,7 +79,7 @@ INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@; .po.pox: $(MAKE) $(GETTEXT_PACKAGE).pot - $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox + $(MSGMERGE) $* $(GETTEXT_PACKAGE).pot -o $*.pox .po.mo: $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< @@ -108,7 +107,7 @@ install-data-no: all install-data-yes: all linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ - dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ + dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ $(mkdir_p) $$dir; \ if test -r $$lang.gmo; then \ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ @@ -142,8 +141,8 @@ install-exec installcheck: uninstall: linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ done check: all $(GETTEXT_PACKAGE).pot @@ -1,21 +1,19 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. +test -n "$srcdir" || srcdir=`dirname "$0"` +test -n "$srcdir" || srcdir=. -PKG_NAME="intltool" -REQUIRED_AUTOMAKE_VERSION="1.6" +olddir=`pwd` +cd $srcdir -(test -f $srcdir/intltoolize.in) || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level $PKG_NAME directory" - exit 1 -} +AUTORECONF=`which autoreconf` +if test -z $AUTORECONF; then + echo "*** No autoreconf found, please intall it ***" + exit 1 +fi -which gnome-autogen.sh || { - echo "You need to install gnome-common from the GNOME CVS" - exit 1 -} +autoreconf --force --install --verbose -USE_GNOME2_MACROS=1 . gnome-autogen.sh +cd $olddir +test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" diff --git a/doc/I18N-HOWTO b/doc/I18N-HOWTO index 36c14d0..466719e 100644 --- a/doc/I18N-HOWTO +++ b/doc/I18N-HOWTO @@ -50,7 +50,7 @@ int main (void) { AM_INIT_AUTOMAKE($PACKAGE, $VERSION) to configure.in, just after AC_INIT - Change AC_CONFIG_HEADER to AM_CONFIG_HEADER as well. + Change AC_CONFIG_HEADERS to AM_CONFIG_HEADER as well. If you have an empty AC_CONFIG_FILES macro, then comment that, or automake will fail in the next step. @@ -92,13 +92,7 @@ int main (void) { The gettext macros need to be added after the initial checks. Putting them after the checks for library functions is a good idea. - IT_PROG_INTLTOOL(0.26) - - AM_GNU_GETTEXT([external]) # Only one of these two macro calls - AM_GLIB_GNU_GETTEXT # is needed to set up your project - - ALL_LINGUAS="da nl" # Internationalization, means there is - # a .po file for danish and dutch. + IT_PROG_INTLTOOL(0.50.0) AC_OUTPUT( Makefile @@ -111,19 +105,6 @@ int main (void) { Please require the latest intltool that exists. Intltool releases are pretty stable and often only contains bugfixes. - AM_GNU_GETTEXT adds native language support to automake, together - with a compile option. - - AM_GNU_GETTEXT will check for additional required functions and - programs and will finally create po/POTFILES during configure. - - Instead of AM_GNU_GETTEXT you can use AM_GLIB_GNU_GETTEXT, which - will do a few less things than AM_GNU_GETTEXT, but does more than - enough for what intltool needs to work. - - You do NOT need to use both AM_GNU_GETTEXT and AM_GLIB_GNU_GETTEXT - together though. Only one of them will suffice. - The text domain is identified by PACKAGE. We will need to add a few functions later on to helloworld.c that will use this #define'd variable. @@ -135,9 +116,6 @@ int main (void) { da nl - NOTE: These used to be in configure.{in,ac} in the ALL_LINGUAS - variable. This is deprecated since gettext 0.11 - 9. Run aclocal to make sure that the necessary autoconf and automake macros diff --git a/doc/intltool-extract.8 b/doc/intltool-extract.8 index 1c064b1..dd1569e 100644 --- a/doc/intltool-extract.8 +++ b/doc/intltool-extract.8 @@ -21,19 +21,19 @@ instead. .SH OPTIONS .IP "\fB\-l\fR" 4 .PD 0 -.IP "\fB\--local\fR" 4 +.IP "\fB\-\-local\fR" 4 .PD Creates a subdirectory under current working directory (named "\fBtmp/\fR") -and writes files there. This option can't be used with \fB\--update\fR option. -.IP "\fB\--update\fR" 4 +and writes files there. This option can't be used with \fB\-\-update\fR option. +.IP "\fB\-\-update\fR" 4 .PD Writes header file into the same directory the source file is in. New file name is the source file name appending ".h" extension. This option can't be used with -.BR \-l / \--local -option. Besides, this option is the default option if neither \fB\--local\fR -nor \fB\--update\fR is specified. -.IP "\fB\--type\fR=\fITYPE\fR" 4 +.BR \-l / \-\-local +option. Besides, this option is the default option if neither \fB\-\-local\fR +nor \fB\-\-update\fR is specified. +.IP "\fB\-\-type\fR=\fITYPE\fR" 4 .PD Specify the type of source file. Currently supported types are: .br @@ -58,7 +58,7 @@ Specify the type of source file. Currently supported types are: "gettext/qtdesigner" (Qt Designer .ui files) .IP "\fB\-v\fR" 4 .PD 0 -.IP "\fB\--version\fR" 4 +.IP "\fB\-\-version\fR" 4 .PD Show version information. .IP "\fB\-h\fR" 4 @@ -68,7 +68,7 @@ Show version information. Show usage and basic help information. .IP "\fB\-q\fR" 4 .PD 0 -.IP "\fB\--quiet\fR" 4 +.IP "\fB\-\-quiet\fR" 4 .PD Be quiet while running. diff --git a/doc/intltool-merge.8 b/doc/intltool-merge.8 index 291b344..c87cb9f 100644 --- a/doc/intltool-merge.8 +++ b/doc/intltool-merge.8 @@ -25,36 +25,36 @@ xml nodes, where each node contains one of the localized strings with .\" ------------------------------------------------------- .IP "\fB\-b\fR" 4 .PD 0 -.IP "\fB\--ba-style\fR" 4 +.IP "\fB\-\-ba-style\fR" 4 .PD Merge files in bonobo-activation style, which is used for bonobo servers. .IP "\fB\-d\fR" 4 .PD 0 -.IP "\fB\--desktop-style\fR" 4 +.IP "\fB\-\-desktop-style\fR" 4 .PD Merge files in desktop style, which is similar to the Windows .ini file format. .IP "\fB\-k\fR" 4 .PD 0 -.IP "\fB\--keys-style\fR" 4 +.IP "\fB\-\-keys-style\fR" 4 .PD Merge files in keys style, which is used for metadata. .IP "\fB\-o\fR" 4 .PD 0 -.IP "\fB\--oaf-style\fR" 4 +.IP "\fB\-\-oaf-style\fR" 4 .PD (OBSOLETE) Same as -.BR \-b / \--ba-style "." +.BR \-b / \-\-ba-style "." .IP "\fB\-r\fR" 4 .PD 0 -.IP "\fB\--rfc822deb-style\fR" 4 +.IP "\fB\-\-rfc822deb-style\fR" 4 .PD Merge files in RFC 822 style, which is usually used in Debian configuration files. -.IP "\fB\--quoted-style\fR" 4 +.IP "\fB\-\-quoted-style\fR" 4 .PD Merge files in quoted string style, which just translates any strings within "". .IP "\fB\-x\fR" 4 .PD 0 -.IP "\fB\--xml-style\fR" 4 +.IP "\fB\-\-xml-style\fR" 4 .PD Merge files in standard XML style, both as attributes and as raw pcdata. @@ -63,33 +63,33 @@ Merge files in standard XML style, both as attributes and as raw pcdata. .\" ------------------------------------------------------- .IP "\fB\-u\fR" 4 .PD 0 -.IP "\fB\--utf8\fR" 4 +.IP "\fB\-\-utf8\fR" 4 .PD Convert all strings to UTF-8 before merging. .IP "\fB\-p\fR" 4 .PD 0 -.IP "\fB\--pass-through\fR" 4 +.IP "\fB\-\-pass-through\fR" 4 .PD Use strings as is in .po files without conversion (STRONGLY unrecommended -with -x). +with \-x). .IP "\fB\-c\fR" 4 .PD 0 -.IP "\fB\--cache\fR" 4 +.IP "\fB\-\-cache\fR" 4 .PD (TBD) .IP "\fB\-q\fR" 4 .PD 0 -.IP "\fB\--quiet\fR" 4 +.IP "\fB\-\-quiet\fR" 4 .PD Be quiet while running. .IP "\fB\-v\fR" 4 .PD 0 -.IP "\fB\--version\fR" 4 +.IP "\fB\-\-version\fR" 4 .PD Show version information. .IP "\fB\-h\fR" 4 .PD 0 -.IP "\fB\--help\fR" 4 +.IP "\fB\-\-help\fR" 4 .PD Show usage and basic help information. diff --git a/doc/intltool-update.8 b/doc/intltool-update.8 index 4fc87f6..a3beb7c 100644 --- a/doc/intltool-update.8 +++ b/doc/intltool-update.8 @@ -53,7 +53,7 @@ A list of all these files are written into another file called Display a status report for all translations in the software. .IP "\fB\-d \fILANGCODE\fR" 4 .PD 0 -.IP "\fB\-\-dist \fILANGCODE \fR" 4 +.IP "\fB\-\-dist \fILANGCODE\fR" 4 .PD Merge .BR LANGCODE .po @@ -96,7 +96,7 @@ Creates a new PO template from source code, and name it foo.pot: .nf .ft CW .ne 1 -intltool-update \-\-pot \-\-gettext\-package=foo +intltool-update \-\-pot \-\-gettext-package=foo .ft R .fi .RE @@ -108,7 +108,7 @@ Updates translation file xy.po using existing po template called .nf .ft CW .ne 1 -intltool-update --dist --gettext-package=bar --output-file=xy1.po xy +intltool-update \-\-dist \-\-gettext-package=bar \-\-output-file=xy1.po xy .ft R .fi .RE @@ -123,7 +123,7 @@ Creates new PO template and updates translation file xy.po intltool-update xy .ft R .fi -(same as \fBintltool-update --pot && intltool-update --dist xy\fR) +(same as \fBintltool-update \-\-pot && intltool-update \-\-dist xy\fR) .RE .SH FILES diff --git a/doc/intltoolize.8 b/doc/intltoolize.8 index ea788f5..3aa217d 100644 --- a/doc/intltoolize.8 +++ b/doc/intltoolize.8 @@ -17,23 +17,23 @@ level directory of the package before running .SH OPTIONS -.IP "\fB\--automake\fR" 4 +.IP "\fB\-\-automake\fR" 4 Work silently and assume that \fIautomake\fR is being used in software. .IP "\fB\-c\fR" 4 .PD 0 -.IP "\fB\--copy\fR" 4 +.IP "\fB\-\-copy\fR" 4 .PD Copy files rather than creating symbolic links to them. -.IP "\fB\--debug\fR" 4 +.IP "\fB\-\-debug\fR" 4 Enable verbose shell tracing. .IP "\fB\-n\fR" 4 .PD 0 -.IP "\fB\--dry-run\fR" 4 +.IP "\fB\-\-dry-run\fR" 4 .PD Print commands only, instead of executing them. .IP "\fB\-f\fR" 4 .PD 0 -.IP "\fB\--force\fR" 4 +.IP "\fB\-\-force\fR" 4 .PD Replace existing files if they exist. .IP "\fB\-\-help\fR" 4 diff --git a/intltool.m4 b/intltool.m4 index 33353ed..c25b7b1 100644 --- a/intltool.m4 +++ b/intltool.m4 @@ -155,31 +155,6 @@ fi # Substitute ALL_LINGUAS so we can use it in po/Makefile AC_SUBST(ALL_LINGUAS) -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[]], - [[extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr]])], - [DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share - dnl in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [DATADIRNAME=share], [DATADIRNAME=lib]) - ;; - *) - [DATADIRNAME=lib] - ;; - esac]) -fi -AC_SUBST(DATADIRNAME) - IT_PO_SUBDIR([po]) ]) diff --git a/tests/cases/Makefile.am b/tests/cases/Makefile.am index 3b0ef81..10210f2 100644 --- a/tests/cases/Makefile.am +++ b/tests/cases/Makefile.am @@ -5,6 +5,7 @@ EXTRA_DIST = \ context.xml.in \ extract-comments.xml \ extract-gtkbuilder.ui \ + extract-gtkbuilder-single.ui \ extract1.desktop \ extract10.templates_ \ extract12.xml.in \ @@ -51,6 +52,7 @@ CLEANFILES = \ context.xml.in.h \ extract-comments.xml.h \ extract-gtkbuilder.ui.h \ + extract-gtkbuilder-single.ui.h \ extract1.desktop.h \ extract10.templates_.h \ extract12.xml.in.h \ diff --git a/tests/results/Makefile.am b/tests/results/Makefile.am index 6230064..97501fb 100644 --- a/tests/results/Makefile.am +++ b/tests/results/Makefile.am @@ -17,6 +17,7 @@ EXTRA_DIST = \ extract12.xml.in.h \ extract14.xml.in.h \ extract-gtkbuilder.ui.h \ + extract-gtkbuilder-single.ui.h \ extract-qtdesigner.ui.h \ gsettings.gschema.xml.h \ iso88591text.xml.in.h \ |