Changeset 15416 for gsdl/trunk/src/colservr

Timestamp:

2008-05-13T14:05:16+12:00 (16 years ago)

Author:

mdewsnip

Message:

(Untangling colservr/recpt) Moved comtypes out of recpt and into colservr, since this defines the types used to communicate with the colservr.

Location:

gsdl/trunk/src/colservr

Files:

• Makefile.in (modified) (3 diffs)
• comtypes.cpp (added)
• comtypes.h (added)
• win32.mak (modified) (3 diffs)

gsdl/trunk/src/colservr/Makefile.in

@@ -156 +156 @@
 MG_MGPP_OBJECTS=collectset.o
 
-HEADERS = search.h querycache.h queryinfo.h collectserver.h collectset.h \
+HEADERS = comtypes.h search.h querycache.h queryinfo.h collectserver.h collectset.h \
           colservrconfig.h maptools.h filter.h source.h browsefilter.h \
           queryfilter.h mggdbmsource.h gdbmsource.h \
@@ -162 +162 @@
       $(MG_HEADERS) $(LC_HEADERS) $(CORBAHEADERS)
 
-SOURCES = search.cpp querycache.cpp queryinfo.cpp collectserver.cpp \
+SOURCES = comtypes.cpp search.cpp querycache.cpp queryinfo.cpp collectserver.cpp \
           colservrconfig.cpp maptools.cpp filter.cpp source.cpp \
           browsefilter.cpp queryfilter.cpp mggdbmsource.cpp gdbmsource.cpp \
@@ -168 +168 @@
       $(MG_SOURCES) $(LC_SOURCES) $(CORBASOURCES)
 
-OBJECTS = search.o querycache.o queryinfo.o collectserver.o \
+OBJECTS = comtypes.o search.o querycache.o queryinfo.o collectserver.o \
           colservrconfig.o maptools.o filter.o source.o browsefilter.o \
           queryfilter.o mggdbmsource.o gdbmsource.o \

gsdl/trunk/src/colservr/win32.mak

@@ -92 +92 @@
 !ENDIF
 
-HEADERS = mgq.h search.h mgsearch.h querycache.h queryinfo.h collectserver.h \
+HEADERS = comtypes.h mgq.h search.h mgsearch.h querycache.h queryinfo.h collectserver.h \
           colservrconfig.h maptools.h filter.h source.h browsefilter.h \
           queryfilter.h mgqueryfilter.h mggdbmsource.h phrasesearch.h \
@@ -99 +99 @@
           expat_resultset.h expat_document.h gdbmsource.h
 
-SOURCES = mgq.c search.cpp mgsearch.cpp querycache.cpp queryinfo.cpp \
+SOURCES = comtypes.cpp mgq.c search.cpp mgsearch.cpp querycache.cpp queryinfo.cpp \
       collectserver.cpp colservrconfig.cpp maptools.cpp filter.cpp \
       source.cpp browsefilter.cpp queryfilter.cpp mgqueryfilter.cpp \
@@ -107 +107 @@
           expat_resultset.cpp expat_document.cpp gdbmsource.cpp
 
-OBJECTS = mgq.obj search.obj mgsearch.obj querycache.obj queryinfo.obj \
+OBJECTS = comtypes.obj mgq.obj search.obj mgsearch.obj querycache.obj queryinfo.obj \
       collectserver.obj colservrconfig.obj maptools.obj filter.obj \
       source.obj browsefilter.obj queryfilter.obj mgqueryfilter.obj \