trans-coord/gnun/server/gnun GNUmakefile gnun-r...

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       16/09/17 09:25:45

Modified files:
        gnun/server/gnun: GNUmakefile gnun-report.in ChangeLog NEWS 

Log message:
        * gnun-report.in:
        * GNUmakefile: Report optional templates as 'other files'
        irrespectively of their location.
        * NEWS: Update.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.189&r2=1.190
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/gnun-report.in?cvsroot=trans-coord&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.449&r2=1.450
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.123&r2=1.124

Patches:
Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -b -r1.189 -r1.190
--- GNUmakefile 7 Jul 2016 06:33:48 -0000       1.189
+++ GNUmakefile 17 Sep 2016 09:25:45 -0000      1.190
@@ -949,6 +949,18 @@
   | while read f; do \
       po_base=$${f\#\#*/}; po_base=$${po_base%html}po; po_dir=$${f%/*}/po; \
       test -f $$f && { test -f $$po_dir/$$po_base || echo $$f; } done)
+optional-pos := \
+  $(filter \
+    $(foreach template,${optional-templates},\
+      ${rootdir}/$(filter-out ./,\
+                   $(dir ${template}))po/$(notdir ${template}).${TEAM}.po), \
+    ${TEAM-POS})
+optional-htmls := \
+  $(sort $(filter \
+    $(foreach template,${optional-templates},\
+      ${rootdir}/$(filter-out ./,\
+                   $(dir ${template}))/$(notdir ${template}).${TEAM}.html), \
+    ${TEAM-HTMLS}))
 priority-articles-pos := \
   $(filter \
     $(foreach article,${priority-articles},\
@@ -974,7 +986,8 @@
                     $(dir ${article}))/$(notdir ${article}).${TEAM}.html), \
      ${TEAM-HTMLS}))
 important-dir-pos := \
-$(filter-out ${priority-articles-pos} ${important-articles-pos},\
+$(filter-out ${priority-articles-pos} ${important-articles-pos}\
+             ${optional-pos},\
   $(filter $(addsuffix /%, \
              $(addprefix ${rootdir}/,${important-directories})), \
     ${TEAM-POS}))
@@ -990,7 +1003,7 @@
               ! -path '$(template-dir)/gnun/*'))
 other-htmls := \
   $(sort $(filter-out ${priority-articles-htmls} ${important-articles-htmls} \
-    ${important-dir-htmls}, ${TEAM-HTMLS}))
+    ${important-dir-htmls} ${optional-htmls}, ${TEAM-HTMLS}))
 
 # Function to report a group of PO files.
 define report-pos

Index: gnun-report.in
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/gnun-report.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gnun-report.in      13 Jul 2016 15:50:58 -0000      1.12
+++ gnun-report.in      17 Sep 2016 09:25:45 -0000      1.13
@@ -338,15 +338,6 @@
         | @GREP@ -q -F " $base " || echo $base
     done
   done
-  for dir in $important_directories; do
-    find $dir -name \*.pot.opt -path \*/po/\* | while read pot; do
-      base=${pot%.pot.opt};
-      test -f $base.$team.po || continue
-      base=${base/\/po\//\/}
-      echo " "$important_files $priority_files" " \
-        | @GREP@ -q -F " $base " || echo $base
-    done
-  done
 } | @SORT@
 )
 
@@ -361,7 +352,7 @@
     pot=${pot#./}; base=${pot%.pot.opt};
     test -f $base.$team.po || continue
     base=${base#po/}; base=${base/\/po\//\/}
-    echo " "$other_to_translate $important_files $priority_files" " \
+    echo " "$important_files $priority_files" " \
       | @GREP@ -q -F " $base " || echo $base
   done;
 } | @SORT@

Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -b -r1.449 -r1.450
--- ChangeLog   13 Jul 2016 15:50:58 -0000      1.449
+++ ChangeLog   17 Sep 2016 09:25:45 -0000      1.450
@@ -1,3 +1,10 @@
+2016-09-17  Pavel Kharitonov  <address@hidden>
+
+       * gnun-report.in:
+       * GNUmakefile: Report optional templates as 'other files'
+       irrespectively of their location.
+       * NEWS: Update.
+
 2016-07-12  Pavel Kharitonov  <address@hidden>
 
        * gnun-report.in: Replace `sort' with @address@hidden

Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- NEWS        7 Jul 2016 06:33:48 -0000       1.123
+++ NEWS        17 Sep 2016 09:25:45 -0000      1.124
@@ -2,6 +2,9 @@
 
 * Changes in GNUnited Nations 0.11 (????-??-??)
 
+** Optional templates are reported as lower priority even when located
+   in 'important' directories.
+
 ** New experimental feature, sorting lists.  See
    https://www.gnu.org/s/trans-coord/manual/gnun/html_node/Sorting-Lists.html
 
@@ -17,7 +20,7 @@
 *** `gnun-validate-html' didn't work with bash versions that don't
     support set -o pipefail.
 
-*** `configure' didn't detect inadequately old versions of xmllint.
+*** `configure' didn't detect old versions of xmllint adequately.
 
 *** Many utilities didn't work when mktemp had no -t option.