dtinfo subtree dtinfogen

cde/programs/dtinfo/dtinfogen/mmdb/Imakefile

@@ -5,6 +5,17 @@ XCOMM $TOG: Imakefile /main/7 1998/08/10 15:55:12 mgreess $
 
 SUBDIRS=src StyleSheet
 
+XCOMM redefine TopLevelProject to build DtInfo with standard CDE config dir
+#undef  TopLevelProject
+#define TopLevelProject		DtInfo
+IMAKE_DEFINES = -DTopLevelProject=TopLevelProject \
+		-DProjectTmplFile='<DtInfo.tmpl>' \
+		-DProjectRulesFile='<DtInfo.rules>'
+
+XCOMM Variables to switch on debug mode temporarily
+XCOMM CDEBUGFLAGS = -g -DDEBUG
+XCOMM CXXDEBUGFLAGS = -g -DDEBUG
+
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
 NamedTargetSubdirs(install_buildtools,$(SUBDIRS),\

cde/programs/dtinfo/dtinfogen/mmdb/StyleSheet/Imakefile

@@ -1,6 +1,8 @@
 XCOMM $TOG: Imakefile /main/14 1997/09/05 11:32:36 samborn $
 
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
+
+NormalCplusplusObjectRule()
 
 INCLUDES=$(EXCEPTIONS_INCLUDES) $(COMMON_CLASS_INCLUDES)
 

cde/programs/dtinfo/dtinfogen/mmdb/StyleSheet/validator.C

@@ -33,7 +33,8 @@
 #include "StyleSheet/FeatureDefDictionary.h"
 #include "StyleSheet/RendererHCV.h"
 #include "HardCopy/autoNumberFP.h"
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 #include <stdarg.h>
 
      
@@ -89,7 +90,7 @@ main(int argc, char** argv )
         quit(1);
   }
 
-  try {
+  mtry {
 
      if ( strcasecmp(argv[1], "hardcopy") == 0 )
         gRenderer = new RendererHCV();
@@ -133,14 +134,14 @@ main(int argc, char** argv )
      *defStream >> *g_FeatureDefDictionary;
 //cerr << *g_FeatureDefDictionary;
   }
-  catch_any()
+  mcatch_any()
   {
       cerr << "\nfeature definition has error.\n";
       quit(1);
   }
   end_try;
 
-  try {
+  mtry {
 
      fstream* styleStream = new fstream(argv[2], ios::in);
      if ( !(*styleStream) ) {
@@ -166,7 +167,7 @@ main(int argc, char** argv )
 
   }
 
-  catch_any()
+  mcatch_any()
   {
       report_error_location(); 
       quit(1);

cde/programs/dtinfo/dtinfogen/mmdb/src/Imakefile

@@ -1,6 +1,6 @@
 XCOMM $TOG: Imakefile /main/11 1997/12/31 09:07:38 bill $
 
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 
 NormalLibraryObjectRule()
 
@@ -181,16 +181,22 @@ ALL_MMDB_OBJS =	$(API_OBJS)		$(BTREE_OBJS) \
 
 #ifdef AIXArchitecture
 Libs = $(ALL_MMDB_OBJS) $(MATH_LIB) $(DTSVCLIB) $(TTLIB) $(XLIB)
+#elif defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
+Libs=$(MMDB_LIBS) $(MATH_LIB) $(DTSVCLIB) $(MTF_LIBRARIES) $(TTLIB) $(XLIB)
 #else
 Libs = $(MMDB_LIBS) $(MATH_LIB) $(DTSVCLIB) $(TTLIB) $(XLIB)
 #endif
 
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
+Libs_C_API = $(MMDB_LIBS_C_API) $(DTSVCLIB) $(MTF_LIBRARIES) $(TTLIB) $(XLIB) $(MATH_LIB)
+#else
 Libs_C_API = $(MMDB_LIBS_C_API) $(DTSVCLIB) $(TTLIB) $(XLIB) $(MATH_LIB)
+#endif
 
 SimpleCPlusPlusProgram(dbdrv,main.o,$(Libs))
 SimpleCPlusPlusProgram(restore,restore.o,$(Libs))
 
-#ifdef USLArchitecture
+#if defined(USLArchitecture) || defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
 SimpleCPlusPlusProgram(dbdrv_c_api,main_c_api.o,$(Libs_C_API))
 #else
 SimpleCProgram(dbdrv_c_api,main_c_api.o,$(Libs_C_API))

cde/programs/dtinfo/dtinfogen/mmdb/src/main.C

@@ -70,7 +70,7 @@ int select_and_process( int argc, char** argv )
    } else {
       if ( strcmp(argv[1], "define") == 0 ) {
 
-         infolib_ptr = mmdb.openInfoLib();  
+         infolib_ptr = mmdb.openInfoLib(getenv("MMDB_PATH"));
 
          if ( infolib_ptr == 0 ||
               infolib_ptr->define_info_base(argv[3],argv[4],argv[2]) == false
@@ -149,12 +149,12 @@ main( int argc, char** argv )
 
    int ok;
 
-   try 
+   mtry
    {
       ok = select_and_process( argc, argv );
    } 
 
-   catch (mmdbException &,e)
+   mcatch (mmdbException &,e)
    {
       cerr << "Exception msg: " << e << "\n";
 #ifdef DEBUG

cde/programs/dtinfo/dtinfogen/mmdb/src/main_c_api.c

@@ -24,6 +24,7 @@
 
 #include "oliasdb/Mmdb.h"
 #include <stdio.h>
+#include <stdlib.h>
 
 
 usage(int argc, char** argv)

cde/programs/dtinfo/dtinfogen/mmdb/src/restore.C

@@ -31,8 +31,9 @@
  * (c) Copyright 1996 Hitachi.
  */
 
-#include <fstream.h>
-#include <strstream.h>
+#include <fstream>
+#include <sstream>
+using namespace std;
 
 #include "utility/const.h"
 #include "utility/randomize.h"
@@ -49,7 +50,7 @@ main(int argc, char** argv)
 
   fstr.getline(schema_header, 1024);
 
-  int sz = bytes(fstr) - strlen(schema_header) - 1;
+  int sz = bytes(*(argv+1)) - strlen(schema_header) - 1;
 
   char* buf = new char[sz];