From 8275485b4a96823587d5d5d5ab008046ed0b5706 Mon Sep 17 00:00:00 2001 From: Ulrich Wilkens Date: Sun, 14 Oct 2012 16:38:15 +0200 Subject: [PATCH] dtinfo subtree mmdb --- cde/programs/dtinfo/mmdb/HardCopy/Imakefile | 8 ++++++-- cde/programs/dtinfo/mmdb/Imakefile | 11 +++++++++++ cde/programs/dtinfo/mmdb/StyleSheet/Imakefile | 8 ++++++-- cde/programs/dtinfo/mmdb/api/Imakefile | 2 +- cde/programs/dtinfo/mmdb/btree/Imakefile | 2 +- cde/programs/dtinfo/mmdb/compression/Imakefile | 2 +- cde/programs/dtinfo/mmdb/diskhash/Imakefile | 2 +- cde/programs/dtinfo/mmdb/dstr/Imakefile | 8 ++++++-- cde/programs/dtinfo/mmdb/dti_cc/Imakefile | 3 ++- cde/programs/dtinfo/mmdb/dti_cc/main.C | 3 ++- cde/programs/dtinfo/mmdb/dti_excs/Imakefile | 4 +++- cde/programs/dtinfo/mmdb/dynhash/Imakefile | 2 +- cde/programs/dtinfo/mmdb/hmphf/Imakefile | 8 ++++++-- cde/programs/dtinfo/mmdb/index/Imakefile | 2 +- cde/programs/dtinfo/mmdb/mgrs/Imakefile | 2 +- cde/programs/dtinfo/mmdb/object/Imakefile | 2 +- cde/programs/dtinfo/mmdb/oliasdb/Imakefile | 2 +- cde/programs/dtinfo/mmdb/schema/Imakefile | 2 +- cde/programs/dtinfo/mmdb/storage/Imakefile | 2 +- cde/programs/dtinfo/mmdb/utility/Imakefile | 2 +- 20 files changed, 54 insertions(+), 23 deletions(-) diff --git a/cde/programs/dtinfo/mmdb/HardCopy/Imakefile b/cde/programs/dtinfo/mmdb/HardCopy/Imakefile index 6a1dea25..70d03f1f 100644 --- a/cde/programs/dtinfo/mmdb/HardCopy/Imakefile +++ b/cde/programs/dtinfo/mmdb/HardCopy/Imakefile @@ -21,7 +21,8 @@ XCOMM .../programs/dtinfo/mmdb//Imakefile #define LibCreate NO #define CplusplusSource YES -DEPEND_DEFINES = $(CXXDEPENDINCLUDES) +DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) +CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES XCOMM Do not put any -g here, will cause the generation of MasterTemplate.c.c XCOMM to use centerline_new, which cannot be linked on HP @@ -44,7 +45,7 @@ CXXEXTRA_DEFINES = -ptr../templates CXXEXTRA_DEFINES = -Xo #endif -#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4) +#if defined(HPArchitecture) || defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4) LinkSourceFile(TemplatesAutoNumber.C,$(DTMMDBSRC)/HardCopy) EXTRA_SRCS = TemplatesAutoNumber.C @@ -70,6 +71,9 @@ LinkSourceFile(all_tmpls,$(DTMMDBSRC)/HardCopy) SpecialCPlusPlusObjectRule(TemplatesAutoNumber.o,,+Tall_tmpls -DEXPAND_TEMPLATES) #elif defined(AlphaArchitecture) SpecialCPlusPlusObjectRule(TemplatesAutoNumber.o,,-ptf -DEXPAND_TEMPLATES) +#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture) +SpecialCPlusPlusObjectRule(TemplatesAutoNumber.o,,-DEXPAND_TEMPLATES) +SpecialCPlusPlusExpandRule(TemplatesAutoNumber..c,TemplatesAutoNumber.C,-DEXPAND_TEMPLATES) #else SpecialCPlusPlusObjectRule(TemplatesAutoNumber.o,,-ptf -DEXPAND_TEMPLATES) SpecialCPlusPlusExpandRule(TemplatesAutoNumber..c,TemplatesAutoNumber.C,-ptf -DEXPAND_TEMPLATES) diff --git a/cde/programs/dtinfo/mmdb/Imakefile b/cde/programs/dtinfo/mmdb/Imakefile index f3c8a9ac..d8c61af4 100644 --- a/cde/programs/dtinfo/mmdb/Imakefile +++ b/cde/programs/dtinfo/mmdb/Imakefile @@ -43,6 +43,13 @@ DONES = \ EXTRALIBRARYDEPS = $(DONES) +XCOMM redefine TopLevelProject to build DtInfo with standard CDE config dir +#undef TopLevelProject +#define TopLevelProject DtInfo +IMAKE_DEFINES = -DTopLevelProject=TopLevelProject \ + -DProjectTmplFile='' \ + -DProjectRulesFile='' + MakeSubdirs($(SUBDIRS)) ForceSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) @@ -229,6 +236,10 @@ OBJS = $(API_OBJS) $(BTREE_OBJS) \ #include +XCOMM Variables to switch on debug mode temporarily +XCOMM CDEBUGFLAGS = -g -DDEBUG +XCOMM CXXDEBUGFLAGS = -g -DDEBUG + #if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3 AllTarget(libMMDBTemplates.a) diff --git a/cde/programs/dtinfo/mmdb/StyleSheet/Imakefile b/cde/programs/dtinfo/mmdb/StyleSheet/Imakefile index dda4f8c2..c75f9079 100644 --- a/cde/programs/dtinfo/mmdb/StyleSheet/Imakefile +++ b/cde/programs/dtinfo/mmdb/StyleSheet/Imakefile @@ -21,7 +21,8 @@ XCOMM .../programs/dtinfo/mmdb//Imakefile #define LibCreate NO #define CplusplusSource YES -DEPEND_DEFINES = $(CXXDEPENDINCLUDES) +DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) +CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES #ifdef DtinfoClient DEFINES = -DCDE_NEXT @@ -92,7 +93,7 @@ NORMAL_SRCS = \ VariableTable.C defParser.C defToken.C \ style.C tokenStyle.C -#if defined(HPArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4) +#if defined(HPArchitecture) || defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || !defined(CplusplusCompilerMajorVersion) || (CplusplusCompilerMajorVersion != 4) LinkSourceFile(SSTemplates.C,$(DTMMDBSRC)/StyleSheet) TEMPLATE_SRCS = SSTemplates.C @@ -110,6 +111,9 @@ LinkSourceFile(all_tmpls,$(DTMMDBSRC)/StyleSheet) SpecialCPlusPlusObjectRule(SSTemplates.o,,+Tall_tmpls -DEXPAND_TEMPLATES) #elif defined(AlphaArchitecture) SpecialCPlusPlusObjectRule(SSTemplates.o,,-ptf -DEXPAND_TEMPLATES) +#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture) +SpecialCPlusPlusObjectRule(SSTemplates.o,,-DEXPAND_TEMPLATES) +SpecialCPlusPlusExpandRule(SSTemplates..c,SSTemplates.C,-DEXPAND_TEMPLATES) #else SpecialCPlusPlusObjectRule(SSTemplates.o,,-ptf -DEXPAND_TEMPLATES) SpecialCPlusPlusExpandRule(SSTemplates..c,SSTemplates.C,-ptf -DEXPAND_TEMPLATES) diff --git a/cde/programs/dtinfo/mmdb/api/Imakefile b/cde/programs/dtinfo/mmdb/api/Imakefile index e8ddee28..2ec38fcc 100644 --- a/cde/programs/dtinfo/mmdb/api/Imakefile +++ b/cde/programs/dtinfo/mmdb/api/Imakefile @@ -21,7 +21,7 @@ XCOMM .../programs/dtinfo/mmdb//Imakefile #define LibCreate NO #define CplusplusSource YES -DEPEND_DEFINES = $(CXXDEPENDINCLUDES) +DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) DEFINES = INCLUDES = -I$(DTMMDBSRC)/api -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) -I$(DTMMDBSRC)/misc diff --git a/cde/programs/dtinfo/mmdb/btree/Imakefile b/cde/programs/dtinfo/mmdb/btree/Imakefile index a5316910..c4181310 100644 --- a/cde/programs/dtinfo/mmdb/btree/Imakefile +++ b/cde/programs/dtinfo/mmdb/btree/Imakefile @@ -21,7 +21,7 @@ XCOMM .../programs/dtinfo/mmdb//Imakefile #define LibCreate NO #define CplusplusSource YES -DEPEND_DEFINES = $(CXXDEPENDINCLUDES) +DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) DEFINES = INCLUDES = -I$(DTMMDBSRC)/btree -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) diff --git a/cde/programs/dtinfo/mmdb/compression/Imakefile b/cde/programs/dtinfo/mmdb/compression/Imakefile index a23cedd5..9568241b 100644 --- a/cde/programs/dtinfo/mmdb/compression/Imakefile +++ b/cde/programs/dtinfo/mmdb/compression/Imakefile @@ -21,7 +21,7 @@ XCOMM .../programs/dtinfo/mmdb//Imakefile #define LibCreate NO #define CplusplusSource YES -DEPEND_DEFINES = $(CXXDEPENDINCLUDES) +DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) DEFINES = INCLUDES = -I$(DTMMDBSRC)/compression -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) diff --git a/cde/programs/dtinfo/mmdb/diskhash/Imakefile b/cde/programs/dtinfo/mmdb/diskhash/Imakefile index 42efd2a3..9466116d 100644 --- a/cde/programs/dtinfo/mmdb/diskhash/Imakefile +++ b/cde/programs/dtinfo/mmdb/diskhash/Imakefile @@ -21,7 +21,7 @@ XCOMM .../programs/dtinfo/mmdb//Imakefile #define LibCreate NO #define CplusplusSource YES -DEPEND_DEFINES = $(CXXDEPENDINCLUDES) +DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) DEFINES = INCLUDES = -I$(DTMMDBSRC)/diskhash -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) diff --git a/cde/programs/dtinfo/mmdb/dstr/Imakefile b/cde/programs/dtinfo/mmdb/dstr/Imakefile index d3371fe6..4e453452 100644 --- a/cde/programs/dtinfo/mmdb/dstr/Imakefile +++ b/cde/programs/dtinfo/mmdb/dstr/Imakefile @@ -21,9 +21,13 @@ XCOMM .../programs/dtinfo/mmdb//Imakefile #define LibCreate NO #define CplusplusSource YES -DEPEND_DEFINES = $(CXXDEPENDINCLUDES) +DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) -DEFINES = +#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) +EXCEPTION_DEFINES = -DNATIVE_EXCEPTIONS +#endif + +DEFINES = $(EXCEPTION_DEFINES) INCLUDES = -I$(DTMMDBSRC)/dstr -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) LinkSourceFile(set.C,$(DTMMDBSRC)/dstr) diff --git a/cde/programs/dtinfo/mmdb/dti_cc/Imakefile b/cde/programs/dtinfo/mmdb/dti_cc/Imakefile index ed3754ae..34ba9a96 100644 --- a/cde/programs/dtinfo/mmdb/dti_cc/Imakefile +++ b/cde/programs/dtinfo/mmdb/dti_cc/Imakefile @@ -21,7 +21,8 @@ XCOMM .../programs/dtinfo/mmdb//Imakefile #define LibCreate NO #define CplusplusSource YES -DEPEND_DEFINES = $(CXXDEPENDINCLUDES) +DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) +CXXEXTRA_DEFINES = -DEXPAND_TEMPLATES DEFINES = INCLUDES = -I$(DTMMDBSRC)/dti_cc $(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES) diff --git a/cde/programs/dtinfo/mmdb/dti_cc/main.C b/cde/programs/dtinfo/mmdb/dti_cc/main.C index 46b55bf1..013de2f1 100644 --- a/cde/programs/dtinfo/mmdb/dti_cc/main.C +++ b/cde/programs/dtinfo/mmdb/dti_cc/main.C @@ -21,7 +21,8 @@ * Floor, Boston, MA 02110-1301 USA */ // $XConsortium: main.cc /main/3 1996/06/11 16:57:24 cde-hal $ -#include +#include +using namespace std; #include "Exceptions.hh" #include "cc_exceptions.h" #include "CC_Slist.h" diff --git a/cde/programs/dtinfo/mmdb/dti_excs/Imakefile b/cde/programs/dtinfo/mmdb/dti_excs/Imakefile index e2004520..bb5ce19b 100644 --- a/cde/programs/dtinfo/mmdb/dti_excs/Imakefile +++ b/cde/programs/dtinfo/mmdb/dti_excs/Imakefile @@ -21,10 +21,12 @@ XCOMM .../programs/dtinfo/mmdb//Imakefile #define LibCreate NO #define CplusplusSource YES -DEPEND_DEFINES = $(CXXDEPENDINCLUDES) +DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) #if defined(SunArchitecture) && CplusplusCompilerMajorVersion > 3 EXCEPTION_DEFINES = -DHAS_TERMINATE +#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture) +EXCEPTION_DEFINES = -DNATIVE_EXCEPTIONS #endif DEFINES = -DCC_VERSION=30 -DCHECK_INITIALIZED $(EXCEPTION_DEFINES) diff --git a/cde/programs/dtinfo/mmdb/dynhash/Imakefile b/cde/programs/dtinfo/mmdb/dynhash/Imakefile index ff238d47..5545802e 100644 --- a/cde/programs/dtinfo/mmdb/dynhash/Imakefile +++ b/cde/programs/dtinfo/mmdb/dynhash/Imakefile @@ -21,7 +21,7 @@ XCOMM .../programs/dtinfo/mmdb//Imakefile #define LibCreate NO #define CplusplusSource YES -DEPEND_DEFINES = $(CXXDEPENDINCLUDES) +DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) DEFINES = INCLUDES = -I$(DTMMDBSRC)/dynhash -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) diff --git a/cde/programs/dtinfo/mmdb/hmphf/Imakefile b/cde/programs/dtinfo/mmdb/hmphf/Imakefile index 83d8d601..919ca249 100644 --- a/cde/programs/dtinfo/mmdb/hmphf/Imakefile +++ b/cde/programs/dtinfo/mmdb/hmphf/Imakefile @@ -21,9 +21,13 @@ XCOMM .../programs/dtinfo/mmdb//Imakefile #define LibCreate NO #define CplusplusSource YES -DEPEND_DEFINES = $(CXXDEPENDINCLUDES) +DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) -DEFINES = -DPORTABLE_DB +#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) +EXCEPTION_DEFINES = -DNATIVE_EXCEPTIONS +#endif + +DEFINES = -DPORTABLE_DB $(EXCEPTION_DEFINES) INCLUDES = -I$(DTMMDBSRC)/hmphf -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) LinkSourceFile(buckets.C,$(DTMMDBSRC)/hmphf) diff --git a/cde/programs/dtinfo/mmdb/index/Imakefile b/cde/programs/dtinfo/mmdb/index/Imakefile index 4346e128..c2ac85b9 100644 --- a/cde/programs/dtinfo/mmdb/index/Imakefile +++ b/cde/programs/dtinfo/mmdb/index/Imakefile @@ -21,7 +21,7 @@ XCOMM .../programs/dtinfo/mmdb//Imakefile #define LibCreate NO #define CplusplusSource YES -DEPEND_DEFINES = $(CXXDEPENDINCLUDES) +DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) DEFINES = -DPORTABLE_DB INCLUDES = -I$(DTMMDBSRC)/index -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) diff --git a/cde/programs/dtinfo/mmdb/mgrs/Imakefile b/cde/programs/dtinfo/mmdb/mgrs/Imakefile index 4221be0f..14333329 100644 --- a/cde/programs/dtinfo/mmdb/mgrs/Imakefile +++ b/cde/programs/dtinfo/mmdb/mgrs/Imakefile @@ -21,7 +21,7 @@ XCOMM .../programs/dtinfo/mmdb//Imakefile #define LibCreate NO #define CplusplusSource YES -DEPEND_DEFINES = $(CXXDEPENDINCLUDES) +DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) DEFINES = -DCOMPACTED_DISK_REP -DPORTABLE_DB INCLUDES = -I$(DTMMDBSRC)/mgrs -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) diff --git a/cde/programs/dtinfo/mmdb/object/Imakefile b/cde/programs/dtinfo/mmdb/object/Imakefile index 46948b82..dca26752 100644 --- a/cde/programs/dtinfo/mmdb/object/Imakefile +++ b/cde/programs/dtinfo/mmdb/object/Imakefile @@ -21,7 +21,7 @@ XCOMM .../programs/dtinfo/mmdb//Imakefile #define LibCreate NO #define CplusplusSource YES -DEPEND_DEFINES = $(CXXDEPENDINCLUDES) +DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) DEFINES = -DPORTABLE_DB INCLUDES = -I$(DTMMBDSRC)/object -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) diff --git a/cde/programs/dtinfo/mmdb/oliasdb/Imakefile b/cde/programs/dtinfo/mmdb/oliasdb/Imakefile index 813cd74e..684aeb82 100644 --- a/cde/programs/dtinfo/mmdb/oliasdb/Imakefile +++ b/cde/programs/dtinfo/mmdb/oliasdb/Imakefile @@ -21,7 +21,7 @@ XCOMM .../programs/dtinfo/mmdb//Imakefile #define LibCreate NO #define CplusplusSource YES -DEPEND_DEFINES = $(CXXDEPENDINCLUDES) +DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) #ifdef DtinfoClient DEFINES= -DNO_DB_LOCK -DCDE_NEXT diff --git a/cde/programs/dtinfo/mmdb/schema/Imakefile b/cde/programs/dtinfo/mmdb/schema/Imakefile index f52402fb..1a5b1c04 100644 --- a/cde/programs/dtinfo/mmdb/schema/Imakefile +++ b/cde/programs/dtinfo/mmdb/schema/Imakefile @@ -21,7 +21,7 @@ XCOMM .../programs/dtinfo/mmdb//Imakefile #define LibCreate NO #define CplusplusSource YES -DEPEND_DEFINES = $(CXXDEPENDINCLUDES) +DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) DEFINES = -DPORTABLE_DB INCLUDES = -I$(DTMMDBSRC)/schema -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) -I$(DTMMDBSRC)/misc diff --git a/cde/programs/dtinfo/mmdb/storage/Imakefile b/cde/programs/dtinfo/mmdb/storage/Imakefile index 8b0472f4..9009d4e3 100644 --- a/cde/programs/dtinfo/mmdb/storage/Imakefile +++ b/cde/programs/dtinfo/mmdb/storage/Imakefile @@ -21,7 +21,7 @@ XCOMM .../programs/dtinfo/mmdb//Imakefile #define LibCreate NO #define CplusplusSource YES -DEPEND_DEFINES = $(CXXDEPENDINCLUDES) +DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) DEFINES = -DPORTABLE_DB INCLUDES = -I$(DTMMDBSRC)/storage -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) diff --git a/cde/programs/dtinfo/mmdb/utility/Imakefile b/cde/programs/dtinfo/mmdb/utility/Imakefile index 37c7f27e..8ca138f0 100644 --- a/cde/programs/dtinfo/mmdb/utility/Imakefile +++ b/cde/programs/dtinfo/mmdb/utility/Imakefile @@ -21,7 +21,7 @@ XCOMM .../programs/dtinfo/mmdb//Imakefile #define LibCreate NO #define CplusplusSource YES -DEPEND_DEFINES = $(CXXDEPENDINCLUDES) +DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES) DEFINES = -DPORTABLE_DB INCLUDES = -I$(DTMMDBSRC)/utility -I$(DTMMDBSRC) $(EXCEPTIONS_INCLUDES) -I$(DTMMDBSRC)/misc -- 2.25.1