From e437a02e0b226b0ac25874fa9a55efa7d279fe6b Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Mon, 6 Dec 2021 17:14:31 -0700 Subject: [PATCH] dtinfo/dtinfogen: make it build Now, as to whether it all actually works, I guess we will see. --- cde/configure.ac | 10 ++ cde/programs/dtinfo/Makefile.am | 4 +- cde/programs/dtinfo/dtinfo_env.mk | 1 + .../infolib/C.ISO-8859-1/SGML/Makefile.am | 3 +- .../dtinfo/dtinfogen/infolib/Makefile.am | 15 +- .../dtinfo/dtinfogen/infolib/etc/Makefile.am | 130 ++++++++++++++++++ .../dtinfogen/infolib/etc/dtinfogen_worker.c | 2 +- .../dtinfo/dtinfogen/install/Makefile.am | 14 ++ .../dtinfo/dtinfogen/install/valBase.C | 3 +- .../dtinfogen/mmdb/StyleSheet/Makefile.am | 12 ++ .../dtinfo/dtinfogen/mmdb/src/Makefile.am | 25 ++++ 11 files changed, 206 insertions(+), 13 deletions(-) create mode 100644 cde/programs/dtinfo/dtinfogen/infolib/etc/Makefile.am create mode 100644 cde/programs/dtinfo/dtinfogen/install/Makefile.am create mode 100644 cde/programs/dtinfo/dtinfogen/mmdb/StyleSheet/Makefile.am create mode 100644 cde/programs/dtinfo/dtinfogen/mmdb/src/Makefile.am diff --git a/cde/configure.ac b/cde/configure.ac index b6ef4bbc8..9d4d610c4 100644 --- a/cde/configure.ac +++ b/cde/configure.ac @@ -753,6 +753,16 @@ programs/dtinfo/dtinfo/install/lib/Makefile programs/dtinfo/dtinfo/install/lib/bitmaps/Makefile programs/dtinfo/dtinfo/install/lib/fonts/Makefile +programs/dtinfo/dtinfogen/Makefile +programs/dtinfo/dtinfogen/mmdb/Makefile +programs/dtinfo/dtinfogen/mmdb/src/Makefile +programs/dtinfo/dtinfogen/mmdb/StyleSheet/Makefile +programs/dtinfo/dtinfogen/infolib/Makefile +programs/dtinfo/dtinfogen/infolib/etc/Makefile +programs/dtinfo/dtinfogen/infolib/C.ISO-8859-1/Makefile +programs/dtinfo/dtinfogen/infolib/C.ISO-8859-1/SGML/Makefile +programs/dtinfo/dtinfogen/install/Makefile + programs/types/Makefile programs/tttypes/Makefile diff --git a/cde/programs/dtinfo/Makefile.am b/cde/programs/dtinfo/Makefile.am index 629e6d7ce..67d326b9c 100644 --- a/cde/programs/dtinfo/Makefile.am +++ b/cde/programs/dtinfo/Makefile.am @@ -1,5 +1,3 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = tools DtMmdb mmdb clients dtinfo - -#NOTYET dtinfo dtinfogen +SUBDIRS = tools DtMmdb mmdb clients dtinfo dtinfogen diff --git a/cde/programs/dtinfo/dtinfo_env.mk b/cde/programs/dtinfo/dtinfo_env.mk index a58e6ecbf..5a4ea0bc3 100644 --- a/cde/programs/dtinfo/dtinfo_env.mk +++ b/cde/programs/dtinfo/dtinfo_env.mk @@ -37,6 +37,7 @@ WWL_LIBS=$(STATIC) -L$(WWL)/src -lWWL EXCEPTIONS_INCLUDES = -I$(EXCEPTIONSSRC) MMDB_INCLUDES = -I$(MMDBSRC) MMDB_LIBS=$(OLIAS)/mmdb/libMMDB.la +MMDB_LIBS_C_API = -L$(MMDB) -lDtMmdb UAS_INCLUDES = -I$(UASSRC)/Base COMMON_CLASS_INCLUDES = -I$(MMDBSRC)/dti_cc -I$(MMDBSRC) STYLE_SHEET_INCLUDES = -I$(MMDBSRC)/StyleSheet diff --git a/cde/programs/dtinfo/dtinfogen/infolib/C.ISO-8859-1/SGML/Makefile.am b/cde/programs/dtinfo/dtinfogen/infolib/C.ISO-8859-1/SGML/Makefile.am index 4cd0fbe06..445738efd 100644 --- a/cde/programs/dtinfo/dtinfogen/infolib/C.ISO-8859-1/SGML/Makefile.am +++ b/cde/programs/dtinfo/dtinfogen/infolib/C.ISO-8859-1/SGML/Makefile.am @@ -1,5 +1,3 @@ -sgmldir = ${prefix}/infolib/C/SGML - MAINTAINERCLEANFILES = Makefile.in DECL_FILES= \ @@ -44,4 +42,5 @@ MISC_FILES= \ ALL_FILES = $(DECL_FILES) $(DTD_FILES) $(ENTITY_FILES) $(MISC_FILES) +sgmldir = $(CDE_INSTALLATION_TOP)/infolib/C/SGML sgml_DATA = $(ALL_FILES) diff --git a/cde/programs/dtinfo/dtinfogen/infolib/Makefile.am b/cde/programs/dtinfo/dtinfogen/infolib/Makefile.am index 3ce08b2e6..b0201fa06 100644 --- a/cde/programs/dtinfo/dtinfogen/infolib/Makefile.am +++ b/cde/programs/dtinfo/dtinfogen/infolib/Makefile.am @@ -1,10 +1,13 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = etc C.ISO-8859-1 ja_JP.EUC-JP +SUBDIRS = etc C.ISO-8859-1 -C:: C.ISO-8859-1 - $(RM) $@ - $(LN) $? $@ +# Not supported, but we'll keep it here in case someday... +# SUBDIRS += ja_JP.EUC-JP + +BUILT_SOURCES = C +CLEANFILES = $(BUILT_SOURCES) + +C: + $(LN_S) C.ISO-8859-1 $@ -clean:: - $(RM) C diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/Makefile.am b/cde/programs/dtinfo/dtinfogen/infolib/etc/Makefile.am new file mode 100644 index 000000000..c716a405c --- /dev/null +++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/Makefile.am @@ -0,0 +1,130 @@ +MAINTAINERCLEANFILES = Makefile.in + +# get our env variables +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk + +# symlinks used by dtinfogen when run from the build tree +BUILT_SOURCES = hardcopy.feature.spec online.feature.spec \ + mmdb.infolib.spec dtsr C.ISO-8859-1 C + + +PROGRAMSRC = $(top_builddir)/programs + +dtsr: + $(LN_S) $(top_builddir)/programs/dtsr $@ + +hardcopy.feature.spec: + $(LN_S) $(MMDB)/StyleSheet/$@ $@ + +online.feature.spec: + $(LN_S) $(MMDB)/StyleSheet/$@ $@ + +mmdb.infolib.spec: + $(LN_S) $(MMDB)/oliasdb/$@ $@ + +C.ISO-8859-1: + $(LN_S) $(PROGRAMSRC)/localized/C $@ + +C: + $(LN_S) C.ISO-8859-1 $@ + +if GERMAN +BUILT_SOURCES += de_DE.UTF-8 +de_DE.UTF-8: + $(LN_S) $(PROGRAMSRC)/localized/de_DE.UTF-8 $@ +endif + +if SPANISH +BUILT_SOURCES += es_ES.UTF-8 +es_ES.UTF-8: + $(LN_S) $(PROGRAMSRC)/localized/es_ES.UTF-8 $@ +endif + +if FRENCH +BUILT_SOURCES += fr_FR.UTF-8 +fr_FR.UTF-8: + $(LN_S) $(PROGRAMSRC)/localized/fr_FR.UTF-8 $@ +endif + +if ITALIAN +BUILT_SOURCES += it_IT.UTF-8 +it_IT.UTF-8: + $(LN_S) $(PROGRAMSRC)/localized/it_IT.UTF-8 $@ +endif + +# NOT CURRENTLY +# BUILT_SOURCES += ja_JP.EUC-JP +#ja_JP.EUC-JP: +# $(LN_S) $(PROGRAMSRC)/localized/ja_JP.EUC-JP $@ + +CLEANFILES = $(BUILT_SOURCES) + +# always using DtSearch, so this is the search engine we use +SEARCH_SRCS = AusText.C AusTextStorage.C + +# at no time have we ever regenerated the lexer files. Someday we +# might need/want to, so keep that in mind. From Imakefile: +# +#LexTarget (gr_type,graphics_task) +#LexTarget (ReplaceIdIdref,nodedata) +#LexTarget (ContentType,ol_data) +#LexTarget (RemoteId,remote) +#YaccTarget(OL_DataExpr,ol_data) + +NORMAL_SRCS = AttributeData.C AttributeList.C AttributeRec.C \ + BookCaseDB.C BookTasks.C BTCollectable.C ConcatTask.C \ + Content.C OL_DataExpr.C ContentType.C DataBase.C DataTask.C \ + DataRepository.C Dispatch.C EntityList.C Expression.C \ + ExprList.C FirstOf.C FlexBuffer.C GenericId.C gr_type.C \ + GraphicsTask.C Handler.C LcfTask.C NodeData.C NodeTask.C \ + OL-Data.C OLAF.C ReplaceIdIdref.C SGMLDefn.C SGMLName.C \ + SearchEng.C SearchPath.C SearchStorage.C StringList.C \ + StyleTask.C StyleTaskDB.C StyleValidate.C TOCTask.C Task.C \ + Token.C lex.C $(SEARCH_SRCS) + +noinst_LTLIBRARIES = libOLAFParse.la +libOLAFParse_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libOLAFParse_la_SOURCES = $(NORMAL_SRCS) + +if LINUX +TEMPLATE_SRC = TKTemplate.C +endif + +if BSD +TEMPLATE_SRC = TKTemplate.C +endif + +bin_SCRIPTS = dtinfogen + +# helpers + +infolibdir = $(CDE_INSTALLATION_TOP)/infolib/etc +infolib_PROGRAMS = NodeParser NCFGen MixedGen StyleUpdate dtinfogen_worker + +NodeParser_CXXFLAGS = $(EXCEPTIONS_INCLUDES) $(DTINFO_DEFINES) \ + $(DTINFO_INCLUDES) +NodeParser_LDADD = libOLAFParse.la $(MMDB_LIBS) +NodeParser_SOURCES = NodeParser.C $(TEMPLATE_SRC) + +NCFGen_CXXFLAGS = $(EXCEPTIONS_INCLUDES) $(DTINFO_DEFINES) \ + $(DTINFO_INCLUDES) +NCFGen_LDADD = libOLAFParse.la $(MMDB_LIBS) $(DTCLIENTLIBS) $(XTOOLLIB) +NCFGen_SOURCES = NCFGen.C $(TEMPLATE_SRC) + +MixedGen_CXXFLAGS = $(EXCEPTIONS_INCLUDES) $(DTINFO_DEFINES) \ + $(DTINFO_INCLUDES) +MixedGen_LDADD = libOLAFParse.la $(MMDB_LIBS) $(DTCLIENTLIBS) $(XTOOLLIB) +MixedGen_SOURCES = MixedGen.C RemoteId.C $(TEMPLATE_SRC) + +StyleUpdate_CXXFLAGS = $(EXCEPTIONS_INCLUDES) $(DTINFO_DEFINES) \ + $(DTINFO_INCLUDES) +StyleUpdate_LDADD = libOLAFParse.la $(MMDB_LIBS) $(DTCLIENTLIBS) $(XTOOLLIB) +StyleUpdate_SOURCES = StyleUpdate.C $(TEMPLATE_SRC) + +dtinfogen_worker_CFLAGS = $(EXCEPTIONS_INCLUDES) $(DTINFO_DEFINES) \ + $(DTINFO_INCLUDES) +dtinfogen_worker_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB) +dtinfogen_worker_SOURCES = dtinfogen_worker.c + + + diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen_worker.c b/cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen_worker.c index f32186477..4c0741013 100644 --- a/cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen_worker.c +++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen_worker.c @@ -48,7 +48,7 @@ #include #include
-#include +#include
#define LANG_COMMON "C" /* default os language */ #define CLANG_COMMON "C.ISO-8859-1" /* default canonical language */ diff --git a/cde/programs/dtinfo/dtinfogen/install/Makefile.am b/cde/programs/dtinfo/dtinfogen/install/Makefile.am new file mode 100644 index 000000000..c4f5f2b32 --- /dev/null +++ b/cde/programs/dtinfo/dtinfogen/install/Makefile.am @@ -0,0 +1,14 @@ +MAINTAINERCLEANFILES = Makefile.in + +# get our env variables +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk + +infolibdir = $(CDE_INSTALLATION_TOP)/infolib/etc +infolib_PROGRAMS = valBase + +valBase_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +valBase_LDADD = $(MMDB_LIBS) $(DTCLIENTLIBS) $(XTOOLLIB) +valBase_SOURCES = valBase.C + +infolib_SCRIPTS = DeInstallBase ChangeCaseTitle Librarian + diff --git a/cde/programs/dtinfo/dtinfogen/install/valBase.C b/cde/programs/dtinfo/dtinfogen/install/valBase.C index 4e97e6316..410b277b9 100644 --- a/cde/programs/dtinfo/dtinfogen/install/valBase.C +++ b/cde/programs/dtinfo/dtinfogen/install/valBase.C @@ -57,8 +57,9 @@ using namespace std; #include "oliasdb/mmdb.h" #include "oliasdb/asciiIn_filters.h" +// JET - don't need this - it (exit()) is defined in stdlib.h // DDK header file -#include "olGlobal.h" +// #include "olGlobal.h" // Debuggging macro int dbgLevel; diff --git a/cde/programs/dtinfo/dtinfogen/mmdb/StyleSheet/Makefile.am b/cde/programs/dtinfo/dtinfogen/mmdb/StyleSheet/Makefile.am new file mode 100644 index 000000000..e2aa7570c --- /dev/null +++ b/cde/programs/dtinfo/dtinfogen/mmdb/StyleSheet/Makefile.am @@ -0,0 +1,12 @@ +MAINTAINERCLEANFILES = Makefile.in + +# get our env variables +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk + +infolibdir = $(CDE_INSTALLATION_TOP)/infolib/etc +infolib_PROGRAMS = validator + +validator_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +validator_LDADD = $(MMDB_LIBS) $(DTCLIENTLIBS) $(XTOOLLIB) +validator_SOURCES = validator.C + diff --git a/cde/programs/dtinfo/dtinfogen/mmdb/src/Makefile.am b/cde/programs/dtinfo/dtinfogen/mmdb/src/Makefile.am new file mode 100644 index 000000000..58bb74f27 --- /dev/null +++ b/cde/programs/dtinfo/dtinfogen/mmdb/src/Makefile.am @@ -0,0 +1,25 @@ +MAINTAINERCLEANFILES = Makefile.in + +# get our env variables +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk + +infolibdir = $(CDE_INSTALLATION_TOP)/infolib/etc +infolib_PROGRAMS = dbdrv + +dbdrv_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +dbdrv_LDADD = $(MMDB_LIBS) $(DTCLIENTLIBS) $(XTOOLLIB) +dbdrv_SOURCES = main.C + +noinst_PROGRAMS = restore dbdrv_c_api + +restore_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +restore_LDADD = $(MMDB_LIBS) $(DTCLIENTLIBS) $(XTOOLLIB) +restore_SOURCES = restore.C + +dbdrv_c_api_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +dbdrv_c_api_LDADD = $(MMDB_LIBS_C_API) $(WWL_LIBS) \ + $(DTCLIENTLIBS) $(XTOOLLIB) +dbdrv_c_api_SOURCES = main_c_api.c + + +