From f6b2f39db7ca32a52fda9ede6a59e8f0b1c72da4 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 17 Jun 2013 11:42:26 +0900 Subject: [PATCH] Rename xgettext-gtkbuilder-* tests to xgettext-glade-*. --- gettext-tools/tests/ChangeLog | 11 +++++ gettext-tools/tests/Makefile.am | 5 +- ...xgettext-gtkbuilder-1 => xgettext-glade-6} | 27 +++++++---- ...xgettext-gtkbuilder-2 => xgettext-glade-7} | 47 +++++++++++-------- .../tests/xgettext-gtkbuilder-empty.ui | 4 -- 5 files changed, 57 insertions(+), 37 deletions(-) rename gettext-tools/tests/{xgettext-gtkbuilder-1 => xgettext-glade-6} (73%) rename gettext-tools/tests/{xgettext-gtkbuilder-2 => xgettext-glade-7} (92%) delete mode 100644 gettext-tools/tests/xgettext-gtkbuilder-empty.ui diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog index 85bb6c94b..f9c4073a3 100644 --- a/gettext-tools/tests/ChangeLog +++ b/gettext-tools/tests/ChangeLog @@ -1,3 +1,14 @@ +2013-06-17 Daiki Ueno + + * Makefile.am: Rename xgettext-gtkbuilder-* to + xgettext-glade-* as the current GtkBuilder support is implemented + as a variant of Glade. + (TESTS): Remove xgettext-gtkbuilder-[12] and add + xgettext-glade-[67]. + (EXTRA_DIST): Remove xgettext-gtkbuilder-empty.ui. + * xgettext-glade-6: Rename from xgettext-gtkbuilder-1. + * xgettext-glade-7: Rename from xgettext-gtkbuilder-2. + 2013-06-13 Miguel Angel Arruga Vivas Tests for GtkBuilder support. diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am index 89c0f708a..86263b5de 100644 --- a/gettext-tools/tests/Makefile.am +++ b/gettext-tools/tests/Makefile.am @@ -80,8 +80,7 @@ TESTS = gettext-1 gettext-2 gettext-3 gettext-4 gettext-5 gettext-6 gettext-7 \ xgettext-csharp-7 \ xgettext-elisp-1 xgettext-elisp-2 \ xgettext-glade-1 xgettext-glade-2 xgettext-glade-3 xgettext-glade-4 \ - xgettext-glade-5 \ - xgettext-gtkbuilder-1 xgettext-gtkbuilder-2 \ + xgettext-glade-5 xgettext-glade-6 xgettext-glade-7 \ xgettext-java-1 xgettext-java-2 xgettext-java-3 xgettext-java-4 \ xgettext-java-5 xgettext-java-6 xgettext-java-7 \ xgettext-librep-1 xgettext-librep-2 \ @@ -149,7 +148,7 @@ EXTRA_DIST += $(TESTS) \ ChangeLog.0 \ gettext-3-1.po gettext-3-2.po gettext-4.po gettext-5.po \ gettext-6-1.po gettext-6-2.po gettext-7.po \ - gettextpo-1.de.po xgettext-gtkbuilder-empty.ui + gettextpo-1.de.po XGETTEXT = ../src/xgettext diff --git a/gettext-tools/tests/xgettext-gtkbuilder-1 b/gettext-tools/tests/xgettext-glade-6 similarity index 73% rename from gettext-tools/tests/xgettext-gtkbuilder-1 rename to gettext-tools/tests/xgettext-glade-6 index 7163d5112..90940b795 100755 --- a/gettext-tools/tests/xgettext-gtkbuilder-1 +++ b/gettext-tools/tests/xgettext-glade-6 @@ -7,15 +7,22 @@ tmpfiles="" trap 'rm -fr $tmpfiles' 1 2 3 15 +tmpfiles="$tmpfiles xg-gl-6-empty.glade" +cat < xg-gl-6-empty.glade + + +EOF + +tmpfiles="$tmpfiles xg-gl-6.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o - xgettext-gtkbuilder-empty.ui 2>/dev/null 1>&2 +${XGETTEXT} -o xg-gl-6.pot xg-gl-6-empty.glade 2>/dev/null test $? = 0 || { - echo "Skipping test: xgettext was built without GtkBuilder support" + echo "Skipping test: xgettext was built without Glade support" rm -fr $tmpfiles; exit 77 } -tmpfiles="$tmpfiles xg-gtk-1.ui" -cat < xg-gtk-1.ui +tmpfiles="$tmpfiles xg-gl-6.ui" +cat < xg-gl-6.ui @@ -29,13 +36,13 @@ cat < xg-gtk-1.ui EOF -tmpfiles="$tmpfiles xg-gtk-1.pot" +tmpfiles="$tmpfiles xg-gl-6.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o - xg-gtk-1.ui | grep -v 'POT-Creation-Date' > xg-gtk-1.pot +${XGETTEXT} -o - xg-gl-6.ui | grep -v 'POT-Creation-Date' > xg-gl-6.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tmpfiles="$tmpfiles xg-gtk-1.ok" -cat < xg-gtk-1.ok +tmpfiles="$tmpfiles xg-gl-6.ok" +cat < xg-gl-6.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. @@ -55,14 +62,14 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #. This is a comment for empty window -#: xg-gtk-1.ui:6 +#: xg-gl-6.ui:6 msgctxt "This is the context for this text" msgid "This is an empty window" msgstr "" EOF : ${DIFF=diff} -${DIFF} xg-gtk-1.ok xg-gtk-1.pot +${DIFF} xg-gl-6.ok xg-gl-6.pot result=$? rm -fr $tmpfiles diff --git a/gettext-tools/tests/xgettext-gtkbuilder-2 b/gettext-tools/tests/xgettext-glade-7 similarity index 92% rename from gettext-tools/tests/xgettext-gtkbuilder-2 rename to gettext-tools/tests/xgettext-glade-7 index ff785924c..09624f856 100755 --- a/gettext-tools/tests/xgettext-gtkbuilder-2 +++ b/gettext-tools/tests/xgettext-glade-7 @@ -7,15 +7,22 @@ tmpfiles="" trap 'rm -fr $tmpfiles' 1 2 3 15 +tmpfiles="$tmpfiles xg-gl-7-empty.glade" +cat < xg-gl-7-empty.glade + + +EOF + +tmpfiles="$tmpfiles xg-gl-7.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o - xgettext-gtkbuilder-empty.ui 2>/dev/null 1>&2 +${XGETTEXT} -o xg-gl-7.pot xg-gl-7-empty.glade 2>/dev/null test $? = 0 || { - echo "Skipping test: xgettext was built without GtkBuilder support" + echo "Skipping test: xgettext was built without Glade support" rm -fr $tmpfiles; exit 77 } -tmpfiles="$tmpfiles xg-gtk-2.ui" -cat < xg-gtk-2.ui +tmpfiles="$tmpfiles xg-gl-7.ui" +cat < xg-gl-7.ui @@ -176,13 +183,13 @@ cat < xg-gtk-2.ui EOF -tmpfiles="$tmpfiles xg-gtk-2.pot" +tmpfiles="$tmpfiles xg-gl-7.pot" : ${XGETTEXT=xgettext} -${XGETTEXT} -o - xg-gtk-2.ui | grep -v 'POT-Creation-Date' > xg-gtk-2.pot +${XGETTEXT} -o - xg-gl-7.ui | grep -v 'POT-Creation-Date' > xg-gl-7.pot test $? = 0 || { rm -fr $tmpfiles; exit 1; } -tmpfiles="$tmpfiles xg-gtk-2.ok" -cat <<\EOF > xg-gtk-2.ok +tmpfiles="$tmpfiles xg-gl-7.ok" +cat <<\EOF > xg-gl-7.ok # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. @@ -201,70 +208,70 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: xg-gtk-2.ui:30 +#: xg-gl-7.ui:30 msgctxt "First row" msgid "Hi" msgstr "" #. A comment. -#: xg-gtk-2.ui:31 +#: xg-gl-7.ui:31 msgid "Comment" msgstr "" -#: xg-gtk-2.ui:35 +#: xg-gl-7.ui:35 msgctxt "First row" msgid "Hello" msgstr "" #. This is no translatable. -#: xg-gtk-2.ui:36 +#: xg-gl-7.ui:36 msgid "Translatable comment." msgstr "" -#: xg-gtk-2.ui:41 +#: xg-gl-7.ui:41 msgctxt "This is not translatable" msgid "Please..." msgstr "" #. This thing is the menu label -#: xg-gtk-2.ui:62 +#: xg-gl-7.ui:62 msgctxt "Menu" msgid "One thing" msgstr "" #. This thing is the label in the inner menu. -#: xg-gtk-2.ui:70 +#: xg-gl-7.ui:70 msgctxt "One thing" msgid "One thing" msgstr "" #. This is easy. -#: xg-gtk-2.ui:87 +#: xg-gl-7.ui:87 msgctxt "Menu" msgid "H_elp" msgstr "" #. This one thing is for the second menu. -#: xg-gtk-2.ui:95 +#: xg-gl-7.ui:95 msgctxt "Second menu" msgid "One thing" msgstr "" #. To you too. -#: xg-gtk-2.ui:105 +#: xg-gl-7.ui:105 msgctxt "Second menu" msgid "Greetings" msgstr "" #. This one thing is the button. -#: xg-gtk-2.ui:142 +#: xg-gl-7.ui:142 msgctxt "Button" msgid "One thing" msgstr "" EOF : ${DIFF=diff} -${DIFF} xg-gtk-2.ok xg-gtk-2.pot +${DIFF} xg-gl-7.ok xg-gl-7.pot result=$? rm -fr $tmpfiles diff --git a/gettext-tools/tests/xgettext-gtkbuilder-empty.ui b/gettext-tools/tests/xgettext-gtkbuilder-empty.ui deleted file mode 100644 index a47d1bd9d..000000000 --- a/gettext-tools/tests/xgettext-gtkbuilder-empty.ui +++ /dev/null @@ -1,4 +0,0 @@ - - - - -- 2.47.2