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

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/w32server

Files:

• cgiwrapper.cpp (modified) (3 diffs)
• win32.mak (modified) (3 diffs)

main/trunk/greenstone2/runtime-src/src/w32server/cgiwrapper.cpp

@@ -69 +69 @@
 #include "extlinkaction.h"
 #include "collectoraction.h"
+#ifdef ENABLE_MGPP
 #include "phindaction.h"
+#endif
 #include "configaction.h"
 
@@ -350 +352 @@
 collectoraction *acollectoraction = NULL;
 authenaction *aauthenaction = NULL;
+#ifdef ENABLE_MGPP
 phindaction *aphindaction = NULL;
+#endif
 configaction *aconfigaction = NULL;
 vlistbrowserclass *avlistbrowserclass = NULL;
@@ -584 +588 @@
   }
 
+#ifdef ENABLE_MGPP
   if (aphindaction == NULL) {
     aphindaction = new phindaction();
     recpt.add_action (aphindaction);
   }
+#endif
   
   if (aconfigaction == NULL) {

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

@@ -41 +41 @@
 ENABLE_ACCENTFOLD = 1
 USE_SQLITE = 1
+ENABLE_MG = 1
+ENABLE_MGPP = 1
+ENABLE_LUCENE = 1
 
 !IF $(DEBUG)
@@ -63 +66 @@
 !ENDIF
 
-!IF $(USE_SQLITE)
+!IF "$(USE_SQLITE)" == "0"
+SQLITE_LIBS = 
+!ELSE
 SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
-!ELSE
-SQLITE_LIBS = 
-!ENDIF
-
+!ENDIF
+
+!IF "$(ENABLE_MG)" == "0"
+MG_LIBS =
+MG_INCLUDES =
+!ELSE
+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" -I"$(INDEXERS_DIR)\mg\src\text"
+!ENDIF
+
+!IF "$(ENABLE_MGPP)" == "0"
+MGPP_DEFS =
+MGPP_LIBS =
+MGPP_INCLUDES =
+!ELSE
+MGPP_DEFS = -DENABLE_MGPP
+MGPP_LIBS = "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \
+    "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib"
+MGPP_INCLUDES = -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text"
+!ENDIF
 
 AR = lib
 CC = cl
-DEFS = -D__WIN32__ -DHAVE_CONFIG_H -D_LITTLE_ENDIAN -DPARADOCNUM -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE
+DEFS = -D__WIN32__ -DHAVE_CONFIG_H -D_LITTLE_ENDIAN -DPARADOCNUM -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE $(MGPP_DEFS)
 INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \
-    -I"$(COLSERVR_DIR)" -I"$(INDEXERS_DIR)\mg" \
     -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" \
-        -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" \
-        -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text"
+    -I"$(COLSERVR_DIR)" \
+    $(MG_INCLUDES) \
+        $(MGPP_INCLUDES)
 
 LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \
@@ -141 +163 @@
     "$(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"