build-sys: Update building of translations

newlib was lagging behind oldlib in how the build system created
the translation files.

diff --git a/.gitignore b/.gitignore
index 17d78f6e4c4aef364dd6ded348604f2fae42fb03..48bf19955b1a9f18986277d3ebd8c100a062c885 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,11 @@ kill
 libtool
 ltmain.sh
 m4/
+man-po/translated
+man-po/*.pot
+man-po/man.stamp
+man-po/??/*
+man-po/??_??/*
 Makefile
 Makefile.in
 missing

diff --git a/Makefile.am b/Makefile.am
index fae226319f6f3f342e1da2ba9a22636d220e6652..5dada6dd186ba86aae435f1ad69dd4029683e8e0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -397,5 +397,3 @@ get-trans:
        echo "Getting the latest translations from translationproject.org..."
        rsync -Lrtvz  translationproject.org::tp/latest/procps-ng/  po
        rsync -Lrtvz  translationproject.org::tp/latest/procps-ng-man/  man-po
-       rsync -Lrtvz  translationproject.org::tp/latest/procps-ng-man-ps/  man-po/ps
-       rsync -Lrtvz  translationproject.org::tp/latest/procps-ng-man-top/  man-po/top

diff --git a/configure.ac b/configure.ac
index 84f0f18f8d7b8cdfb482dd43ed7b037e54b1dafc..91f68480378297004224aaaf7275204d810d7e81 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -43,6 +43,18 @@ AC_PROG_LN_S
 PKG_PROG_PKG_CONFIG
 AC_PROG_MAKE_SET
 
+AC_DEFUN([PROCPS_PROG_PO4A], [
+  AC_REQUIRE([AM_NLS])
+  AC_CHECK_PROGS([PO4A], [po4a])
+  AS_IF([test "$USE_NLS" = "yes" && test -n "$PO4A"], [
+    USE_PO4A=yes
+  ], [
+    USE_PO4A=no
+  ])
+  AC_SUBST([USE_PO4A])
+])
+PROCPS_PROG_PO4A
+
 # Checks for header files.
 AC_HEADER_MAJOR
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h float.h langinfo.h libintl.h limits.h locale.h stdint.h stdio_ext.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/time.h termios.h unistd.h utmp.h utmpx.h values.h wchar.h wctype.h])

diff --git a/man-po/.gitignore b/man-po/.gitignore
deleted file mode 100644 (file)
index 73b3ee2..0000000
--- a/man-po/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-*.pot
-/de/
-/fr/
-/pl/
-/pt_BR/
-/sv/
-/uk/
-/zh_CN/

diff --git a/man-po/Makefile.am b/man-po/Makefile.am
index dc7d03873d0349bdd274c5b1c3067527704809b9..3d4210722b27338b8967945095e0a61496ffc124 100644 (file)
--- a/man-po/Makefile.am
+++ b/man-po/Makefile.am
@@ -1,134 +1,99 @@
 
-translate-templates: $(DIST_MAN_POTS)
-EXTRA_DIST = $(DIST_MAN_POTS) $(DIST_MAN_POS) $(DIST_translated_MANS)
-
-get-trans:
-       rsync -Lrtvz  translationproject.org::tp/latest/procps-ng-man/  .
-       rsync -Lrtvz  translationproject.org::tp/latest/procps-ng-man-ps/  ps
-       rsync -Lrtvz  translationproject.org::tp/latest/procps-ng-man-top/  top
-
-translate-mans: dist-man-paths $(translated_MANS)
-
-base_langs = $(patsubst %.po,%,$(wildcard *.po))
-top_langs = $(patsubst %.po,%,$(notdir $(wildcard top/*.po)))
-ps_langs = $(patsubst %.po,%,$(notdir $(wildcard ps/*.po)))
-all_langs = $(base_langs) $(top_langs) $(ps_langs)
-DIST_MAN_POS = $(wildcard *.po) $(wildcard top/*.po) $(wildcard ps/*.po)
-DIST_translated_MANS =         $(shell find . -name '*.[1-9]')
-MAN_SECTIONS = 1 5 8
-MAN_PAGES = free.1 kill.1 pgrep.1 pidof.1 pkill.1 pmap.1 pwdx.1 skill.1 slabtop.1 \
-           tload.1 uptime.1 w.1 watch.1 \
-           sysctl.conf.5 \
-           sysctl.8 vmstat.8
-man1_pages := $(foreach man,$(filter %.1, $(MAN_PAGES)), man1/$(man))
-man5_pages := $(foreach man,$(filter %.5, $(MAN_PAGES)), man5/$(man))
-man8_pages := $(foreach man,$(filter %.8, $(MAN_PAGES)), man8/$(man))
-
-man_pages = $(man1_pages) $(man8_pages)
-
-man_paths = $(foreach lang, $(base_langs), $(foreach section,$(MAN_SECTIONS),$(lang)/man$(section))) \
-           $(foreach lang, $(top_langs), $(lang)/man1) \
-           $(foreach lang, $(ps_langs), $(lang)/man1)
-translated_MANS :=$(foreach lang,$(base_langs), $(foreach manpage,$(man_pages),$(lang)/$(manpage)))
-translated_MANS +=$(foreach lang,$(top_langs), $(lang)/man1/top.1)
-translated_MANS +=$(foreach lang,$(ps_langs), $(lang)/man1/ps.1)
-
-PO4A_UPDATEPO = po4a-updatepo
-PO4A_TRANSLATE = po4a-translate
-translate_manpage = $(PO4A_TRANSLATE) -o translate_joined=MT -o noarg=ME -f man -m $< -p $*.po -l $@
-
-CLEANFILES = $(DIST_MAN_POTS) $(translated_MANS)
-maintainer-clean-local:
-       -rm -rf $(all_langs)
-
-MAN_PS_POT = template-man-ps.pot
-MAN_PS_POT_FILES = $(top_srcdir)/ps/ps.1
-MAN_TOP_POT = template-man-top.pot
-MAN_TOP_POT_FILES = $(top_srcdir)/top/top.1
-MAN_POT = template-man.pot
-MAN_POT_FILES = $(top_srcdir)/free.1 $(top_srcdir)/kill.1 $(top_srcdir)/pgrep.1 \
-                 $(top_srcdir)/pidof.1 $(top_srcdir)/pkill.1 $(top_srcdir)/pmap.1 \
-                 $(top_srcdir)/pwdx.1 $(top_srcdir)/skill.1 $(top_srcdir)/slabtop.1 \
-                 $(top_srcdir)/snice.1 $(top_srcdir)/sysctl.8 $(top_srcdir)/uptime.1 \
-                 $(top_srcdir)/sysctl.conf.5 $(top_srcdir)/tload.1 \
-                 $(top_srcdir)/vmstat.8 $(top_srcdir)/w.1 $(top_srcdir)/watch.1
-DIST_MAN_POTS = $(MAN_PS_POT) $(MAN_TOP_POT) $(MAN_POT)
-
-$(MAN_PS_POT): $(MAN_PS_POT_FILES)
-       $(PO4A_UPDATEPO) -o translate_joined=MT -o noarg=ME -f man -m $< -p $@
-
-$(MAN_TOP_POT): $(MAN_TOP_POT_FILES)
-       $(PO4A_UPDATEPO) -o translate_joined=MT -o noarg=ME -f man -m $< -p $@
-
-$(MAN_POT): $(MAN_POT_FILES)
-       $(PO4A_UPDATEPO) -o translate_joined=MT -o noarg=ME -f man -m $< -p $@
-
-dist_man_MANS = $(foreach lang, $(all_langs), $(foreach section, $(MAN_SECTIONS), $(wildcard $(lang)/man$(section)/*.$(section))))
-dist-hook: translate-mans
-       echo $(translated_MANS)
-
-
-dist-man-paths:
-       echo $(top_langs)
-       @for p in $(man_paths) ; do \
-           echo " $(MKDIR_P) '$$p'"; \
-       done
-
-# My Makefile-fu fails me here, I cannot see how to have double-wildcards
-# or have rules and recipies split
+# *.po and *.pot are kept in VCS and generated by po4a-dist command
+# translated/* are put in distribution but not found in VCS
 #
-%/man1/top.1: ../top/top.1 top/%.po
-       $(PO4A_TRANSLATE) -f man -m $< -p top/$*.po -l $@
+# run:
+#   make -C man-po po4a-dist
+# To update man page translations
+
+
+translated_MANS = $(wildcard translated/*/*.[1-9])
+translated_MAN_sections=$(subst .,,$(sort $(suffix $(translated_MANS))))
 
-%/man1/ps.1: ../ps/ps.1 ps/%.po
-       $(PO4A_TRANSLATE) -f man -m $< -p ps/$*.po -l $@
+translated_langs = $(notdir $(wildcard translated/*))
 
-%/man1/free.1: ../free.1 %.po
-       $(translate_manpage)
 
-%/man1/kill.1: ../kill.1 %.po
-       $(translate_manpage)
+EXTRA_DIST = po4a.cfg \
+            procps-man.pot \
+            $(translated_MANS)
 
-%/man1/pgrep.1: ../pgrep.1 %.po
-       $(translate_manpage)
+# Extract the list of languages from the po4a config file.
+LINGUAS_DIST = $(shell sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p' $(srcdir)/po4a.cfg)
 
-%/man1/pidof.1: ../pidof.1 %.po
-       $(translate_manpage)
+# If the user has not defined it let's use the default.
+LINGUAS ?= $(LINGUAS_DIST)
 
-%/man1/pkill.1: ../pkill.1 %.po
-       $(translate_manpage)
 
-%/man1/pmap.1: ../pmap.1 %.po
-       $(translate_manpage)
+PO4A_V = $(PO4A_V_@AM_V@)
+PO4A_V_ = $(PO4A_V_@AM_DEFAULT_V@)
+PO4A_V_0 = @echo "  PO4A   $@";
 
-%/man1/pwdx.1: ../pwdx.1 %.po
-       $(translate_manpage)
+PO4A_OPTS = --srcdir $(srcdir) --destdir $(CURDIR) \
+            --package-name $(PACKAGE) --package-version $(VERSION) \
+            --msgid-bugs-address "Procps list <procps@freelists.org>"
 
-%/man1/skill.1: ../skill.1 %.po
-       $(translate_manpage)
+all-local: all-local-@USE_PO4A@
 
-%/man1/slabtop.1: ../slabtop.1 %.po
-       $(translate_manpage)
+all-local-no:
+all-local-yes: man.stamp
 
-%/man1/tload.1: ../tload.1 %.po
-       $(translate_manpage)
+# FIXME: Use a stamp file until po4a supports them internally.
+man.stamp:
+       $(PO4A_V) $(PO4A) $(PO4A_OPTS) $(srcdir)/po4a.cfg
+       $(AM_V_at) touch $@
 
-%/man1/uptime.1: ../uptime.1 %.po
-       $(translate_manpage)
+clean-local: clean-local-@USE_PO4A@
 
-%/man1/w.1: ../w.1 %.po
-       $(translate_manpage)
+clean-local-no:
+clean-local-yes:
+       rm -rf $(LINGUAS_DIST)
+       $(AM_V_at) rm -f man.stamp
 
-%/man1/watch.1: ../watch.1 %.po
-       $(translate_manpage)
+.PHONY: update-po
 
-%/man5/sysctl.conf.5: ../sysctl.conf.5 %.po
-       $(translate_manpage)
+procps-man.pot:
+#      parafiles = $(patsubst %,-m%,$(subst :, ,$(dist_man_MANS)))
+#      parafiles = $(dist_man_MANS:doc=Ente)
+       po4a-gettextize -M utf8 --option groff_code=verbatim --option generated --option untranslated="a.RE,\|" --option unknown_macros=untranslated -f man $(patsubst %,-m%,$(subst :, ,$(dist_man_MANS))) -p $@
 
-%/man8/sysctl.8: ../sysctl.8 %.po
-       $(translate_manpage)
 
-%/man8/vmstat.8: ../vmstat.8 %.po
-       $(translate_manpage)
+install-data-local:
+       for lang in $(LINGUAS) ; do \
+           files=""; \
+           for trans in $(notdir $(dist_man_MANS)); do \
+               if [ -f $(CURDIR)/$$lang/$$trans ]; then \
+                   files="$$files $(CURDIR)/$$lang/$$trans"; \
+               elif [ -f $(srcdir)/$$lang/$$trans ]; then \
+                   files="$$files $(srcdir)/$$lang/$$trans"; \
+               fi; \
+           done; \
+           $(MAKE) install-man \
+                   mandir="$(mandir)/$$lang" \
+                   man_MANS="" \
+                   dist_man_MANS="$$files"; \
+       done
+
+uninstall-local:
+       for lang in $(LINGUAS); do \
+               files=""; \
+               for trans in $(notdir $(dist_man_MANS)); do \
+                       if [ -f $(CURDIR)/$$lang/$$trans ]; then \
+                               files="$$files $(CURDIR)/$$lang/$$trans"; \
+                       elif [ -f $(srcdir)/$$lang/$$trans ]; then \
+                               files="$$files $(srcdir)/$$lang/$$trans"; \
+                       fi; \
+               done; \
+               $(MAKE) uninstall-man \
+                       mandir="$(mandir)/$$lang" \
+                       man_MANS="" \
+                       dist_man_MANS="$$files"; \
+       done
 
-.PHONY = translate-mans dist-man-paths
+dist-hook: man.stamp
+       cp $(srcdir)/man.stamp $(distdir)/
+       for lang in $(LINGUAS_DIST); do \
+               cp $(srcdir)/$$lang.po $(distdir); \
+               cp $(srcdir)/$$lang.add $(distdir); \
+               $(MKDIR_P) $(distdir)/$$lang; \
+               cp -r $(srcdir)/$$lang $(distdir)/; \
+       done

diff --git a/man-po/po4a.cfg b/man-po/po4a.cfg
new file mode 100644 (file)
index 0000000..9297c1a
--- /dev/null
+++ b/man-po/po4a.cfg
@@ -0,0 +1,56 @@
+
+# Languages for man page
+[po4a_langs] de fr pl pt_BR sv uk zh_CN
+[po4a_paths] procps-man.pot $lang:$lang.po
+
+[type: man] ../free.1 $lang:$lang/free.1 \
+            add_$lang:?add_$lang/$lang.add opt:"-k 80"
+
+[type: man] ../kill.1 $lang:$lang/kill.1 \
+            add_$lang:?add_$lang/$lang.add opt:"-k 80"
+
+[type: man] ../pgrep.1 $lang:$lang/pgrep.1 \
+            add_$lang:?add_$lang/$lang.add opt:"-k 80"
+
+[type: man] ../pidof.1 $lang:$lang/pidof.1 \
+            add_$lang:?add_$lang/$lang.add opt:"-k 80"
+
+[type: man] ../pmap.1 $lang:$lang/pmap.1 \
+            add_$lang:?add_$lang/$lang.add opt:"-k 80"
+
+[type: man] ../pwdx.1 $lang:$lang/pwdx.1 \
+            add_$lang:?add_$lang/$lang.add opt:"-k 80"
+
+[type: man] ../skill.1 $lang:$lang/skill.1 \
+            add_$lang:?add_$lang/$lang.add opt:"-k 80"
+
+[type: man] ../slabtop.1 $lang:$lang/slabtop.1 \
+            add_$lang:?add_$lang/$lang.add opt:"-k 80"
+
+[type: man] ../sysctl.8 $lang:$lang/sysctl.8 \
+            add_$lang:?add_$lang/$lang.add opt:"-k 80"
+
+[type: man] ../sysctl.conf.5 $lang:$lang/sysctl.conf.5 \
+            add_$lang:?add_$lang/$lang.add opt:"-k 80"
+
+[type: man] ../tload.1 $lang:$lang/tload.1 \
+            add_$lang:?add_$lang/$lang.add opt:"-k 80"
+
+[type: man] ../uptime.1 $lang:$lang/uptime.1 \
+            add_$lang:?add_$lang/$lang.add opt:"-k 80"
+
+[type: man] ../vmstat.8 $lang:$lang/vmstat.8 \
+            add_$lang:?add_$lang/$lang.add opt:"-k 80"
+
+[type: man] ../w.1 $lang:$lang/w.1 \
+            add_$lang:?add_$lang/$lang.add opt:"-k 80"
+
+[type: man] ../watch.1 $lang:$lang/watch.1 \
+            add_$lang:?add_$lang/$lang.add opt:"-k 80"
+
+[type: man] ../ps/ps.1 $lang:$lang/ps.1 \
+            add_$lang:?add_$lang/$lang.add opt:"-k 80"
+
+[type: man] ../top/top.1 $lang:$lang/top.1 \
+            add_$lang:?add_$lang/$lang.add opt:"-k 80"
+#../watch.1