Changeset 22926 for main/trunk/greenstone2/runtime-src

Timestamp:

2010-09-20T10:56:44+12:00 (14 years ago)

Author:

davidb

Message:

Additional syntax added to optionally allow mod_gsdl.so to be compile using the built-in apache that ships with Greenstone

File:

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

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

@@ -40 +40 @@
 LOCAL_LIBRARY = 0
 USE_Z3950 = 0
+USE_GSDL_MOD = 0
 DEBUG = 0
 DLL = 0
@@ -122 +123 @@
 !ENDIF
 
+!IF $(USE_GSDL_MOD)
+APACHE_OBJS = string_pool.obj mod_gsdl.obj
+
+APACHE_INSTDIR=$(GSDL_DIR)\apache-httpd\windows
+APACHE_SRCLIBDIR=..\..\packages\apache-httpd\httpd-2.2.11\srclib
+
+APXS_CFLAGS=-I$(APACHE_INSTDIR)\include \
+  -I$(APACHE_SRCLIBDIR)\apr\include -I$(APACHE_SRCLIBDIR)\apr-util\include
+
+APXS_LINKFLAGS= /libpath:$(APACHE_INSTDIR)\lib \
+  /libpath:$(APACHE_SRCLIBDIR)\apr\include \
+  /libpath:$(APACHE_SRCLIBDIR)\apr-util\include
+
+APXS_LDFLAGS= -L$(APACHE_INSTDIR)\lib \
+  -L$(APACHE_SRCLIBDIR)\apr\include \
+  -L$(APACHE_SRCLIBDIR)\apr-util\include
+
+APXS_LIBS = libaprutil-1.lib libapr-1.lib libhttpd.lib
+
+APACHE_MODULE = mod_gsdl.so
+!ELSE
+APACHE_OBJS =
+APACHE_MODULE =
+!ENDIF
+
+
 !IF $(ENABLE_MG)
 MG_DEFS = -DENABLE_MG
@@ -165 +192 @@
     $(GDBM_INCLUDES) \
     $(Z3950_INCLUDES)
-LDFLAGS = 
+LDFLAGS = -Z7 /errorReport:prompt
 LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\expat\lib\libexpat.lib" \
        $(GDBM_LIBS) $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS)
@@ -310 +337 @@
 # Default target: make gsdlrecpt.lib if LOCAL_LIBRARY is set, otherwise both gsdlrecpt.lib and library.exe
 !IF $(LOCAL_LIBRARY)
-all: $(LIBRARY)
-!ELSE
-all: $(LIBRARY) $(EXECUTABLE)
+all: $(LIBRARY) $(APACHE_MODULE)
+!ELSE
+all: $(LIBRARY) $(EXECUTABLE) $(APACHE_MODULE)
 !ENDIF
 
@@ -321 +348 @@
 library.cgi: $(EXECUTABLE_OBJECTS)
     $(LINK) $(EXECUTABLE_OBJECTS) $(LIBS)
+
+
+mod_gsdl.obj: mod_gsdl.cpp
+    $(CC) -nologo /MD /W3 /D WIN32 /D _WINDOWS /D NDEBUG -c  $(CXXFLAGS) $(DEFS) $(INCLUDES) -D_APACHE_MOD=2 $(APXS_CFLAGS) mod_gsdl.cpp
+##  cl.exe /nologo /MT /W3 /O2 /D WIN32 /D _WINDOWS /D NDEBUG -I"C:\Program Files\xampp\apache\include" -c mod_gsdl.c
+
+mod_gsdl.so: $(APACHE_OBJS) $(LIBRARY)
+    $(CC) /nologo -Fe"mod_gsdl.dll"  $(APACHE_OBJS) gsdlrecpt.lib $(GSDL_LIBS) $(LIBS) $(APXS_LDFLAGS) $(APXS_LIBS)
+
+#   link /nologo /dll  $(APACHE_OBJS) gsdlrecpt.lib $(GSDL_LIBS) $(LIBS) $(APXS_LDFLAGS) $(APXS_LIBS)
+    rename mod_gsdl.dll mod_gsdl.so
+
+##  $(CC) -nologo /dll -Fe"$@" $(APACHE_OBJS) $(LIBRARY) $(GSDL_LIBS) $(LIBS)
+
+
+## link.exe  kernel32.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"C:\Program Files\xampp\apache\lib" libaprutil-1.lib libapr-1.lib libhttpd.lib mod_gsdl.obj
+
+##  rename mod_gsdl.dll mod_gsdl.so
+
+
+# COMPILE = $(CC) -nologo -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
+# LINK = $(CC) -nologo -Fe"$@" $(LDFLAGS)
+
+
+
+
+
 
 osprocess-test.cgi: $(OSPROCESS_OBJECTS) os_process_test.obj