Changeset 21435 for main/trunk/greenstone2
- Timestamp:
- 2010-01-07T14:23:27+13:00 (14 years ago)
- Location:
- main/trunk/greenstone2
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/common-src/src/lib/win32.mak
r21325 r21435 68 68 !ENDIF 69 69 70 !IF "$(USE_SQLITE)" == "0" 70 !IF $(USE_SQLITE) 71 SQLITE_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\sqlite\include" 72 SQLITE_OBJECTS = sqlitedbclass.obj 73 SQLITE_SOURCES = sqlitedbclass.cpp 74 !ELSE 71 75 SQLITE_INCLUDES = 72 76 SQLITE_OBJECTS = 73 77 SQLITE_SOURCES = 74 !ELSE75 SQLITE_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\sqlite\include"76 SQLITE_OBJECTS = sqlitedbclass.obj77 SQLITE_SOURCES = sqlitedbclass.cpp78 78 !ENDIF 79 79 -
main/trunk/greenstone2/common-src/win32.mak
r21365 r21435 37 37 USE_SQLITE = 1 38 38 USE_MSSQL = 0 39 # by default, all indexers are enabled 40 ENABLE_MG = 1 41 ENABLE_MGPP = 1 42 ENABLE_LUCENE = 1 43 # jni is disabled by default as this is the default for GS2. GS3 will set this explicitly 44 ENABLE_JNI = 0 39 45 40 46 MDEFINES = /f win32.mak … … 55 61 SQLITE_DIR = packages\sqlite\sqlite-amalgamation-3.5.9 56 62 57 # indexers requires the ENABLE_indexer flags to be either 1 or 0,58 # so we ensure this is the case here59 !IF "$(ENABLE_MG)" != "0"60 ENABLE_MG = 161 !ENDIF62 !IF "$(ENABLE_MGPP)" != "0"63 ENABLE_MGPP = 164 !ENDIF65 !IF "$(ENABLE_LUCENE)" != "0"66 ENABLE_LUCENE = 167 !ENDIF68 63 69 64 MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)" BINDIR="$(GSDLHOME)\bin\windows" … … 81 76 MAKECMD = $(MAKECMD) DLLDEBUG=1 82 77 !ENDIF 83 !IF "$(USE_SQLITE)" == "0" 78 !IF $(USE_SQLITE) 79 PACKAGEDIRS = $(PACKAGEDIRS) $(SQLITE_DIR) 80 !ELSE 84 81 MAKECMD = $(MAKECMD) USE_SQLITE=0 85 !ELSE86 MAKECMD = $(MAKECMD) USE_SQLITE=187 PACKAGEDIRS = $(PACKAGEDIRS) $(SQLITE_DIR)88 82 !ENDIF 89 83 !IF $(USE_MSSQL) … … 192 186 set ENABLE_LUCENE=$(ENABLE_LUCENE) 193 187 194 !IF "$(ENABLE_JNI)" == "1"188 !IF $(ENABLE_JNI) 195 189 call winMake.bat all with-jni 196 190 call winMake.bat install with-jni -
main/trunk/greenstone2/runtime-src/src/colservr/win32.mak
r21324 r21435 64 64 !ENDIF 65 65 66 !IF "$(USE_SQLITE)" == "0" 66 !IF $(USE_SQLITE) 67 SQLITE_DEFINES = -DUSE_SQLITE 68 SQLITE_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\sqlite\include" 69 !ELSE 67 70 SQLITE_DEFINES = 68 71 SQLITE_INCLUDES = 69 !ELSE70 SQLITE_DEFINES = -DUSE_SQLITE71 SQLITE_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\sqlite\include"72 72 !ENDIF 73 73 … … 78 78 !ENDIF 79 79 80 !IF "$(ENABLE_MG)" == "0" 81 MG_DEFS = 82 MG_SOURCES = 83 MG_OBJECTS = 84 MG_INCLUDES = 85 !ELSE 80 !IF $(ENABLE_MG) 86 81 MG_DEFS = -DENABLE_MG 87 82 MG_SOURCES = mgq.c \ … … 96 91 mgsource.obj 97 92 MG_INCLUDES = -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" 98 !E NDIF99 100 !IF "$(ENABLE_MGPP)" == "0" 101 MG PP_DEFS =102 MG PP_SOURCES =103 MGPP_OBJECTS = 104 MGPP_INCLUDES = 105 ! ELSE93 !ELSE 94 MG_DEFS = 95 MG_SOURCES = 96 MG_OBJECTS = 97 MG_INCLUDES = 98 !ENDIF 99 100 !IF $(ENABLE_MGPP) 106 101 MGPP_DEFS = -DENABLE_MGPP 107 102 MGPP_SOURCES = mgppqueryfilter.cpp \ … … 112 107 mgppsource.obj 113 108 MGPP_INCLUDES = -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text" 109 !ELSE 110 MGPP_DEFS = 111 MGPP_SOURCES = 112 MGPP_OBJECTS = 113 MGPP_INCLUDES = 114 114 !ENDIF 115 115 -
main/trunk/greenstone2/runtime-src/src/oaiservr/win32.mak
r21324 r21435 74 74 !ENDIF 75 75 76 !IF "$(USE_SQLITE)" == "0" 76 !IF $(USE_SQLITE) 77 SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib" 78 !ELSE 77 79 SQLITE_LIBS = 78 !ELSE 79 SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib" 80 !ENDIF 81 82 !IF "$(ENABLE_MG)" == "0" 83 MG_LIBS = 84 !ELSE 80 !ENDIF 81 82 !IF $(ENABLE_MG) 85 83 MG_LIBS = "$(INDEXERS_DIR)\mg\src\text\libmgtext.lib" \ 86 84 "$(INDEXERS_DIR)\mg\lib\libmglib.lib" 87 !ENDIF 88 89 !IF "$(ENABLE_MGPP)" == "0" 90 MGPP_LIBS = 91 MGPP_INCLUDES = 92 !ELSE 85 !ELSE 86 MG_LIBS = 87 !ENDIF 88 89 !IF $(ENABLE_MGPP) 93 90 MGPP_LIBS = "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \ 94 91 "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib" 95 92 MGPP_INCLUDES = -I"$(INDEXERS_DIR)\mgpp\text" 96 !ENDIF 97 93 !ELSE 94 MGPP_LIBS = 95 MGPP_INCLUDES = 96 !ENDIF 98 97 99 98 -
main/trunk/greenstone2/runtime-src/src/protocol/win32.mak
r21332 r21435 60 60 !ENDIF 61 61 62 !IF "$(ENABLE_MGPP)" == "0" 62 !IF $(ENABLE_MGPP) 63 MGPP_INCLUDES = -I"$(INDEXERS_DIR)\mgpp\text" 64 !ELSE 63 65 MGPP_INCLUDES = 64 !ELSE65 MGPP_INCLUDES = -I"$(INDEXERS_DIR)\mgpp\text"66 66 !ENDIF 67 67 -
main/trunk/greenstone2/runtime-src/src/recpt/win32.mak
r21336 r21435 75 75 !ENDIF 76 76 77 !IF "$(USE_SQLITE)" == "0" 77 !IF $(USE_SQLITE) 78 SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib" 79 !ELSE 78 80 SQLITE_LIBS = 79 !ELSE80 SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib"81 81 !ENDIF 82 82 … … 91 91 !ENDIF 92 92 93 !IF "$(ENABLE_MG)" == "0" 94 MG_DEFS = 95 MG_LIBS = 96 MG_INCLUDES = 97 !ELSE 93 !IF $(ENABLE_MG) 98 94 MG_DEFS = -DENABLE_MG 99 95 MG_LIBS = "$(INDEXERS_DIR)\mg\src\text\libmgtext.lib" \ 100 96 "$(INDEXERS_DIR)\mg\lib\libmglib.lib" 101 97 MG_INCLUDES = -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" 102 !ENDIF 103 104 !IF "$(ENABLE_MGPP)" == "0" 105 MGPP_DEFS = 106 MGPP_SOURCES = 107 MGPP_OBJECTS = 108 MGPP_LIBS = 109 MGPP_INCLUDES = 110 !ELSE 98 !ELSE 99 MG_DEFS = 100 MG_LIBS = 101 MG_INCLUDES = 102 !ENDIF 103 104 !IF $(ENABLE_MGPP) 111 105 MGPP_DEFS = -DENABLE_MGPP 112 106 MGPP_SOURCES = phindaction.cpp … … 116 110 MGPP_INCLUDES = -I"$(INDEXERS_DIR)\mgpp\text" \ 117 111 -I"$(INDEXERS_DIR)\mgpp\lib" 112 !ELSE 113 MGPP_DEFS = 114 MGPP_SOURCES = 115 MGPP_OBJECTS = 116 MGPP_LIBS = 117 MGPP_INCLUDES = 118 118 !ENDIF 119 119 -
main/trunk/greenstone2/runtime-src/src/w32server/win32.mak
r21324 r21435 66 66 !ENDIF 67 67 68 !IF "$(USE_SQLITE)" == "0" 68 !IF $(USE_SQLITE) 69 SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib" 70 !ELSE 69 71 SQLITE_LIBS = 70 !ELSE 71 SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib" 72 !ENDIF 73 74 !IF "$(ENABLE_MG)" == "0" 75 MG_LIBS = 76 MG_INCLUDES = 77 !ELSE 72 !ENDIF 73 74 !IF $(ENABLE_MG) 78 75 MG_LIBS = "$(INDEXERS_DIR)\mg\src\text\libmgtext.lib" \ 79 76 "$(INDEXERS_DIR)\mg\lib\libmglib.lib" 80 77 MG_INCLUDES = -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" 81 !ENDIF 82 83 !IF "$(ENABLE_MGPP)" == "0" 84 MGPP_DEFS = 85 MGPP_LIBS = 86 MGPP_INCLUDES = 87 !ELSE 78 !ELSE 79 MG_LIBS = 80 MG_INCLUDES = 81 !ENDIF 82 83 !IF $(ENABLE_MGPP) 88 84 MGPP_DEFS = -DENABLE_MGPP 89 85 MGPP_LIBS = "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \ 90 86 "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib" 91 87 MGPP_INCLUDES = -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text" 88 !ELSE 89 MGPP_DEFS = 90 MGPP_LIBS = 91 MGPP_INCLUDES = 92 92 !ENDIF 93 93 -
main/trunk/greenstone2/runtime-src/src/z3950/win32.mak
r21324 r21435 72 72 !ENDIF 73 73 74 !IF "$(USE_SQLITE)" == "0" 74 !IF $(USE_SQLITE) 75 SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib" 76 !ELSE 75 77 SQLITE_LIBS = 76 !ELSE77 SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib"78 78 !ENDIF 79 79 80 !IF "$(ENABLE_MG)" == "0" 81 MG_LIBS = 82 !ELSE 80 !IF $(ENABLE_MG) 83 81 MG_LIBS = "$(INDEXERS_DIR)\mg\src\text\libmgtext.lib" \ 84 82 "$(INDEXERS_DIR)\mg\lib\libmglib.lib" 83 !ELSE 84 MG_LIBS = 85 85 !ENDIF 86 86 87 !IF "$(ENABLE_MGPP)" == "0" 88 MGPP_LIBS = 89 MGPP_INCLUDES = 90 !ELSE 87 !IF $(ENABLE_MGPP) 91 88 MGPP_LIBS = "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \ 92 89 "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib" 93 90 MGPP_INCLUDES = -I"$(INDEXERS_DIR)\mgpp\text" 91 !ELSE 92 MGPP_LIBS = 93 MGPP_INCLUDES = 94 94 !ENDIF 95 95 -
main/trunk/greenstone2/runtime-src/win32.mak
r21329 r21435 72 72 MAKECMD = $(MAKECMD) DLLDEBUG=1 73 73 !ENDIF 74 !IF "$(USE_SQLITE)" == "" 75 MAKECMD = $(MAKECMD) USE_SQLITE=1 76 !ELSE 77 MAKECMD = $(MAKECMD) USE_SQLITE=$(USE_SQLITE) 74 !IF !$(USE_SQLITE) 75 MAKECMD = $(MAKECMD) USE_SQLITE=0 78 76 !ENDIF 79 77 !IF $(USE_MSSQL) … … 85 83 PACKAGEDIRS = $(PACKAGEDIRS) packages\d2m $(YAZ_DIR) 86 84 !ENDIF 87 !IF "$(ENABLE_MG)" == "" 88 MAKECMD = $(MAKECMD) ENABLE_MG=1 89 !ELSE 90 MAKECMD = $(MAKECMD) ENABLE_MG=$(ENABLE_MG) 85 !IF !$(ENABLE_MG) 86 MAKECMD = $(MAKECMD) ENABLE_MG=0 91 87 !ENDIF 92 !IF "$(ENABLE_MGPP)" == "" 93 MAKECMD = $(MAKECMD) ENABLE_MGPP=1 94 !ELSE 95 MAKECMD = $(MAKECMD) ENABLE_MGPP=$(ENABLE_MGPP) 88 !IF !$(ENABLE_MGPP) 89 MAKECMD = $(MAKECMD) ENABLE_MGPP=0 96 90 !ENDIF 97 !IF "$(ENABLE_LUCENE)" == "" 98 MAKECMD = $(MAKECMD) ENABLE_LUCENE=1 99 !ELSE 100 MAKECMD = $(MAKECMD) ENABLE_LUCENE=$(ENABLE_LUCENE) 91 !IF !$(ENABLE_LUCENE) 92 MAKECMD = $(MAKECMD) ENABLE_LUCENE=0 101 93 !ENDIF 102 94 -
main/trunk/greenstone2/win32.mak
r21379 r21435 38 38 USE_MSSQL = 0 39 39 USE_Z3950 = 0 40 41 40 # by default, all indexers are enabled 42 41 ENABLE_MG = 1 … … 75 74 MAKECMD = $(MAKECMD) DLLDEBUG=1 76 75 !ENDIF 77 !IF "$(USE_SQLITE)" == "" 78 MAKECMD = $(MAKECMD) USE_SQLITE=1 79 !ELSE 80 MAKECMD = $(MAKECMD) USE_SQLITE=$(USE_SQLITE) 76 !IF !$(USE_SQLITE) 77 MAKECMD = $(MAKECMD) USE_SQLITE=0 81 78 !ENDIF 82 79 !IF $(USE_MSSQL) … … 86 83 MAKECMD = $(MAKECMD) USE_Z3950=1 87 84 !ENDIF 88 !IF "$(ENABLE_JNI)" == "" 89 MAKECMD = $(MAKECMD) ENABLE_JNI=0 90 !ELSE 91 MAKECMD = $(MAKECMD) ENABLE_JNI=$(ENABLE_JNI) 85 !IF $(ENABLE_JNI) 86 MAKECMD = $(MAKECMD) ENABLE_JNI=1 92 87 !ENDIF 93 !IF "$(ENABLE_MG)" == "" 94 MAKECMD = $(MAKECMD) ENABLE_MG=1 95 !ELSE 96 MAKECMD = $(MAKECMD) ENABLE_MG=$(ENABLE_MG) 88 !IF !$(ENABLE_MG) 89 MAKECMD = $(MAKECMD) ENABLE_MG=0 97 90 !ENDIF 98 !IF "$(ENABLE_MGPP)" == "" 99 MAKECMD = $(MAKECMD) ENABLE_MGPP=1 100 !ELSE 101 MAKECMD = $(MAKECMD) ENABLE_MGPP=$(ENABLE_MGPP) 91 !IF !$(ENABLE_MGPP) 92 MAKECMD = $(MAKECMD) ENABLE_MGPP=0 102 93 !ENDIF 103 !IF "$(ENABLE_LUCENE)" == "" 104 MAKECMD = $(MAKECMD) ENABLE_LUCENE=1 105 !ELSE 106 MAKECMD = $(MAKECMD) ENABLE_LUCENE=$(ENABLE_LUCENE) 94 !IF !$(ENABLE_LUCENE) 95 MAKECMD = $(MAKECMD) ENABLE_LUCENE=0 107 96 !ENDIF 108 97
Note:
See TracChangeset
for help on using the changeset viewer.