From: Jon Trulson <jon@radscan.com>
Date: Mon, 5 Nov 2018 02:25:57 +0000 (-0700)
Subject: utf8 conversion: fix up seperation of locale and doc building
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c876a76f4f6c38dcc6123158b4be95cb45d92435;p=oweals%2Fcde.git

utf8 conversion: fix up seperation of locale and doc building

Docs (help and the dtinfo guides) are now always built using the
ISO8859-1 locale.  To support UTF-8, our docbook needs to be updated
to something from this century, ideally this decade.  In addition, a
conversion to XML would also be required as a result.  So, until that
happens, use ISO8859-1 for docs.

However, other locale information, like message catalogs, resource
files, and the like are now converted to UTF-8.

All supported languages are now built by default on linux again.
---

diff --git a/cde/config/cf/site.def b/cde/config/cf/site.def
index 7207c920..7321f87d 100644
--- a/cde/config/cf/site.def
+++ b/cde/config/cf/site.def
@@ -127,8 +127,10 @@ XCOMM Make sure you have installed the de_DE, es_ES, fr_FR and it_IT locales.
 XCOMM  or building non-C locales will cause build failures.
 XCOMM DtLocalesToBuild: de_DE.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 it_IT.UTF-8 en_US.UTF-8
 # if !defined(DtLocalesToBuild)
-#  define DtLocalesToBuild en_US.UTF-8
+#  define DtLocalesToBuild en_US.UTF-8 de_DE.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 it_IT.UTF-8
 # endif
+XCOMM This is a hack for the en_US.UTF-8 stuff, which should be redone
+XCOMM as a proper locale, rather than aliasing C
 # define UTF8_NLS_SUPPORT
 #endif
 
@@ -155,9 +157,11 @@ XCOMM DtLocalesToBuild: de_DE.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 it_IT.UTF-8 en_US.UT
 #endif
 #endif
 
-XCOMM define DtDocLocalesToBuild to be the same as DtLocalesToBuild if undefined
+XCOMM The documentation can only be built with ISO8859-1 encoding.
+XCOMM An upgrade to docbook and conversion to XML is required to properly
+XCOMM support utf8 with dtinfo and dthelp files.
 #ifndef DtDocLocalesToBuild
-# define DtDocLocalesToBuild DtLocalesToBuild
+# define DtDocLocalesToBuild de_DE.ISO8859-1 es_ES.ISO8859-1 fr_FR.ISO8859-1 it_IT.ISO8859-1
 #endif
 
 #endif /* AfterVendorCF */
diff --git a/cde/doc/de_DE.ISO8859-1/guides/Imakefile b/cde/doc/de_DE.ISO8859-1/guides/Imakefile
index 3d3884d6..a253db9b 100644
--- a/cde/doc/de_DE.ISO8859-1/guides/Imakefile
+++ b/cde/doc/de_DE.ISO8859-1/guides/Imakefile
@@ -5,5 +5,6 @@ XCOMM $XConsortium: Imakefile /main/8 1996/12/17 19:31:32 rws $
 #define HasinfoUGuide
 #define HassysAdminGuide
 
+#define BuildingDocs YES
 #include "../../../programs/localized/templates/German.tmpl"
 #include "../../common/guides/Imakefile.tmpl"
diff --git a/cde/doc/de_DE.ISO8859-1/help/Imakefile b/cde/doc/de_DE.ISO8859-1/help/Imakefile
index 5ee0e19b..2161fc14 100644
--- a/cde/doc/de_DE.ISO8859-1/help/Imakefile
+++ b/cde/doc/de_DE.ISO8859-1/help/Imakefile
@@ -19,5 +19,6 @@ XCOMM $XConsortium: Imakefile /main/6 1996/12/17 17:16:01 rws $
 #define HasTerminal
 #define HasTextedit
 
+#define BuildingDocs YES
 #include "../../../programs/localized/templates/German.tmpl"
 #include "../../common/help/Imakefile.tmpl"
diff --git a/cde/doc/es_ES.ISO8859-1/guides/Imakefile b/cde/doc/es_ES.ISO8859-1/guides/Imakefile
index 2b85e262..71ec9908 100644
--- a/cde/doc/es_ES.ISO8859-1/guides/Imakefile
+++ b/cde/doc/es_ES.ISO8859-1/guides/Imakefile
@@ -5,5 +5,6 @@ XCOMM $XConsortium: Imakefile /main/8 1996/12/20 11:35:35 rws $
 #define HasinfoUGuide
 #define HassysAdminGuide
 
+#define BuildingDocs YES
 #include "../../../programs/localized/templates/Spanish.tmpl"
 #include "../../common/guides/Imakefile.tmpl"
diff --git a/cde/doc/es_ES.ISO8859-1/help/Imakefile b/cde/doc/es_ES.ISO8859-1/help/Imakefile
index 9115fdcf..3c3f761c 100644
--- a/cde/doc/es_ES.ISO8859-1/help/Imakefile
+++ b/cde/doc/es_ES.ISO8859-1/help/Imakefile
@@ -19,5 +19,6 @@ XCOMM $XConsortium: Imakefile /main/6 1996/12/20 11:34:27 rws $
 #define HasTerminal
 #define HasTextedit
 
+#define BuildingDocs YES
 #include "../../../programs/localized/templates/Spanish.tmpl"
 #include "../../common/help/Imakefile.tmpl"
diff --git a/cde/doc/fr_FR.ISO8859-1/guides/Imakefile b/cde/doc/fr_FR.ISO8859-1/guides/Imakefile
index b009ea01..3ba6cfd5 100644
--- a/cde/doc/fr_FR.ISO8859-1/guides/Imakefile
+++ b/cde/doc/fr_FR.ISO8859-1/guides/Imakefile
@@ -5,5 +5,6 @@ XCOMM $XConsortium: Imakefile /main/8 1996/12/17 15:13:06 rws $
 #define HasinfoUGuide
 #define HassysAdminGuide
 
+#define BuildingDocs YES
 #include "../../../programs/localized/templates/French.tmpl"
 #include "../../common/guides/Imakefile.tmpl"
diff --git a/cde/doc/fr_FR.ISO8859-1/help/Imakefile b/cde/doc/fr_FR.ISO8859-1/help/Imakefile
index a245b48b..4b4834aa 100644
--- a/cde/doc/fr_FR.ISO8859-1/help/Imakefile
+++ b/cde/doc/fr_FR.ISO8859-1/help/Imakefile
@@ -19,5 +19,6 @@ XCOMM $XConsortium: Imakefile /main/6 1996/12/17 19:30:25 rws $
 #define HasTerminal
 #define HasTextedit
 
+#define BuildingDocs YES
 #include "../../../programs/localized/templates/French.tmpl"
 #include "../../common/help/Imakefile.tmpl"
diff --git a/cde/doc/it_IT.ISO8859-1/guides/Imakefile b/cde/doc/it_IT.ISO8859-1/guides/Imakefile
index 8623008b..6825709c 100644
--- a/cde/doc/it_IT.ISO8859-1/guides/Imakefile
+++ b/cde/doc/it_IT.ISO8859-1/guides/Imakefile
@@ -5,5 +5,6 @@ XCOMM $XConsortium: Imakefile /main/8 1996/12/17 15:13:39 rws $
 #define HasinfoUGuide
 #define HassysAdminGuide
 
+#define BuildingDocs YES
 #include "../../../programs/localized/templates/Italian.tmpl"
 #include "../../common/guides/Imakefile.tmpl"
diff --git a/cde/doc/it_IT.ISO8859-1/help/Imakefile b/cde/doc/it_IT.ISO8859-1/help/Imakefile
index e8ec90b4..d80996b3 100644
--- a/cde/doc/it_IT.ISO8859-1/help/Imakefile
+++ b/cde/doc/it_IT.ISO8859-1/help/Imakefile
@@ -19,5 +19,6 @@ XCOMM $XConsortium: Imakefile /main/6 1996/12/17 20:17:04 rws $
 #define HasTerminal
 #define HasTextedit
 
+#define BuildingDocs YES
 #include "../../../programs/localized/templates/Italian.tmpl"
 #include "../../common/help/Imakefile.tmpl"
diff --git a/cde/programs/localized/templates/French.tmpl b/cde/programs/localized/templates/French.tmpl
index 5cd8316a..b23489a0 100644
--- a/cde/programs/localized/templates/French.tmpl
+++ b/cde/programs/localized/templates/French.tmpl
@@ -4,25 +4,30 @@ XCOMM $XConsortium: French.tmpl /main/1 1995/12/08 09:41:35 rswiston $
  * variable for the French locale.
  */
 
-SOURCE_LANG=fr_FR.UTF-8
+#if BuildingDocs
 
-#ifdef AlphaArchitecture
-LANG=fr_FR.UTF-8
+XCOMM stick to ISO8859-1
+SOURCE_LANG=fr_FR.ISO8859-1
+
+#ifdef SunArchitecture
+LANG=fr
 #endif
 
-#ifdef RsArchitecture
-SHELL=/bin/ksh
-LANG=fr_FR
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
+LANG=fr_FR.ISO8859-1
 #endif
 
+#else
+
+XCOMM use UTF-8 for localization
+SOURCE_LANG=fr_FR.UTF-8
+
 #ifdef SunArchitecture
 LANG=fr
 #endif
 
-#ifdef HPArchitecture
-LANG=fr_FR.utf8
-#endif
-
 #if defined(LinuxArchitecture) || defined(BSDArchitecture)
 LANG=fr_FR.UTF-8
 #endif
+
+#endif
diff --git a/cde/programs/localized/templates/German.tmpl b/cde/programs/localized/templates/German.tmpl
index 9569d931..e1974274 100644
--- a/cde/programs/localized/templates/German.tmpl
+++ b/cde/programs/localized/templates/German.tmpl
@@ -4,25 +4,30 @@ XCOMM $XConsortium: German.tmpl /main/1 1995/12/08 09:41:46 rswiston $
  * variable for the German locale.
  */
 
-SOURCE_LANG=de_DE.UTF-8
+#if BuildingDocs
 
-#ifdef AlphaArchitecture
-LANG=de_DE.UTF-8
+XCOMM stick to ISO8859-1
+SOURCE_LANG=de_DE.ISO8859-1
+
+#ifdef SunArchitecture
+LANG=de
 #endif
 
-#ifdef RsArchitecture
-SHELL=/bin/ksh
-LANG=de_DE
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
+LANG=de_DE.ISO8859-1
 #endif
 
+#else
+
+XCOMM use UTF-8 for localization
+SOURCE_LANG=de_DE.UTF-8
+
 #ifdef SunArchitecture
 LANG=de
 #endif
 
-#ifdef HPArchitecture
-LANG=de_DE.utf8
-#endif
-
 #if defined(LinuxArchitecture) || defined(BSDArchitecture)
 LANG=de_DE.UTF-8
 #endif
+
+#endif
diff --git a/cde/programs/localized/templates/Italian.tmpl b/cde/programs/localized/templates/Italian.tmpl
index 8922b74e..65ad50cc 100644
--- a/cde/programs/localized/templates/Italian.tmpl
+++ b/cde/programs/localized/templates/Italian.tmpl
@@ -4,25 +4,31 @@ XCOMM $XConsortium: Italian.tmpl /main/1 1995/12/08 09:41:55 rswiston $
  * variable for the Italian locale.
  */
 
-SOURCE_LANG=it_IT.UTF-8
+#if BuildingDocs
 
-#ifdef AlphaArchitecture
-LANG=it_IT.UTF-8
+XCOMM stick to ISO8859-1
+SOURCE_LANG=it_IT.ISO8859-1
+
+#ifdef SunArchitecture
+LANG=it
 #endif
 
-#ifdef RsArchitecture
-SHELL=/bin/ksh
-LANG=it_IT
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
+LANG=it_IT.ISO8859-1
 #endif
 
+#else
+
+XCOMM use UTF-8 for localization
+SOURCE_LANG=it_IT.UTF-8
+
 #ifdef SunArchitecture
 LANG=it
 #endif
 
-#ifdef HPArchitecture
-LANG=it_IT.utf8
-#endif
-
 #if defined(LinuxArchitecture) || defined(BSDArchitecture)
 LANG=it_IT.UTF-8
 #endif
+
+
+#endif
diff --git a/cde/programs/localized/templates/Spanish.tmpl b/cde/programs/localized/templates/Spanish.tmpl
index f7e05169..2bc63e21 100644
--- a/cde/programs/localized/templates/Spanish.tmpl
+++ b/cde/programs/localized/templates/Spanish.tmpl
@@ -4,25 +4,29 @@ XCOMM $XConsortium: Spanish.tmpl /main/1 1995/12/08 09:42:25 rswiston $
  * variable for the Spanish locale.
  */
 
-SOURCE_LANG=es_ES.UTF-8
+#if BuildingDocs
 
-#ifdef AlphaArchitecture
-LANG=es_ES.UTF-8
+XCOMM stick to ISO8859-1
+SOURCE_LANG=es_ES.ISO8859-1
+
+#ifdef SunArchitecture
+LANG=es
 #endif
 
-#ifdef RsArchitecture
-SHELL=/bin/ksh
-LANG=es_ES
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
+LANG=es_ES.ISO8859-1
 #endif
 
+#else
+
+SOURCE_LANG=es_ES.UTF-8
+
 #ifdef SunArchitecture
 LANG=es
 #endif
 
-#ifdef HPArchitecture
-LANG=es_ES.utf8
-#endif
-
 #if defined(LinuxArchitecture) || defined(BSDArchitecture)
 LANG=es_ES.UTF-8
 #endif
+
+#endif
diff --git a/cde/programs/localized/templates/Swedish.tmpl b/cde/programs/localized/templates/Swedish.tmpl
index 19d6b029..9b37ac76 100644
--- a/cde/programs/localized/templates/Swedish.tmpl
+++ b/cde/programs/localized/templates/Swedish.tmpl
@@ -4,21 +4,30 @@ XCOMM $XConsortium: Swedish.tmpl /main/1 1995/12/08 09:42:34 rswiston $
  * variable for the Swedish locale.
  */
 
+#if BuildingDocs
+
+XCOMM stick to ISO8859-1
 SOURCE_LANG=sv_SE.ISO8859-1
 
-#ifdef AlphaArchitecture
-LANG=sv_SE.ISO8859-1
+#ifdef SunArchitecture
+LANG=sv
 #endif
 
-#ifdef RsArchitecture
-SHELL=/bin/ksh
-LANG=sv_SE
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
+LANG=sv_SE.ISO8859-1
 #endif
 
+#else
+
+XCOMM use UTF-8 for localization
+SOURCE_LANG=sv_SE.UTF-8
+
 #ifdef SunArchitecture
 LANG=sv
 #endif
 
-#ifdef HPArchitecture
-LANG=sv_SE.iso88591
+#if defined(LinuxArchitecture) || defined(BSDArchitecture)
+LANG=sv_SE.UTF-8
+#endif
+
 #endif