Changeset 21324 for main/trunk/greenstone2/runtime-src/src/recpt

Timestamp:

2009-12-09T21:41:14+13:00 (14 years ago)

Author:

ak19

Message:

Changes to makefiles, configure files, and source code to work with the new configure flags that allow indexers to be individually compiled up by setting each indexer to be enabled or disabled (enable-mg, enable-mgpp, enable-lucene)

Location:

main/trunk/greenstone2/runtime-src/src/recpt

Files:

• Makefile.in (modified) (5 diffs)
• gsdl_modules_cfg.h (modified) (1 diff)
• librarymain.cpp (modified) (1 diff)
• mod_gsdl.cpp (modified) (3 diffs)
• win32.mak (modified) (6 diffs)
• wizardaction.cpp (modified) (1 diff)

main/trunk/greenstone2/runtime-src/src/recpt/Makefile.in

@@ -44 +44 @@
 else
 ACCENTFOLD_LIBS = 
+endif
+
+ENABLE_MG = @ENABLE_MG@
+ifeq ($(ENABLE_MG), 1)
+MG_INDEXERS_LIBS = $(INDEXERS_DIR)/mg/src/text/libmgtext.a \
+    $(INDEXERS_DIR)/mg/lib/libmglib.a
+MG_INCLUDES = -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib
+else
+MG_INDEXERS_LIBS =
+MG_INCLUDES =
+endif
+
+ENABLE_MGPP = @ENABLE_MGPP@
+ifeq ($(ENABLE_MGPP), 1)
+MGPP_SOURCES = phindaction.cpp
+MGPP_OBJECTS = phindaction.o
+MGPP_INDEXERS_LIBS = $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
+    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a
+MGPP_INCLUDES = -I$(INDEXERS_DIR)/mgpp/text -I$(INDEXERS_DIR)/mgpp/lib
+else
+MGPP_SOURCES =
+MGPP_OBJECTS =
+MGPP_INDEXERS_LIBS =
+MGPP_INCLUDES =
 endif
 
@@ -104 +128 @@
 INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COMMON_PACKAGES_DIR)/gdbm/include \
         -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \
-    -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mgpp/text \
+    $(MG_INCLUDES) $(MGPP_INCLUDES) \
         -I$(COMMON_PACKAGES_DIR)/expat/include $(FASTCGI_INCLUDES) $(Z3950_INCLUDES)
 INSTALL = @INSTALL@
@@ -149 +173 @@
     pageaction.cpp \
     pagedbrowserclass.cpp \
-    phindaction.cpp \
+    $(MGPP_SOURCES) \
     phindbrowserclass.cpp \
     pingaction.cpp \
@@ -194 +218 @@
     pageaction.o \
     pagedbrowserclass.o \
-    phindaction.o \
+    $(MGPP_OBJECTS) \
     phindbrowserclass.o \
     pingaction.o \
@@ -213 +237 @@
     $(PROTOCOL_DIR)/gsdlprotocol.a \
     $(COLSERVR_DIR)/gsdlcolservr.a \
-    $(INDEXERS_DIR)/mg/src/text/libmgtext.a \
-    $(INDEXERS_DIR)/mg/lib/libmglib.a \
-    $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \
-    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a \
+    $(MG_INDEXERS_LIBS) \
+    $(MGPP_INDEXERS_LIBS) \
     $(COMMON_DIR)/src/lib/gsdllib.a
 

main/trunk/greenstone2/runtime-src/src/recpt/gsdl_modules_cfg.h

@@ -56 +56 @@
 #define GSDL_USE_EXTLINK_ACTION
 #undef  GSDL_USE_GTI_ACTION
+
+#ifdef ENABLE_MGPP
 #define GSDL_USE_PHIND_ACTION
+#endif
+
 #define GSDL_USE_PING_ACTION
 #define GSDL_USE_STATUS_ACTION

main/trunk/greenstone2/runtime-src/src/recpt/librarymain.cpp

@@ -44 +44 @@
 #include "extlinkaction.h"
 #include "pageaction.h"
+#ifdef ENABLE_MGPP
 #include "phindaction.h"
+#endif
 #include "pingaction.h"
 #include "queryaction.h"

main/trunk/greenstone2/runtime-src/src/recpt/mod_gsdl.cpp

@@ -69 +69 @@
 #include "filter.h"
 #include "browsefilter.h"
-#include "mgqueryfilter.h"
+
+//#ifdef ENABLE_MG
+//#include "mgqueryfilter.h"
+//#include "mgsearch.h"
+//#endif
+
 #include "infodbclass.h"
-#include "mgsource.h"
-#include "mgsearch.h"
 #include "collectset.h"
 
@@ -82 +85 @@
 #include "documentaction.h"
 #include "extlinkaction.h"
+#ifdef ENABLE_MGPP
 #include "phindaction.h"
+#endif
 #if defined(USE_MYSQL) || defined(USE_ACCESS)
 #include "orderaction.h"
@@ -266 +271 @@
   recpt.add_action(anextlinkaction);
 
+  // phindaction is for MGPP and uses MGQuery
+#ifdef ENABLE_MGPP
   phindaction *aphindaction = new phindaction();
   recpt.add_action(aphindaction);
+#endif
 
 #if defined(USE_MYSQL) || defined(USE_ACCESS)

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

@@ -45 +45 @@
 ENABLE_ACCENTFOLD = 1
 USE_SQLITE = 1
+ENABLE_MG = 1
+ENABLE_MGPP = 1
+ENABLE_LUCENE = 1
 
 !IF $(DEBUG)
@@ -72 +75 @@
 !ENDIF
 
-!IF $(USE_SQLITE)
+!IF "$(USE_SQLITE)" == "0"
+SQLITE_LIBS = 
+!ELSE
 SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
-!ELSE
-SQLITE_LIBS = 
 !ENDIF
 
@@ -88 +91 @@
 !ENDIF
 
+!IF "$(ENABLE_MG)" == "0"
+MG_DEFS =
+MG_LIBS =
+MG_INCLUDES =
+!ELSE
+MG_DEFS = -DENABLE_MG
+MG_LIBS = "$(INDEXERS_DIR)\mg\src\text\libmgtext.lib" \
+    "$(INDEXERS_DIR)\mg\lib\libmglib.lib"
+MG_INCLUDES = -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" 
+!ENDIF
+
+!IF "$(ENABLE_MGPP)" == "0"
+MGPP_DEFS =
+MGPP_SOURCES = 
+MGPP_OBJECTS = 
+MGPP_LIBS =
+MGPP_INCLUDES =
+!ELSE
+MGPP_DEFS = -DENABLE_MGPP
+MGPP_SOURCES = phindaction.cpp
+MGPP_OBJECTS = phindaction.obj
+MGPP_LIBS = "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \
+    "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib"
+MGPP_INCLUDES = -I"$(INDEXERS_DIR)\mgpp\text"
+!ENDIF
 
 AR = lib
 CC = cl
 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \
-        -DGSDL_NOCACHE $(Z3950_DEFS)
+        -DGSDL_NOCACHE $(Z3950_DEFS) $(MG_DEFS) $(MGPP_DEFS)
 INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \
-    -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mgpp\text" \
+    $(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" \
@@ -152 +180 @@
     pageaction.cpp \
     pagedbrowserclass.cpp \
-    phindaction.cpp \
+    $(MGPP_SOURCES) \
     phindbrowserclass.cpp \
     pingaction.cpp \
@@ -197 +225 @@
     pageaction.obj \
     pagedbrowserclass.obj \
-    phindaction.obj \
+    $(MGPP_OBJECTS) \
     phindbrowserclass.obj \
     pingaction.obj \
@@ -216 +244 @@
     "$(PROTOCOL_DIR)\gsdlprotocol.lib" \
     "$(COLSERVR_DIR)\gsdlcolservr.lib" \
-    "$(INDEXERS_DIR)\mg\src\text\libmgtext.lib" \
-    "$(INDEXERS_DIR)\mg\lib\libmglib.lib" \
-    "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \
-    "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib" \
+    $(MG_LIBS) \
+    $(MGPP_LIBS) \
     "$(COMMON_DIR)\src\lib\gsdllib.lib"
 

main/trunk/greenstone2/runtime-src/src/recpt/wizardaction.cpp

@@ -555 +555 @@
   text_t indextype = args[macro_prefix+"buildtype"];
   if(indextype == "") {
+#ifdef ENABLE_MG
     indextype = "mg";
+#else
+    cerr << "Unable to choose mg as the default indextype, since the Greenstone installation was not compiled with MG enabled." << endl;
+#endif
   }
   options += " -indextype \"" + indextype + "\"";