Support for xgettext sh/bash backend.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index bb0886234c2c7cba6fd1a5119c62aacd9c97bada..f43accc167cd9c46dd1dd5c124fd9f7ead235165 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,19 @@
+2003-09-03  Bruno Haible  <bruno@clisp.org>
+
+       * x-sh.h: New file.
+       * x-sh.c: New file.
+       * xgettext.c: Include x-sh.h.
+       (main): Call x_sh_extract_all, x_sh_keyword.
+       (usage): Mention Shell language.
+       (language_to_extractor): Add Shell rule.
+       (extension_to_language): Add Shell rule.
+       * Makefile.am (noinst_HEADERS): Add x-sh.h.
+       (xgettext_SOURCES): Add x-sh.c.
+       * Makefile.msvc (xgettext_OBJECTS): Add x-sh.obj.
+       (x-sh.obj): New rule.
+       * Makefile.vms (xgettext_OBJECTS): Add x-sh.obj.
+       (x-sh.obj): New rule.
+
 2003-08-31  Bruno Haible  <bruno@clisp.org>
 
        * format-sh.c: New file.

diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index bf1ac5ee02f3aadaea31f7518542a5abe7e9733c..f59a59b029ff5d54a471f17d206c296a0ff64aa6 100644 (file)
--- a/gettext-tools/src/Makefile.am
+++ b/gettext-tools/src/Makefile.am
@@ -40,9 +40,9 @@ write-po.h write-properties.h dir-list.h file-list.h po-gram-gen.h \
 po-gram-gen2.h po-hash-gen.h msgl-charset.h msgl-equal.h msgl-iconv.h \
 msgl-ascii.h msgl-cat.h msgl-english.h msgfmt.h msgunfmt.h plural-count.h \
 read-mo.h write-mo.h read-java.h write-java.h read-tcl.h write-tcl.h \
-po-time.h plural-table.h format.h xgettext.h x-c.h x-po.h x-python.h x-lisp.h \
-x-elisp.h x-librep.h x-smalltalk.h x-java.h x-properties.h x-awk.h x-ycp.h \
-x-tcl.h x-perl.h x-php.h x-rst.h x-glade.h
+po-time.h plural-table.h format.h xgettext.h x-c.h x-po.h x-sh.h x-python.h \
+x-lisp.h x-elisp.h x-librep.h x-smalltalk.h x-java.h x-properties.h x-awk.h \
+x-ycp.h x-tcl.h x-perl.h x-php.h x-rst.h x-glade.h
 
 EXTRA_DIST += FILES project-id ChangeLog.0
 
@@ -119,7 +119,7 @@ msgfmt_SOURCES = msgfmt.c write-mo.c write-java.c write-tcl.c plural-eval.c
 msgmerge_SOURCES = msgmerge.c plural-count.c
 msgunfmt_SOURCES = msgunfmt.c read-mo.c read-java.c read-tcl.c
 xgettext_SOURCES = xgettext.c \
-  x-c.c x-po.c x-python.c x-lisp.c x-elisp.c x-librep.c x-smalltalk.c \
+  x-c.c x-po.c x-sh.c x-python.c x-lisp.c x-elisp.c x-librep.c x-smalltalk.c \
   x-java.l x-awk.c x-ycp.c x-tcl.c x-perl.c x-php.c x-rst.c x-glade.c
 msgattrib_SOURCES = msgattrib.c
 msgcat_SOURCES = msgcat.c

diff --git a/gettext-tools/src/Makefile.msvc b/gettext-tools/src/Makefile.msvc
index 42c0d8c2bd977e0aadbb1d56984126adc2f6a747..46ae9630c26d8e831f09a5c3c3e2f518bbebbe0d 100644 (file)
--- a/gettext-tools/src/Makefile.msvc
+++ b/gettext-tools/src/Makefile.msvc
@@ -149,7 +149,7 @@ msgcmp_OBJECTS = msgcmp.obj
 msgfmt_OBJECTS = msgfmt.obj write-mo.obj write-java.obj write-tcl.obj plural-eval.obj
 msgmerge_OBJECTS = msgmerge.obj plural-count.obj
 msgunfmt_OBJECTS = msgunfmt.obj read-mo.obj read-java.obj read-tcl.obj
-xgettext_OBJECTS = xgettext.obj x-c.obj x-po.obj x-python.obj x-lisp.obj x-elisp.obj x-librep.obj x-smalltalk.obj x-java.obj x-awk.obj x-ycp.obj x-tcl.obj x-perl.obj x-php.obj x-rst.obj x-glade.obj
+xgettext_OBJECTS = xgettext.obj x-c.obj x-po.obj x-sh.obj x-python.obj x-lisp.obj x-elisp.obj x-librep.obj x-smalltalk.obj x-java.obj x-awk.obj x-ycp.obj x-tcl.obj x-perl.obj x-php.obj x-rst.obj x-glade.obj
 msgattrib_OBJECTS = msgattrib.obj
 msgcat_OBJECTS = msgcat.obj
 msgcomm_OBJECTS = msgcomm.obj
@@ -349,6 +349,9 @@ x-c.obj : x-c.c
 x-po.obj : x-po.c
        $(CC) $(INCLUDES) $(CFLAGS) -c x-po.c
 
+x-sh.obj : x-sh.c
+       $(CC) $(INCLUDES) $(CFLAGS) -c x-sh.c
+
 x-python.obj : x-python.c
        $(CC) $(INCLUDES) $(CFLAGS) -c x-python.c
 

diff --git a/gettext-tools/src/Makefile.vms b/gettext-tools/src/Makefile.vms
index dbecb01be910032eb056a1163e19080b688785ff..0e46986af08d1bbab0ee89ec3eb9ba93e20416d9 100644 (file)
--- a/gettext-tools/src/Makefile.vms
+++ b/gettext-tools/src/Makefile.vms
@@ -95,7 +95,7 @@ msgcmp_OBJECTS = msgcmp.obj
 msgfmt_OBJECTS = msgfmt.obj, write-mo.obj, write-java.obj, write-tcl.obj, plural-eval.obj
 msgmerge_OBJECTS = msgmerge.obj, plural-count.obj
 msgunfmt_OBJECTS = msgunfmt.obj, read-mo.obj, read-java.obj, read-tcl.obj
-xgettext_OBJECTS = xgettext.obj, x-c.obj, x-po.obj, x-python.obj, x-lisp.obj, x-elisp.obj, x-librep.obj, x-smalltalk.obj, x-java.obj, x-awk.obj, x-ycp.obj, x-tcl.obj, x-perl.obj, x-php.obj, x-rst.obj, x-glade.obj
+xgettext_OBJECTS = xgettext.obj, x-c.obj, x-po.obj, x-sh.obj, x-python.obj, x-lisp.obj, x-elisp.obj, x-librep.obj, x-smalltalk.obj, x-java.obj, x-awk.obj, x-ycp.obj, x-tcl.obj, x-perl.obj, x-php.obj, x-rst.obj, x-glade.obj
 msgattrib_OBJECTS = msgattrib.obj
 msgcat_OBJECTS = msgcat.obj
 msgcomm_OBJECTS = msgcomm.obj
@@ -279,6 +279,9 @@ x-c.obj : x-c.c
 x-po.obj : x-po.c
        $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) x-po.c
 
+x-sh.obj : x-sh.c
+       $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) x-sh.c
+
 x-python.obj : x-python.c
        $(CC) $(INCLUDES) $(CFLAGS) /define=($(DEFS)) x-python.c
 

diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
index 0bb9adb2ce21168581f3057391411166432d24c0..63e51c982288b745285f202bc3732d5d34b4c274 100644 (file)
--- a/gettext-tools/src/xgettext.c
+++ b/gettext-tools/src/xgettext.c
@@ -69,6 +69,7 @@ extern "C" {
 
 #include "x-c.h"
 #include "x-po.h"
+#include "x-sh.h"
 #include "x-python.h"
 #include "x-lisp.h"
 #include "x-elisp.h"
@@ -261,6 +262,7 @@ main (int argc, char *argv[])
        break;
       case 'a':
        x_c_extract_all ();
+       x_sh_extract_all ();
        x_python_extract_all ();
        x_lisp_extract_all ();
        x_elisp_extract_all ();
@@ -321,6 +323,7 @@ main (int argc, char *argv[])
        if (optarg == NULL || *optarg != '\0')
          {
            x_c_keyword (optarg);
+           x_sh_keyword (optarg);
            x_python_keyword (optarg);
            x_lisp_keyword (optarg);
            x_elisp_keyword (optarg);
@@ -664,7 +667,7 @@ If output file is -, output is written to standard output.\n"));
 Choice of input file language:\n"));
       printf (_("\
   -L, --language=NAME         recognise the specified language\n\
-                                (C, C++, ObjectiveC, PO, Python, Lisp,\n\
+                                (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n\
                                 EmacsLisp, librep, Smalltalk, Java,\n\
                                 JavaProperties, awk, YCP, Tcl, Perl, PHP,\n\
                                 GCC-source, RST, Glade)\n"));
@@ -1478,6 +1481,7 @@ language_to_extractor (const char *name)
   {
     SCANNERS_C
     SCANNERS_PO
+    SCANNERS_SH
     SCANNERS_PYTHON
     SCANNERS_LISP
     SCANNERS_ELISP
@@ -1528,6 +1532,7 @@ extension_to_language (const char *extension)
   {
     EXTENSIONS_C
     EXTENSIONS_PO
+    EXTENSIONS_SH
     EXTENSIONS_PYTHON
     EXTENSIONS_LISP
     EXTENSIONS_ELISP

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 431f185469070ee0a0fe69a3157d890f3efd4658..b1a9c307ba76319aaaa24a3eeaf77d91dcfae384 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,11 @@
+2003-09-03  Bruno Haible  <bruno@clisp.org>
+
+       * xgettext-30: New file.
+       * lang-sh: New file.
+       * lang-bash: New file.
+       * Makefile.am (TESTS): Add them.
+       (TESTS_ENVIRONMENT): Add ../../gettext-runtime/src to the PATH.
+
 2003-08-31  Bruno Haible  <bruno@clisp.org>
 
        * format-sh-1: New file.

diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
index f15b4780a019adbad6fb46f7143f545ec2dc78d7..20499c98ab3959169b70fd10a50973c36d584b34 100644 (file)
--- a/gettext-tools/tests/Makefile.am
+++ b/gettext-tools/tests/Makefile.am
@@ -50,7 +50,7 @@ TESTS = gettext-1 gettext-2 \
        xgettext-13 xgettext-14 xgettext-15 xgettext-16 xgettext-17 \
        xgettext-18 xgettext-19 xgettext-20 xgettext-21 xgettext-22 \
        xgettext-23 xgettext-24 xgettext-25 xgettext-26 xgettext-27 \
-       xgettext-28 xgettext-29 \
+       xgettext-28 xgettext-29 xgettext-30 \
        format-awk-1 format-awk-2 \
        format-c-1 format-c-2 format-c-3 format-c-4 \
        format-elisp-1 format-elisp-2 \
@@ -68,10 +68,10 @@ TESTS = gettext-1 gettext-2 \
        format-tcl-1 format-tcl-2 \
        format-ycp-1 format-ycp-2 \
        plural-1 plural-2 \
-       lang-c lang-c++ lang-objc lang-python-1 lang-python-2 lang-clisp \
-       lang-elisp lang-librep lang-smalltalk lang-java lang-gawk lang-pascal \
-       lang-ycp lang-tcl lang-perl-1 lang-perl-2 lang-php lang-po \
-       lang-rst
+       lang-c lang-c++ lang-objc lang-sh lang-bash lang-python-1 \
+       lang-python-2 lang-clisp lang-elisp lang-librep lang-smalltalk \
+       lang-java lang-gawk lang-pascal lang-ycp lang-tcl lang-perl-1 \
+       lang-perl-2 lang-php lang-po lang-rst
 
 EXTRA_DIST += $(TESTS) \
        test.mo xg-test1.ok.po mex-test2.ok msguniq-a.in msguniq-a.inp \
@@ -83,7 +83,8 @@ XGETTEXT = ../src/xgettext
 CHECKER =
 #CHECKER = valgrind --num-callers=20 --leak-check=yes --leak-resolution=high --show-reachable=yes
 
-TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) PATH=.:../src:$$PATH \
+TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) \
+                   PATH=.:../src:../../gettext-runtime/src:$$PATH \
                    GETTEXT="$(CHECKER) tstgettext" \
                    NGETTEXT="$(CHECKER) tstngettext" \
                    XGETTEXT="$(CHECKER) xgettext" \