mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
DtMmdb: prepare for building dtinfoge.
This commit is contained in:
Liang Chang
parent
3697a3696b
commit
ff439cb2f4
38 changed files with 150 additions and 78 deletions
|
|
@ -26,7 +26,7 @@
|
|||
#ifndef _FPExceptions_h
|
||||
#define _FPExceptions_h
|
||||
|
||||
#include "Exceptions.hh"
|
||||
#include "dti_excs/Exceptions.hh"
|
||||
|
||||
/////////////////////////////////////////////////////////
|
||||
//
|
||||
|
|
|
|||
11
cde/programs/dtinfo/DtMmdb/HardCopy/Makefile.am
Normal file
11
cde/programs/dtinfo/DtMmdb/HardCopy/Makefile.am
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
noinst_LTLIBRARIES = libHardCopy.la
|
||||
|
||||
libHardCopy_la_CXXFLAGS = -DEXPAND_TEMPLATES -DCDE_NEXT -I..
|
||||
|
||||
libHardCopy_la_SOURCES = FPset.C \
|
||||
HardCopyFP.C \
|
||||
TemplatesAutoNumber.C \
|
||||
autoNumber.C \
|
||||
autoNumberFP.C
|
||||
|
|
@ -1,28 +1,49 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
SUBDIRS = \
|
||||
api btree \
|
||||
btree_berkeley compression \
|
||||
diskhash dstr \
|
||||
dti_excs dynhash \
|
||||
hmphf index \
|
||||
mgrs misc \
|
||||
object oliasdb \
|
||||
schema storage \
|
||||
SUBDIRS = HardCopy \
|
||||
StyleSheet \
|
||||
api \
|
||||
btree \
|
||||
btree_berkeley \
|
||||
compression \
|
||||
diskhash \
|
||||
dstr \
|
||||
dti_cc \
|
||||
dti_excs \
|
||||
dynhash \
|
||||
hmphf \
|
||||
index \
|
||||
mgrs \
|
||||
misc \
|
||||
object \
|
||||
oliasdb \
|
||||
schema \
|
||||
storage \
|
||||
utility
|
||||
|
||||
lib_LTLIBRARIES = libDtMmdb.la
|
||||
|
||||
libDtMmdb_la_SOURCES =
|
||||
|
||||
libDtMmdb_la_LIBADD = api/libapi.la btree/libbtree.la
|
||||
libDtMmdb_la_LIBADD = HardCopy/libHardCopy.la \
|
||||
StyleSheet/libStyleSheet.la \
|
||||
api/libapi.la \
|
||||
btree/libbtree.la \
|
||||
btree_berkeley/libbtree_berkeley.la \
|
||||
compression/libcompression.la diskhash/libdiskhash.la \
|
||||
dstr/libdstr.la libdti_excs/libdti_excs.la \
|
||||
dynhash/libdynhash.la hmphf/libhmphf.la \
|
||||
index/libindex.la mgrs/libmgrs.la misc/libmisc.la \
|
||||
object/libobject.la oliasdb/liboliasdb.la \
|
||||
schema/libschema.la storage/libstorage.la \
|
||||
compression/libcompression.la \
|
||||
diskhash/libdiskhash.la \
|
||||
dstr/libdstr.la \
|
||||
dti_cc/libdti_cc.la \
|
||||
dti_excs/libdti_excs.la \
|
||||
dynhash/libdynhash.la \
|
||||
hmphf/libhmphf.la \
|
||||
index/libindex.la \
|
||||
mgrs/libmgrs.la \
|
||||
misc/libmisc.la \
|
||||
object/libobject.la \
|
||||
oliasdb/liboliasdb.la \
|
||||
schema/libschema.la \
|
||||
storage/libstorage.la \
|
||||
utility/libutility.la
|
||||
|
||||
libDtMmdb_la_LDFLAGS = -version-info 2:1:0
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
using namespace std;
|
||||
|
||||
#include "SymTab.h"
|
||||
#include "Exceptions.hh"
|
||||
#include "dti_excs/Exceptions.hh"
|
||||
|
||||
class Resolver;
|
||||
class Attribute;
|
||||
|
|
|
|||
31
cde/programs/dtinfo/DtMmdb/StyleSheet/Makefile.am
Normal file
31
cde/programs/dtinfo/DtMmdb/StyleSheet/Makefile.am
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
noinst_LTLIBRARIES = libStyleSheet.la
|
||||
|
||||
libStyleSheet_la_CXXFLAGS = -DEXPAND_TEMPLATES -DCDE_NEXT -I..
|
||||
|
||||
libStyleSheet_la_SOURCES = Attribute.C \
|
||||
AttributeList.C \
|
||||
BitVector.C \
|
||||
DocParser.C \
|
||||
Element.C \
|
||||
Expression.C \
|
||||
Feature.C \
|
||||
FeatureDefDictionary.C \
|
||||
FeatureSet.C \
|
||||
FeatureValue.C \
|
||||
PathQualifier.C \
|
||||
PathTable.C \
|
||||
RendererHCV.C \
|
||||
Resolver.C \
|
||||
ResolverStack.C \
|
||||
SSPath.C \
|
||||
SSTemplates.C \
|
||||
StyleSheet.C \
|
||||
StyleSheetExceptions.C \
|
||||
SymTab.C \
|
||||
VariableTable.C \
|
||||
defParser.C \
|
||||
defToken.C \
|
||||
style.C \
|
||||
tokenStyle.C
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
#define _Renderer_h 1
|
||||
|
||||
#include "Feature.h"
|
||||
#include "Exceptions.hh"
|
||||
#include "dti_excs/Exceptions.hh"
|
||||
|
||||
/* **************************************************************
|
||||
* class Renderer
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ class ResolverStack;
|
|||
|
||||
#include "SSPath.h"
|
||||
#include "ResolverStack.h"
|
||||
#include "Exceptions.hh"
|
||||
#include "dti_excs/Exceptions.hh"
|
||||
|
||||
|
||||
/* **************************************************************
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
#ifndef _StyleSheetExceptions_h
|
||||
#define _StyleSheetExceptions_h
|
||||
|
||||
#include "Exceptions.hh"
|
||||
#include "dti_excs/Exceptions.hh"
|
||||
#include "SymTab.h"
|
||||
|
||||
#define CASTEXCEPT
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
|
||||
noinst_LTLIBRARIES = libapi.la
|
||||
|
||||
libapi_la_CXXFLAGS = -DC_API -I.. -I../misc -I../dti_excs
|
||||
libapi_la_CXXFLAGS = -I..
|
||||
|
||||
libapi_la_SOURCES = base.C info_base.C info_lib.C smart_ptr.C transaction.C \
|
||||
utility.C
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
*/
|
||||
|
||||
|
||||
#include "unique_id.h"
|
||||
#include "misc/unique_id.h"
|
||||
#include "api/info_lib.h"
|
||||
#include "utility/db_version.h"
|
||||
#include "oliasdb/locator_hd.h"
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
|
||||
|
||||
#include "api/utility.h"
|
||||
#include "unique_id.h"
|
||||
#include "misc/unique_id.h"
|
||||
|
||||
typedef char* charPtr;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
|
||||
noinst_LTLIBRARIES = libbtree.la
|
||||
|
||||
libbtree_la_CXXFLAGS = -DC_API -I.. -I../dti_excs
|
||||
libbtree_la_CXXFLAGS = -I..
|
||||
|
||||
libbtree_la_SOURCES = mmdb_btree.C
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
|
||||
noinst_LTLIBRARIES = libcompression.la
|
||||
|
||||
libcompression_la_CXXFLAGS = -DC_API -I.. -I../dti_excs
|
||||
libcompression_la_CXXFLAGS = -I..
|
||||
|
||||
libcompression_la_SOURCES = abs_agent.C zip.C huffman.C trie.C code.C lzss.C \
|
||||
sgml.C ps.C
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
|
||||
noinst_LTLIBRARIES = libdiskhash.la
|
||||
|
||||
libdiskhash_la_CXXFLAGS = -DC_API -I.. -I../dti_excs
|
||||
libdiskhash_la_CXXFLAGS = -I..
|
||||
|
||||
libdiskhash_la_SOURCES = disk_bucket.C bucket_array.C disk_hash.C
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
|
||||
noinst_LTLIBRARIES = libdstr.la
|
||||
|
||||
libdstr_la_CXXFLAGS = -DC_API -I.. -I../dti_excs
|
||||
libdstr_la_CXXFLAGS = -I..
|
||||
|
||||
libdstr_la_SOURCES = set.C bset.C slist.C dlist_cell.C dlist.C heap.C \
|
||||
void_ptr_array.C void_ptr_stack.C memory_pool.C \
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
#ifndef __CC_Dlist_cc
|
||||
#define __CC_Dlist_cc
|
||||
|
||||
#include "Exceptions.hh"
|
||||
#include "dti_excs/Exceptions.hh"
|
||||
#include "cc_exceptions.h"
|
||||
#include "CC_Dlist.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
* Campbell, CA 95008
|
||||
*
|
||||
*/
|
||||
#include "Exceptions.hh"
|
||||
#include "dti_excs/Exceptions.hh"
|
||||
#include "cc_exceptions.h"
|
||||
#include "CC_Listbase.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
#ifndef _Stack_hh
|
||||
#define _Stack_hh
|
||||
|
||||
#include "Exceptions.hh"
|
||||
#include "dti_excs/Exceptions.hh"
|
||||
#include "CC_Slist.h"
|
||||
|
||||
template <class T> class Stack: public Destructable
|
||||
|
|
|
|||
19
cde/programs/dtinfo/DtMmdb/dti_cc/Makefile.am
Normal file
19
cde/programs/dtinfo/DtMmdb/dti_cc/Makefile.am
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
noinst_LTLIBRARIES = libdti_cc.la
|
||||
|
||||
libdti_cc_la_CXXFLAGS = -I..
|
||||
|
||||
libdti_cc_la_SOURCES = CC_Dlist.C \
|
||||
CC_Listbase.C \
|
||||
CC_Slist.C \
|
||||
CC_Stack.C \
|
||||
CC_String.C \
|
||||
CC_Tokenizer.C \
|
||||
cc_exceptions.C \
|
||||
cc_hdict.C \
|
||||
cc_povec.C \
|
||||
cc_pvect.C \
|
||||
cc_vvect.C \
|
||||
hdictinit.C \
|
||||
vectinit.C
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
#include <fstream>
|
||||
#include <iostream>
|
||||
using namespace std;
|
||||
#include "Exceptions.hh"
|
||||
#include "dti_excs/Exceptions.hh"
|
||||
|
||||
#define END_TRY end_try
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
// $TOG: cc_hdict.C /main/5 1998/04/17 11:45:00 mgreess $
|
||||
|
||||
#include "dti_cc/cc_exceptions.h"
|
||||
#include "dti_cc/cc_hdict.h"
|
||||
|
||||
template <class K, class V> CC_Boolean kv_pair<K, V>::f_needRemove = FALSE;
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,9 @@
|
|||
*/
|
||||
// $XConsortium: cc_povec.cc /main/3 1996/06/11 16:56:44 cde-hal $
|
||||
|
||||
#include "dti_cc/cc_povec.h"
|
||||
#include "dti_cc/cc_pvect.h"
|
||||
|
||||
template <class T>
|
||||
dlist_array<T>::dlist_array(const dlist_array<T>& da)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
// $TOG: cc_pvect.C /main/6 1998/04/17 11:45:20 mgreess $
|
||||
|
||||
#include "dti_cc/cc_exceptions.h"
|
||||
#include "dti_cc/cc_pvect.h"
|
||||
|
||||
template <class T>
|
||||
pointer_vector<T>::pointer_vector(const pointer_vector<T>& pv) :
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
// $XConsortium: cc_vvect.C /main/4 1996/08/21 15:49:18 drk $
|
||||
|
||||
#include "dti_cc/cc_exceptions.h"
|
||||
#include "dti_cc/cc_vvect.h"
|
||||
|
||||
template <class T>
|
||||
value_vector<T>::value_vector(const value_vector<T>& vv) :
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
|
||||
noinst_LTLIBRARIES = libdti_excs.la
|
||||
|
||||
libdti_excs_la_CXXFLAGS = -DC_API -DCC_VERSION=30 -DCHECK_INITIALIZED
|
||||
libdti_excs_la_CXXFLAGS = -DNATIVE_EXCEPTIONS
|
||||
|
||||
if SOLARIS
|
||||
libdti_excs_la_CXXFLAGS += -DHAS_TERMINATE
|
||||
endif
|
||||
|
||||
libdti_excs_la_SOURCES = Jump_Environment.C Exceptions.C Exception.C \
|
||||
Destructable.C terminate.C init.C
|
||||
Destructable.C terminate.C
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
|
||||
noinst_LTLIBRARIES = libdynhash.la
|
||||
|
||||
libdynhash_la_CXXFLAGS = -DC_API -I.. -I../dti_excs
|
||||
libdynhash_la_CXXFLAGS = -I..
|
||||
|
||||
libdynhash_la_SOURCES = data_t.C imp_bucket.C imp_die.C
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
|
||||
noinst_LTLIBRARIES = libhmphf.la
|
||||
|
||||
libhmphf_la_CXXFLAGS = -DC_API -DPORTABLE_DB -I.. -I../dti_excs
|
||||
libhmphf_la_CXXFLAGS = -DPORTABLE_DB -I..
|
||||
|
||||
libhmphf_la_SOURCES = buckets.C mphf_funcs.C mphf_hash_table.C \
|
||||
params.C pattern.C sorter.C
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
|
||||
noinst_LTLIBRARIES = libindex.la
|
||||
|
||||
libindex_la_CXXFLAGS = -DC_API -DPORTABLE_DB -I.. -I../dti_excs
|
||||
libindex_la_CXXFLAGS = -DPORTABLE_DB -I..
|
||||
|
||||
libindex_la_SOURCES = btree_index.C dyn_disk_index.C dyn_index.C \
|
||||
dyn_memory_index.C fast_mphf.C hash.C index.C \
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
|
||||
noinst_LTLIBRARIES = libmgrs.la
|
||||
|
||||
libmgrs_la_CXXFLAGS = -DC_API -DCOMPACTED_DISK_REP -DPORTABLE_DB -I.. \
|
||||
-I../dti_excs
|
||||
libmgrs_la_CXXFLAGS = -DCOMPACTED_DISK_REP -DPORTABLE_DB -I..
|
||||
|
||||
libmgrs_la_SOURCES = managers.C misc.C query_mgr.C template_mgr.C
|
||||
|
|
|
|||
|
|
@ -2,6 +2,4 @@ MAINTAINERCLEANFILES= Makefile.in
|
|||
|
||||
noinst_LTLIBRARIES = libmisc.la
|
||||
|
||||
libmisc_la_CFLAGS = -DPORTABLE_DB
|
||||
|
||||
libmisc_la_SOURCES = unique_id.c
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
|
||||
noinst_LTLIBRARIES = libobject.la
|
||||
|
||||
libobject_la_CXXFLAGS = -DC_API -DPORTABLE_DB -I.. -I../dti_excs
|
||||
libobject_la_CXXFLAGS = -DPORTABLE_DB -I..
|
||||
|
||||
libobject_la_SOURCES = composite.C compressed_pstring.C cset.C \
|
||||
dl_list.C dl_list_cell.C handler.C \
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
#ifndef _new_delete_h
|
||||
#define _new_delete_h 1
|
||||
|
||||
#include "new_delete_simple.h"
|
||||
#include "dti_excs/new_delete_simple.h"
|
||||
|
||||
#ifdef C_API
|
||||
#include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -6,29 +6,19 @@ infolib_DATA = mmdb.infolib.spec
|
|||
|
||||
noinst_LTLIBRARIES = liboliasdb.la
|
||||
|
||||
liboliasdb_la_CXXFLAGS = -DC_API -DNO_DB_LOCK -DCDE_NEXT -I.. -I../misc \
|
||||
-I../dti_excs -I../dti_cc -I../..
|
||||
liboliasdb_la_CXXFLAGS = -DNO_DB_LOCK -I..
|
||||
|
||||
liboliasdb_la_SOURCES = asciiIn_filters.C collectionIterator.C \
|
||||
dlp_hd.C dlp_test.C \
|
||||
doc_hd.C doc_test.C \
|
||||
graphic_hd.C graphic_test.C \
|
||||
loc_test.C locator_hd.C \
|
||||
mark.C mark_base.C \
|
||||
mark_test.C mmdb.C \
|
||||
node_hd.C node_test.C \
|
||||
olias_funcs.C olias_test.C \
|
||||
stylesheet_hd.C stylesheet_test.C \
|
||||
toc_hd.C toc_test.C \
|
||||
user_base.C c_api_book.C \
|
||||
c_api_book_test.C \
|
||||
c_api_bookcase.C c_api_bookcase_test.C \
|
||||
c_api_common.C \
|
||||
c_api_dlp.C c_api_dlp_test.C \
|
||||
c_api_graphic.C c_api_graphic_test.C \
|
||||
c_api_infolib.C c_api_infolib_test.C \
|
||||
c_api_locator.C c_api_locator_test.C \
|
||||
c_api_pure_virtual.C \
|
||||
c_api_section.C c_api_section_test.C \
|
||||
c_api_stylesheet.C c_api_stylesheet_test.C \
|
||||
c_api_toc.C c_api_toc_test.C
|
||||
liboliasdb_la_SOURCES = asciiIn_filters.C \
|
||||
collectionIterator.C \
|
||||
dlp_hd.C \
|
||||
doc_hd.C \
|
||||
graphic_hd.C \
|
||||
locator_hd.C \
|
||||
mark.C \
|
||||
mark_base.C \
|
||||
mmdb.C \
|
||||
node_hd.C \
|
||||
olias_funcs.C \
|
||||
stylesheet_hd.C \
|
||||
toc_hd.C \
|
||||
user_base.C
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
|
||||
noinst_LTLIBRARIES = libschema.la
|
||||
|
||||
libschema_la_CXXFLAGS = -DC_API -DPORTABLE_DB -I.. -I../dti_excs -I../misc
|
||||
libschema_la_CXXFLAGS = -I..
|
||||
|
||||
libschema_la_SOURCES = desc.C store_desc.C object_dict.C stored_object_desc.C \
|
||||
index_desc.C inv_desc.C agent_desc.C container_desc.C \
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
|
||||
noinst_LTLIBRARIES = libstorage.la
|
||||
|
||||
libstorage_la_CXXFLAGS = -DC_API -DPORTABLE_DB -I.. -I../dti_excs
|
||||
libstorage_la_CXXFLAGS = -DPORTABLE_DB -I..
|
||||
|
||||
libstorage_la_SOURCES = abs_storage.C chunks_index.C heap_comp_funcs.C \
|
||||
lru.C page.C page_cache.C \
|
||||
|
|
|
|||
|
|
@ -2,12 +2,10 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
|
||||
noinst_LTLIBRARIES = libutility.la
|
||||
|
||||
libutility_la_CXXFLAGS = -DC_API -DPORTABLE_DB -I.. -I../dti_excs -I../misc
|
||||
libutility_la_CXXFLAGS = -DPORTABLE_DB -I..
|
||||
|
||||
libutility_la_SOURCES = funcs.C ostring.C pm_random.C \
|
||||
atoi_pearson.C xtime.C buffer.C \
|
||||
atoi_larson.C atomic_lock.C rw_lock.C \
|
||||
atoi_fast.C filter.C mmdb_exception.C \
|
||||
randomize.C streambuf.C charbuf.C \
|
||||
filebuf.C string.C stringstream.C \
|
||||
iostream.C fstream.C stream.C ios.C
|
||||
randomize.C
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
|
||||
|
||||
#include "utility/funcs.h"
|
||||
#include "unique_id.h"
|
||||
#include "misc/unique_id.h"
|
||||
|
||||
#define X_INCLUDE_TIME_H
|
||||
#define XOS_USE_XT_LOCKING
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
#ifndef _mmdb_exception_h
|
||||
#define _mmdb_exception_h 1
|
||||
|
||||
#include "Exceptions.hh"
|
||||
#include "dti_excs/Exceptions.hh"
|
||||
|
||||
#ifdef C_API
|
||||
#include "utility/c_fstream.h"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue