Landry, Marc-Andre wrote:
Michael Jennings wrote:
On Tuesday, 13 February 2007, at 09:17:51 (-0500),
Landry, Marc-Andre wrote:
+echo "Running autopoint..."; autopoint -f || exit 1
No.
Michael
I will work on this for my self. I had lost track of this subject and I
excuse me if I didn't understand that there will not be any support for
this case. I will try to better help on the todo list for reporting patch.
«Désolé» I didn't intended to take your time,
Marc-André Landry
Don't feel bad. Autofoo in general and gettext in particular have a long
history of, lets say, exciting people.
I still don't quite get all the opposition against autopoint (except the
stupid requirement that the cvs program must be available). In my
opinion automake-1.10 is not broken but people here insist on pissing
against the wind and refuse to set up configuration stuff as it is
supposed to be, and then blame the autotools that they don't work (/me
ducks).
The e17/apps/e autogen.sh has used autopoint for months now, and my
impression is that the noise level from people with autotool issues in
this module has decreased considerably since then.
Anyway, I think adding autopoint to autogen.sh is only part of the
solution if you go down that path. There seem to be quite a few other
fixups required, like po/Makefile->po/Makefile.in in configure.in,
remove po/Makefile.am, add po/Makevars and po/POTFILES.in, order of
autoconf and autoheader in autogen.sh, and more.
In case anybody bothers to persue this I have attached a patch for the
alarm module, which passes make distcheck with automake-1.9.6 as well as
automake-1.10 (a few bits in the patch are not related to gettext but
required just to pass distcheck). I'm not saying this is the One and
Only way to do this but only that this patch works for me.
No worries - I have absolutely no intention to commit this in fear of
what might happen to my reproductive powers.
/Kim
diff -urN -X ../excl.list ../alarm/.cvsignore ./.cvsignore
--- ../alarm/.cvsignore 2006-11-12 14:04:43.000000000 +0100
+++ ./.cvsignore 2007-02-13 20:13:29.000000000 +0100
@@ -9,6 +9,7 @@
config.h
config.h.in
config.log
+config.rpath
config.status
config.sub
configure
@@ -16,9 +17,12 @@
e_modules-alarm.spec
install-sh
libtool
+m4
missing
+mkinstalldirs
module.desktop
ltmain.sh
stamp-h1
*.la
*.lo
+*.tar.gz
diff -urN -X ../excl.list ../alarm/Makefile.am ./Makefile.am
--- ../alarm/Makefile.am 2006-11-08 13:43:17.000000000 +0100
+++ ./Makefile.am 2007-02-13 20:25:21.000000000 +0100
@@ -1,3 +1,4 @@
+AUTOMAKE_OPTIONS = foreign
MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = po
@@ -38,5 +39,7 @@
$(top_builddir)/alarm.edj
clean-local:
- rm -rf alarm.edj *~
+ rm -rf alarm.edj module.desktop *~
+
+ACLOCAL_AMFLAGS = -I m4
diff -urN -X ../excl.list ../alarm/autogen.sh ./autogen.sh
--- ../alarm/autogen.sh 2006-11-08 11:06:38.000000000 +0100
+++ ./autogen.sh 2007-02-13 22:35:56.000000000 +0100
@@ -5,22 +5,13 @@
touch README
-echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS || exit 1
-echo "Running autoheader..." ; autoheader || exit 1
+echo "Running autopoint..."; autopoint -f || exit 1
+rm ABOUT-NLS
+echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1
echo "Running autoconf..." ; autoconf || exit 1
+echo "Running autoheader..." ; autoheader || exit 1
echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1
echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1
-echo "Generating gettext alarm.pot template"; \
-xgettext \
---output alarm.pot \
---output-dir=po \
---language=C \
---add-location \
---keyword=D_ \
---sort-by-file \
---copyright-holder="TODO" \
---foreign-user \
-`find . -name "*.[ch]" -print` || exit 1
if [ -z "$NOCONFIGURE" ]; then
./configure "$@"
diff -urN -X ../excl.list ../alarm/configure.in ./configure.in
--- ../alarm/configure.in 2007-02-04 03:42:58.000000000 +0100
+++ ./configure.in 2007-02-13 22:37:13.000000000 +0100
@@ -15,10 +15,9 @@
AM_PROG_LIBTOOL
ALL_LINGUAS="eo it ja sv"
-AC_SUBST(ALL_LINGUAS)
AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION(0.14)
+AM_GNU_GETTEXT_VERSION([0.12.1])
MODULE_ARCH="$host_os-$host_cpu"
AC_SUBST(MODULE_ARCH)
@@ -146,7 +145,7 @@
AC_OUTPUT([
Makefile
-po/Makefile
+po/Makefile.in
e_modules-alarm.spec
module.desktop
],[
diff -urN -X ../excl.list ../alarm/po/.cvsignore ./po/.cvsignore
--- ../alarm/po/.cvsignore 2006-11-12 14:02:01.000000000 +0100
+++ ./po/.cvsignore 2007-02-13 20:15:16.000000000 +0100
@@ -1,4 +1,16 @@
Makefile
Makefile.in
+Makefile.in.in
+Makevars.template
+POTFILES
+Rules-quot
+boldquot.sed
[EMAIL PROTECTED]
[EMAIL PROTECTED]
+insert-header.sin
+quot.sed
+remove-potcdate.sed
+remove-potcdate.sin
+stamp-po
*.pot
-*.mo
+*.gmo
diff -urN -X ../excl.list ../alarm/po/Makefile.am ./po/Makefile.am
--- ../alarm/po/Makefile.am 2006-11-08 11:06:38.000000000 +0100
+++ ./po/Makefile.am 1970-01-01 01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in $(PACKAGE).pot
-
-MSGFMT = msgfmt
-
-localedir = @LOCALEDIR@
-locale_DATA = $(addsuffix .mo,$(ALL_LINGUAS))
-
-EXTRA_DIST = $(PACKAGE).pot $(addsuffix .po,$(ALL_LINGUAS))
-
-%.mo : %.po
- $(MSGFMT) -f -o $@ $<
-
-install-localeDATA:
-uninstall-localeDATA:
-install-data-local:
- for L in $(ALL_LINGUAS); do \
- $(mkinstalldirs) $(DESTDIR)$(localedir)/$$L/LC_MESSAGES; \
- $(INSTALL_DATA) \
- $$L.mo $(DESTDIR)$(localedir)/$$L/LC_MESSAGES/$(PACKAGE).mo; \
- done
-
-uninstall:
- for L in $(ALL_LINGUAS); do \
- rm -f $(DESTDIR)$(localedir)/$$L/LC_MESSAGES/$(PACKAGE).mo; \
- done
-
-clean-local:
- rm -f *.mo
diff -urN -X ../excl.list ../alarm/po/Makevars ./po/Makevars
--- ../alarm/po/Makevars 1970-01-01 01:00:00.000000000 +0100
+++ ./po/Makevars 2007-02-13 19:03:09.000000000 +0100
@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
+# package. (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.) Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright. The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = The Enlightenment Team
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+# in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+# understood.
+# - Strings which make invalid assumptions about notation of date, time or
+# money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = [EMAIL PROTECTED]
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used. It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
diff -urN -X ../excl.list ../alarm/po/POTFILES.in ./po/POTFILES.in
--- ../alarm/po/POTFILES.in 1970-01-01 01:00:00.000000000 +0100
+++ ./po/POTFILES.in 2007-02-13 19:08:20.000000000 +0100
@@ -0,0 +1,4 @@
+# List of source files which contain translatable strings.
+e_mod_config.c
+e_mod_config_alarm.c
+e_mod_main.c
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
