trans-coord/gnun/server/gnun ChangeLog Makefile...

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       16/10/05 18:37:39

Modified files:
        gnun/server/gnun: ChangeLog Makefile.am NEWS 
                          update-localized-urls.in 
Added files:
        gnun/server/gnun/tests/localized-urls: 1 home.html 
                                               localized-urls.mk 
        gnun/server/gnun/tests/localized-urls/po: home.pot 

Log message:
        Fix update-localized-urls.  Add a test.
        
        * update-localized-urls.in: Fix command line parser (broken since 
2014-03-15).
        * tests/localized-urls/1:
        * tests/localized-urls/home.html:
        * tests/localized-urls/localized-urls.mk:
        * tests/localized-urls/po/home.pot: New files.
        * NEWS: Update.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.452&r2=1.453
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/Makefile.am?cvsroot=trans-coord&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.124&r2=1.125
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/update-localized-urls.in?cvsroot=trans-coord&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/tests/localized-urls/1?cvsroot=trans-coord&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/tests/localized-urls/home.html?cvsroot=trans-coord&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/tests/localized-urls/localized-urls.mk?cvsroot=trans-coord&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/tests/localized-urls/po/home.pot?cvsroot=trans-coord&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -b -r1.452 -r1.453
--- ChangeLog   4 Oct 2016 08:55:01 -0000       1.452
+++ ChangeLog   5 Oct 2016 18:37:38 -0000       1.453
@@ -1,7 +1,14 @@
-2016-10-04  Pavel Kharitonov  <address@hidden>
+2016-10-05  Pavel Kharitonov  <address@hidden>
 
-       * update-localized-urls.in: Remove spurious character (broken
-       since 2016-06-29).
+       Fix update-localized-urls.  Add a test.
+
+       * update-localized-urls.in: Fix command line parser (broken
+       since 2014-03-15).
+       * tests/localized-urls/1:
+       * tests/localized-urls/home.html:
+       * tests/localized-urls/localized-urls.mk:
+       * tests/localized-urls/po/home.pot: New files.
+       * NEWS: Update.
 
 2016-09-27  Pavel Kharitonov  <address@hidden>
 

Index: Makefile.am
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/Makefile.am,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- Makefile.am 7 Jul 2016 06:33:48 -0000       1.45
+++ Makefile.am 5 Oct 2016 18:37:39 -0000       1.46
@@ -87,8 +87,9 @@
 endif
 pkglibexec_SCRIPTS += sort.awk
 
-tests_available += make-prototype
-tests_enabled += make-prototype
+tests_available += make-prototype localized-urls/1
+tests_enabled += make-prototype localized-urls/1
+
 dist_pkglibexec_SCRIPTS = make-prototype.awk
 
 installcheck-local:
@@ -221,6 +222,10 @@
             tests/make-prototype tests/proto.html tests/proto.proto \
             tests/collate tests/sort0 tests/sort0-it tests/sort1 \
              tests/sort1-it \
+            tests/localized-urls/1 \
+            tests/localized-urls/localized-urls.mk \
+            tests/localized-urls/home.html \
+            tests/localized-urls/po/home.pot \
             tests/validate/1 tests/validate/1.html \
             tests/validate/2 tests/validate/html5.html \
             tests/validate/3 tests/validate/3.0.html tests/validate/3.1.html \

Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- NEWS        17 Sep 2016 09:25:45 -0000      1.124
+++ NEWS        5 Oct 2016 18:37:39 -0000       1.125
@@ -20,6 +20,8 @@
 *** `gnun-validate-html' didn't work with bash versions that don't
     support set -o pipefail.
 
+*** The script updating localized urls didn't work since 0.9.
+
 *** `configure' didn't detect old versions of xmllint adequately.
 
 *** Many utilities didn't work when mktemp had no -t option.

Index: update-localized-urls.in
===================================================================
RCS file: 
/sources/trans-coord/trans-coord/gnun/server/gnun/update-localized-urls.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- update-localized-urls.in    4 Oct 2016 11:36:25 -0000       1.8
+++ update-localized-urls.in    5 Oct 2016 18:37:39 -0000       1.9
@@ -51,7 +51,10 @@
 ROOT=../..
 OUTPUT=localized-urls.mk
 
-while test $# -gt 1; do
+function parse_option () {
+  skip_option=
+  trimmed_option=
+  end_of_options=
   case "$1" in
       --help | -h* )
          usage
@@ -81,7 +84,7 @@
           exit 1
          ;;
   esac
-done
+}
 
 while [ $# -ge 1 ]; do
   current_option="$1"

Index: tests/localized-urls/1
===================================================================
RCS file: tests/localized-urls/1
diff -N tests/localized-urls/1
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ tests/localized-urls/1      5 Oct 2016 18:37:39 -0000       1.1
@@ -0,0 +1,47 @@
+#! /bin/sh
+# Copyright (C) 2016 Free Software Foundation, Inc.
+
+# This file is part of GNUnited Nations.
+
+# GNUnited Nations is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+
+# GNUnited Nations is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with GNUnited Nations.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test the update-localized-urls script.
+
+"${pkglibexecdir}/update-localized-urls" \
+  --root "${srcdir}/localized-urls" \
+  || exit 1
+
+cat > lu.mk <<'EOF'
+# Copyright (C) 2016 Free Software Foundation, Inc.
+
+# This file is part of GNUnited Nations.
+
+# GNUnited Nations is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+
+# GNUnited Nations is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with GNUnited Nations.  If not, see <https://www.gnu.org/licenses/>.
+EOF
+
+"$SED" -e "/^#/d" localized-urls.mk >> lu.mk || exit 1
+diff "${srcdir}/localized-urls/localized-urls.mk" lu.mk || exit 1
+rm localized-urls.mk lu.mk
+exit 0

Index: tests/localized-urls/home.html
===================================================================
RCS file: tests/localized-urls/home.html
diff -N tests/localized-urls/home.html
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ tests/localized-urls/home.html      5 Oct 2016 18:37:39 -0000       1.1
@@ -0,0 +1,18 @@
+<!-- Copyright (C) 2016 Free Software Foundation, Inc.
+
+This file is a part of GNUN testsuite.
+
+GNUnited Nations is free software: you can redistribute it and/or
+modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+GNUnited Nations is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNUnited Nations.  If not, see <http://www.gnu.org/licenses/>. -->
+
+<!-- GNUN: localize URL /a/b.png, /c/d.jpg and https://www.fsf.org/e/f.avi -->

Index: tests/localized-urls/localized-urls.mk
===================================================================
RCS file: tests/localized-urls/localized-urls.mk
diff -N tests/localized-urls/localized-urls.mk
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ tests/localized-urls/localized-urls.mk      5 Oct 2016 18:37:39 -0000       
1.1
@@ -0,0 +1,24 @@
+# Copyright (C) 2016 Free Software Foundation, Inc.
+
+# This file is part of GNUnited Nations.
+
+# GNUnited Nations is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+
+# GNUnited Nations is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with GNUnited Nations.  If not, see <https://www.gnu.org/licenses/>.
+
+localized-url-sources :=
+localized-url-sources += home
+define home-localized-urls
+/a/b.png \
+/c/d.jpg \
+https://www.fsf.org/e/f.avi
+endef

Index: tests/localized-urls/po/home.pot
===================================================================
RCS file: tests/localized-urls/po/home.pot
diff -N tests/localized-urls/po/home.pot
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ tests/localized-urls/po/home.pot    5 Oct 2016 18:37:39 -0000       1.1
@@ -0,0 +1,16 @@
+Copyright (C) 2016 Free Software Foundation, Inc.
+
+This file is part of GNUnited Nations.
+
+GNUnited Nations is free software: you can redistribute it and/or
+modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+GNUnited Nations is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNUnited Nations.  If not, see <https://www.gnu.org/licenses/>.