From: Jon Trulson <jon@radscan.com>
Date: Sun, 1 Dec 2019 03:08:11 +0000 (-0700)
Subject: localization: finish up with getting message catalogs building
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d8e218c865548fd8c1e6959421b00403ca69ee17;p=oweals%2Fcde.git

localization: finish up with getting message catalogs building

There are still some issues here - specifically with the C
dtbuilder/dtcodegen catalogs.  They may be broken due to dtbuilder not
being built yet.

Also, once dtinfo can be built, the msgs and app-defaults for it
should be re-enabled.

I also see gencat coredumping in localization/ while doing a multicore
(-jX) make.  Regular single core builds seem to work fine.
---

diff --git a/cde/configure.ac b/cde/configure.ac
index 8d5e6ca8..0377d336 100644
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -261,6 +261,7 @@ AC_CHECK_PROGS(MKFONTDIR, mkfontdir)
 AC_CHECK_PROGS(GZIP, gzip)
 AC_CHECK_PROGS(M4, m4)
 AC_CHECK_PROGS(RPCGEN, rpcgen)
+AC_CHECK_PROGS(GENCAT, gencat)
 
 dnl headers
 AC_HEADER_STDC
@@ -480,30 +481,35 @@ programs/localized/C/config/Makefile
 programs/localized/C/backdrops/Makefile
 programs/localized/C/types/Makefile
 programs/localized/C/palettes/Makefile
+programs/localized/C/msg/Makefile
 programs/localized/de_DE.UTF-8/Makefile
 programs/localized/de_DE.UTF-8/app-defaults/Makefile
 programs/localized/de_DE.UTF-8/config/Makefile
 programs/localized/de_DE.UTF-8/backdrops/Makefile
 programs/localized/de_DE.UTF-8/types/Makefile
 programs/localized/de_DE.UTF-8/palettes/Makefile
+programs/localized/de_DE.UTF-8/msg/Makefile
 programs/localized/fr_FR.UTF-8/Makefile
 programs/localized/fr_FR.UTF-8/app-defaults/Makefile
 programs/localized/fr_FR.UTF-8/config/Makefile
 programs/localized/fr_FR.UTF-8/backdrops/Makefile
 programs/localized/fr_FR.UTF-8/types/Makefile
 programs/localized/fr_FR.UTF-8/palettes/Makefile
+programs/localized/fr_FR.UTF-8/msg/Makefile
 programs/localized/it_IT.UTF-8/Makefile
 programs/localized/it_IT.UTF-8/app-defaults/Makefile
 programs/localized/it_IT.UTF-8/config/Makefile
 programs/localized/it_IT.UTF-8/backdrops/Makefile
 programs/localized/it_IT.UTF-8/types/Makefile
 programs/localized/it_IT.UTF-8/palettes/Makefile
+programs/localized/it_IT.UTF-8/msg/Makefile
 programs/localized/es_ES.UTF-8/Makefile
 programs/localized/es_ES.UTF-8/app-defaults/Makefile
 programs/localized/es_ES.UTF-8/config/Makefile
 programs/localized/es_ES.UTF-8/backdrops/Makefile
 programs/localized/es_ES.UTF-8/types/Makefile
 programs/localized/es_ES.UTF-8/palettes/Makefile
+programs/localized/es_ES.UTF-8/msg/Makefile
 
 ])
 
diff --git a/cde/programs/localized/C/msg/Makefile.am b/cde/programs/localized/C/msg/Makefile.am
new file mode 100644
index 00000000..86ff2842
--- /dev/null
+++ b/cde/programs/localized/C/msg/Makefile.am
@@ -0,0 +1,5 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+include ../../templates/C.am
+include ../../templates/msg.C.am
+
diff --git a/cde/programs/localized/de_DE.UTF-8/msg/Makefile.am b/cde/programs/localized/de_DE.UTF-8/msg/Makefile.am
new file mode 100644
index 00000000..78f3628e
--- /dev/null
+++ b/cde/programs/localized/de_DE.UTF-8/msg/Makefile.am
@@ -0,0 +1,5 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+include ../../templates/German.am
+include ../../templates/msg.am
+
diff --git a/cde/programs/localized/el_GR.UTF-8/msg/Makefile.am b/cde/programs/localized/el_GR.UTF-8/msg/Makefile.am
new file mode 100644
index 00000000..2ec4c9f0
--- /dev/null
+++ b/cde/programs/localized/el_GR.UTF-8/msg/Makefile.am
@@ -0,0 +1,5 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+include ../../templates/Greek.am
+include ../../templates/msg.am
+
diff --git a/cde/programs/localized/es_ES.UTF-8/msg/Makefile.am b/cde/programs/localized/es_ES.UTF-8/msg/Makefile.am
new file mode 100644
index 00000000..1aca1ccf
--- /dev/null
+++ b/cde/programs/localized/es_ES.UTF-8/msg/Makefile.am
@@ -0,0 +1,5 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+include ../../templates/Spanish.am
+include ../../templates/msg.am
+
diff --git a/cde/programs/localized/fr_FR.UTF-8/msg/Makefile.am b/cde/programs/localized/fr_FR.UTF-8/msg/Makefile.am
new file mode 100644
index 00000000..cac6273a
--- /dev/null
+++ b/cde/programs/localized/fr_FR.UTF-8/msg/Makefile.am
@@ -0,0 +1,5 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+include ../../templates/French.am
+include ../../templates/msg.am
+
diff --git a/cde/programs/localized/it_IT.UTF-8/msg/Makefile.am b/cde/programs/localized/it_IT.UTF-8/msg/Makefile.am
new file mode 100644
index 00000000..63511b60
--- /dev/null
+++ b/cde/programs/localized/it_IT.UTF-8/msg/Makefile.am
@@ -0,0 +1,5 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+include ../../templates/Italian.am
+include ../../templates/msg.am
+
diff --git a/cde/programs/localized/templates/msg.C.am b/cde/programs/localized/templates/msg.C.am
new file mode 100644
index 00000000..460bc933
--- /dev/null
+++ b/cde/programs/localized/templates/msg.C.am
@@ -0,0 +1,217 @@
+# process the message files...
+
+# NOTYET dtinfo.cat dtinfo_start.cat 
+
+BUILT_SOURCES = Xm.cat Mrm.cat Uil.cat DtHelp.cat fmt_tbl.cat		\
+      DtMail.cat DtPrint.cat DtWidget.cat MotifApp.cat			\
+      SUNW_TOOLTALK.cat dt.cat dtact.cat dtbuilder.cat dtcalc.cat	\
+      dtcm.cat dtcodegen.cat dtconfig.cat dtcopy.cat dtcreate.cat	\
+      dtfile.cat dthello.cat dthelpgen.cat dthelpprint.cat dticon.cat	\
+      dtimsstart.cat dtksh.cat		\
+      dtlogin.cat dtlp.cat dtmailopts.cat dtpad.cat dtpdm.cat		\
+      dtpdmd.cat dtprintinfo.cat dtscreen.cat dtsearch.cat		\
+      dtsession.cat dtstyle.cat dtterm.cat dttypes.cat dtwm.cat		\
+      dtudcexch.cat dtudcfonted.cat libdtcm.cat libDtMail.cat
+
+CLEANFILES = $(BUILT_SOURCES)
+
+TOP = $(top_builddir)/programs
+TOPLIB = $(top_builddir)/lib
+TOPMOTIF = $(top_builddir)/imports/
+
+Xm.cat: $(top_srcdir)/imports/motif/localized/$(LANG)/msg/Xm.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+Mrm.cat: $(top_srcdir)/imports/motif/localized/$(LANG)/msg/Mrm.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+Uil.cat: $(top_srcdir)/imports/motif/localized/$(LANG)/msg/Uil.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+DtHelp.cat: $(TOPLIB)/DtHelp/DtHelp.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+fmt_tbl.cat: $(TOPLIB)/DtHelp/fmt_tbl.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+DtMail.cat: $(TOP)/dtmail/dtmail/DtMail.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+DtPrint.cat: $(TOPLIB)/DtPrint/DtPrint.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+DtWidget.cat: $(TOPLIB)/DtWidget/DtWidget.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+MotifApp.cat: $(TOP)/dtmail/MotifApp/MotifApp.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+SUNW_TOOLTALK.cat: $(TOPLIB)/tt/SUNW_TOOLTALK.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dt.cat: $(TOPLIB)/DtSvc/dtsvc.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dtact.cat: $(TOP)/dtaction/dtact.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dtcodegen.cat: $(TOP)/dtappbuilder/src/libAButil/libAButil.msg $(TOP)/dtappbuilder/src/libABobjXm/libABobjXm.msg $(TOP)/dtappbuilder/src/libABil/libABil.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dtbuilder.cat: $(TOP)/dtappbuilder/src/libAButil/libAButil.msg $(TOP)/dtappbuilder/src/libABobjXm/libABobjXm.msg $(TOP)/dtappbuilder/src/libABil/libABil.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dtcalc.cat: $(TOP)/dtcalc/dtcalc.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dtcm.cat: $(TOP)/dtcm/dtcm/dtcm.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dtconfig.cat: $(TOP)/dtconfig/dtconfig.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dtcopy.cat: $(TOP)/dtfile/dtcopy/dtcopy.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dtcreate.cat: $(TOP)/dtcreate/dtcreate.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dtfile.cat: $(TOP)/dtfile/dtfile.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dthello.cat: $(TOP)/dthello/dthello.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dthelpgen.cat: $(TOP)/dthelp/dthelpgen/dthelpgen.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dthelpprint.cat: $(TOP)/dthelp/dthelpprint/dthelpprint.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dticon.cat: $(TOP)/dticon/dticon.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dtimsstart.cat: $(TOP)/dtimsstart/dtimsstart.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dtinfo.cat: $(TOP)/dtinfo/dtinfo/src/dtinfo.msg.updated
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dtinfo_start.cat: $(TOP)/dtinfo/clients/dtinfo_start/dtinfo_start.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dtksh.cat: $(TOP)/dtksh/dtksh.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dtlogin.cat: $(TOP)/dtlogin/dtlogin.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dtlp.cat: $(TOP)/dtprintegrate/dtlp.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dtmailopts.cat: $(TOP)/dtmail/dtmail/dtmailopts.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dtpad.cat: $(TOP)/dtpad/dtpad.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dtpdm.cat: $(TOP)/dtpdm/dtpdm.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dtpdmd.cat: $(TOP)/dtpdmd/dtpdmd.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+# This one assumes that sym2num was already run on this berfore we get here
+dtprintinfo.cat: $(TOP)/dtprintinfo/dtprintinfo.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dtscreen.cat: $(TOP)/dtscreen/dtscreen.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dtsearch.cat: $(TOPLIB)/DtSearch/dtsearch.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dtsession.cat: $(TOP)/dtsession/dtsession.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dtstyle.cat: $(TOP)/dtstyle/dtstyle.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dtterm.cat: $(TOP)/dtterm/dtterm.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dttypes.cat: $(TOP)/util/dttypes/dttypes.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dtwm.cat: $(TOP)/dtwm/dtwm.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dtudcexch.cat: $(TOP)/dtudcexch/dtudcexch.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+dtudcfonted.cat: $(TOP)/dtudcfonted/dtudcfonted.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+libABil.cat: $(TOP)/dtappbuilder/src/libABil/libABil.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+libABobjXm.cat: $(TOP)/dtappbuilder/src/libABobjXm/libABobjXm.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+libAButil.cat: $(TOP)/dtappbuilder/src/libAButil/libAButil.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+libdtcm.cat: $(TOP)/dtcm/libDtCmP/libdtcm.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
+
+libDtMail.cat: $(TOP)/dtmail/libDtMail/Common/libDtMail.msg
+	$(RM) $@
+	LANG=C $(GENCAT) -o $@ $^ || $(RM) $@
diff --git a/cde/programs/localized/templates/msg.am b/cde/programs/localized/templates/msg.am
new file mode 100644
index 00000000..2b593198
--- /dev/null
+++ b/cde/programs/localized/templates/msg.am
@@ -0,0 +1,13 @@
+# message files for non-C locales - ie: local .msg files.  So much
+# nicer :)
+
+TMPLOCAL_DEST = $(shell ls *.msg |grep -v libAB |sed -e 's/.msg/.cat/g')
+
+BUILT_SOURCES = $(TMPLOCAL_DEST)
+CLEANFILES = $(BUILT_SOURCES)
+
+SUFFIXES = .msg .cat
+
+.msg.cat:
+	$(RM) $@
+	LANG=$(LANG) $(GENCAT) -o $@ $^ || $(RM) $@