Changeset 21378 for main/trunk

Timestamp:

2009-12-18T15:13:36+13:00 (14 years ago)

Author:

ak19

Message:

The win32.mak of gs2build and greenstone2 are the same, so that they can just be obtained from one source in future.

File:

• main/trunk/gs2build/win32.mak (modified) (5 diffs)

main/trunk/gs2build/win32.mak

@@ -27 +27 @@
 GSDLHOME = $(MAKEDIR)
 GSDL_VC4 = 0
+# It only ever makes sense for GS2 to turn on LOCAL_LIBRARY and APACHE_HTTPD if needed
 LOCAL_LIBRARY = 0
+APACHE_HTTPD = 0
+DEBUG = 0
 DLL = 0
 DLLDEBUG = 0
-USE_SQLITE = 0
+# USE_SQLITE is enabled by default for GS2. Need to turn off explicitly for GS3 in build.xml
+USE_SQLITE = 1
+# It only ever makes sense for GS2 to turn on MSSQL if needed
+USE_MSSQL = 0
 USE_Z3950 = 0
 
@@ -37 +43 @@
 ENABLE_MGPP = 1
 ENABLE_LUCENE = 1
-# jni is disabled by default for GS2, GS3 will set this explicitly
+# jni is disabled by default as this is the default for GS2. GS3 will set this explicitly
 ENABLE_JNI = 0
+
 
 MDEFINES = /f win32.mak
 
 INSTALLDIRS = common-src build-src
-
+!IF EXIST ("runtime-src")
+INSTALLDIRS = $(INSTALLDIRS) runtime-src 
+!ENDIF
 
 MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)"
@@ -49 +58 @@
 !IF $(GSDL_VC4)
 MAKECMD = $(MAKECMD) GSDL_VC4=1
+!ENDIF
+!IF $(LOCAL_LIBRARY)
+MAKECMD = $(MAKECMD) LOCAL_LIBRARY=1
+!ENDIF
+!IF $(APACHE_HTTPD)
+MAKECMD = $(MAKECMD) APACHE_HTTPD=1
+!ENDIF
+!IF $(DEBUG)
+MAKECMD = $(MAKECMD) DEBUG=1
 !ENDIF
 !IF $(DLL)
@@ -60 +78 @@
 !ELSE
 MAKECMD = $(MAKECMD) USE_SQLITE=$(USE_SQLITE)
+!ENDIF
+!IF $(USE_MSSQL)
+MAKECMD = $(MAKECMD) USE_MSSQL=1
+!ENDIF
+!IF $(USE_Z3950)
+MAKECMD = $(MAKECMD) USE_Z3950=1
 !ENDIF
 !IF "$(ENABLE_JNI)" == ""
@@ -95 +119 @@
     $(MAKECLEANCMD)
     cd "$(GSDLHOME)"
+!IF EXIST ("runtime-src")
+    cd runtime-src
+    $(MAKECLEANCMD)
+    cd "$(GSDLHOME)"
+!ENDIF
 
 $(INSTALLDIRS): FORCE