Changeset 21472 for main/trunk/greenstone2/runtime-src/src
- Timestamp:
- 2010-01-15T15:16:03+13:00 (14 years ago)
- Location:
- main/trunk/greenstone2/runtime-src/src/colservr
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/runtime-src/src/colservr/Makefile.in
r21324 r21472 81 81 82 82 83 # Currently not configurable, and always on 84 USE_GDBM = 1 85 ifeq ($(USE_GDBM), 1) 86 GDBM_DEFINES = -DUSE_GDBM 87 GDBM_INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include 88 else 89 GDBM_DEFINES = 90 GDBM_INCLUDES = 91 endif 92 93 94 # Currently not configurable, and always on 95 USE_JDBM = 1 96 ifeq ($(USE_JDBM), 1) 97 JDBM_DEFINES = -DUSE_JDBM 98 else 99 JDBM_DEFINES = 100 endif 101 102 83 103 USE_SQLITE = @USE_SQLITE@ 84 104 ifeq ($(USE_SQLITE), 1) … … 96 116 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ 97 117 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ 98 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER $( SQLITE_DEFINES)118 DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 99 119 # Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist! 100 INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COMMON_PACKAGES_DIR)/gdbm/include\120 INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib \ 101 121 $(MG_INCLUDES) \ 102 122 $(MGPP_INCLUDES) \ 103 -I$(COMMON_PACKAGES_DIR)/expat/include $( SQLITE_INCLUDES)123 -I$(COMMON_PACKAGES_DIR)/expat/include $(GDBM_INCLUDES) $(SQLITE_INCLUDES) 104 124 RANLIB = @RANLIB@ 105 125 -
main/trunk/greenstone2/runtime-src/src/colservr/collectset.cpp
r21453 r21472 29 29 #include "colservrconfig.h" 30 30 #include "gsdlsitecfg.h" 31 #include "gdbmclass.h"32 #include "jdbmnaiveclass.h"33 31 #include "gsdltools.h" 34 32 #include "fileutil.h" … … 52 50 53 51 #include <assert.h> 52 53 #ifdef USE_GDBM 54 #include "gdbmclass.h" 55 #endif 56 57 #ifdef USE_JDBM 58 #include "jdbmnaiveclass.h" 59 #endif 54 60 55 61 #ifdef USE_SQLITE … … 355 361 #endif 356 362 363 #ifdef USE_JDBM 357 364 if (infodbtype == "jdbm") { 358 365 … … 360 367 db_ptr = jdbm_db_ptr; 361 368 } 362 369 #endif 370 363 371 // Use GDBM if the infodb type is empty or not one of the values above 364 372 if (db_ptr == NULL) { 373 #ifdef USE_GDBM 365 374 db_ptr = new gdbmclass(); 375 #endif 366 376 } 367 377 -
main/trunk/greenstone2/runtime-src/src/colservr/win32.mak
r21435 r21472 37 37 DLL = 0 38 38 DLLDEBUG = 0 39 USE_GDBM = 1 40 USE_JDBM = 1 39 41 USE_SQLITE = 1 40 42 USE_MSSQL = 0 … … 62 64 CXXFLAGS = $(CXXFLAGS) -MDd 63 65 !ENDIF 66 !ENDIF 67 68 !IF $(USE_GDBM) 69 GDBM_DEFINES = -DUSE_GDBM 70 GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" 71 !ELSE 72 GDBM_DEFINES = 73 GDBM_INCLUDES = 74 !ENDIF 75 76 !IF $(USE_JDBM) 77 JDBM_DEFINES = -DUSE_JDBM 78 !ELSE 79 JDBM_DEFINES = 64 80 !ENDIF 65 81 … … 124 140 CC = cl 125 141 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 126 -DXML_STATIC $(SQLITE_DEFINES) $(MSSQL_DEFINES) $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 142 -DXML_STATIC $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \ 143 $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 127 144 # Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist! 128 145 INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" \ 129 146 $(MG_INCLUDES) \ 130 147 $(MGPP_INCLUDES) \ 131 -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" \ 132 -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat" $(SQLITE_INCLUDES) 148 -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat" $(GDBM_INCLUDES) $(SQLITE_INCLUDES) 133 149 134 150 !IF $(GSDL_VC4)
Note:
See TracChangeset
for help on using the changeset viewer.