Changeset 21485 for main/trunk/greenstone2/runtime-src/src/recpt/win32.mak

Timestamp:

2010-01-15T17:32:09+13:00 (14 years ago)

Author:

mdewsnip

Message:

Modifying historydb.cpp so it uses the more general dbclass object instead of being hard-wired to use gdbmclass. However, this class is still set up to use gdbm, provided USE_GDBM is set (which it always is in the main Greenstone). The problem with the history database is it is Greenstone-specific, not collection-specific, so there is no infodbtype option to check to see what database type should be used (a new option will need to be created in the main.cfg file). If USE_GDBM isn't set, the historydb class will do nothing.

File:

• main/trunk/greenstone2/runtime-src/src/recpt/win32.mak (modified) (3 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/win32.mak

@@ -44 +44 @@
 DLLDEBUG = 0
 ENABLE_ACCENTFOLD = 1
+USE_GDBM = 1
 USE_SQLITE = 1
 ENABLE_MG = 1
@@ -73 +74 @@
 !ELSE
 ACCENTFOLD_LIBS = 
+!ENDIF
+
+!IF $(USE_GDBM)
+GDBM_DEFINES = -DUSE_GDBM
+GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows"
+!ELSE
+GDBM_DEFINES = 
+GDBM_INCLUDES = 
 !ENDIF
 
@@ -121 +130 @@
 CC = cl
 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \
-        -DGSDL_NOCACHE $(Z3950_DEFS) $(MG_DEFS) $(MGPP_DEFS)
+        -DGSDL_NOCACHE $(GDBM_DEFINES) $(Z3950_DEFS) $(MG_DEFS) $(MGPP_DEFS)
 INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \
     $(MG_INCLUDES) $(MGPP_INCLUDES) \
     -I"$(COMMON_PACKAGES_DIR)\windows\crypt\crypt" -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat" \
-    -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" \
+    $(GDBM_INCLUDES) \
     $(Z3950_INCLUDES)
 LDFLAGS =