Changeset 22090
- Timestamp:
- 2010-05-14T19:29:30+12:00 (14 years ago)
- Location:
- main/trunk/greenstone2
- Files:
-
- 1 added
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/common-src/src/getpw/win32.mak
r19875 r22090 35 35 DLL = 0 36 36 DLLDEBUG = 0 37 USE_SQLITE = 138 USE_MSSQL = 039 37 40 38 !IF $(DEBUG) -
main/trunk/greenstone2/common-src/src/lib/win32.mak
r22062 r22090 36 36 DLL = 0 37 37 DLLDEBUG = 0 38 USE_GDBM = 1 39 USE_JDBM = 1 38 40 USE_SQLITE = 1 39 41 USE_MSSQL = 0 40 ENABLE_JDBM=141 42 42 43 !IF $(DEBUG) … … 64 65 MSSQL_OBJECTS = mssqldbclass.obj 65 66 MSSQL_SOURCES = mssqldbclass.cpp 67 MSSQL_DEFINES = -DUSE_MSSQL 66 68 !ELSE 67 69 MSSQL_OBJECTS = 68 70 MSSQL_SOURCES = 71 MSSQL_DEFINES = 69 72 !ENDIF 70 73 … … 73 76 SQLITE_OBJECTS = sqlitedbclass.obj 74 77 SQLITE_SOURCES = sqlitedbclass.cpp 78 SQLITE_DEFINES = -DUSE_SQLITE 75 79 !ELSE 76 80 SQLITE_INCLUDES = 77 81 SQLITE_OBJECTS = 78 82 SQLITE_SOURCES = 79 !ENDIF 80 81 !IF $(ENABLE_JDBM) 83 SQLITE_DEFINES = 84 !ENDIF 85 86 !IF $(USE_GDBM) 87 GDBM_LIBS = 88 GDBM_SOURCES = gdbmclass.cpp 89 GDBM_OBJECTS = gdbmclass.obj 90 GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" \ 91 -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" 92 GDBM_DEFINES = -DUSE_GDBM 93 !ELSE 94 GDBM_LIBS = 95 GDBM_SOURCES = 96 GDBM_OBJECTS = 97 GDBM_INCLUDES = 98 GDBM_DEFINES = 99 !ENDIF 100 101 !IF $(USE_JDBM) 82 102 JDBM_SOURCES = jdbmnaiveclass.cpp 83 103 JDBM_OBJECTS = jdbmnaiveclass.obj 104 JDBM_DEFINES = -DUSE_JDBM 84 105 !ELSE 85 106 JDBM_SOURCES = 86 107 JDBM_OBJECTS = 108 JDBM_DEFINES = 87 109 !ENDIF 88 110 89 111 AR = lib 90 112 CC = cl 91 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE 113 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 114 $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) 92 115 INCLUDES = -I"$(COMMON_DIR)" \ 93 -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows"\116 $(GDBM_INCLUDES) \ 94 117 $(SQLITE_INCLUDES) 95 118 … … 119 142 display.cpp \ 120 143 fileutil.cpp \ 121 gdbmclass.cpp\144 $(GDBM_SOURCES) \ 122 145 gsdlsitecfg.cpp \ 123 146 gsdltimes.cpp \ … … 142 165 display.obj \ 143 166 fileutil.obj \ 144 gdbmclass.obj\167 $(GDBM_OBJECTS) \ 145 168 gsdlsitecfg.obj \ 146 169 gsdltimes.obj \ -
main/trunk/greenstone2/common-src/win32.mak
r21871 r22090 35 35 DLL = 0 36 36 DLLDEBUG = 0 37 USE_GDBM = 1 38 USE_JDBM = 1 37 39 USE_SQLITE = 1 38 40 USE_MSSQL = 0 … … 48 50 INDEXERSDIR = indexers 49 51 50 COMPILEDIRS = packages\windows\crypt\crypt packages\gdbm\gdbm-1.8.3\52 COMPILEDIRS = packages\windows\crypt\crypt \ 51 53 packages\windows\expat\expat packages\search4j src\lib 52 54 53 INSTALLDIRS = src\gdbmedit\db2txt src\gdbmedit\txt2db \ 55 INSTALLDIRS = 56 57 # src\getpw 58 59 PACKAGEDIRS = 60 61 SQLITE_DIR = packages\sqlite\sqlite-amalgamation-3.6.23.1 62 JDBM_DIR = packages\jdbm 63 JDBMEDIT_DIR = src\jdbmedit 64 65 MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)" BINDIR="$(GSDLHOME)\bin\windows" 66 67 !IF $(GSDL_VC4) 68 MAKECMD = $(MAKECMD) GSDL_VC4=1 69 !ENDIF 70 !IF $(DEBUG) 71 MAKECMD = $(MAKECMD) DEBUG=1 72 !ENDIF 73 !IF $(DLL) 74 MAKECMD = $(MAKECMD) DLL=1 75 !ENDIF 76 !IF $(DLLDEBUG) 77 MAKECMD = $(MAKECMD) DLLDEBUG=1 78 !ENDIF 79 !IF $(ENABLE_JNI) 80 MAKECMD = $(MAKECMD) ENABLE_JNI=1 81 !ENDIF 82 !IF !$(ENABLE_MG) 83 MAKECMD = $(MAKECMD) ENABLE_MG=0 84 !ENDIF 85 !IF !$(ENABLE_MGPP) 86 MAKECMD = $(MAKECMD) ENABLE_MGPP=0 87 !ENDIF 88 !IF !$(ENABLE_LUCENE) 89 MAKECMD = $(MAKECMD) ENABLE_LUCENE=0 90 !ENDIF 91 92 !IF $(USE_GDBM) 93 GDBM_DEFINES = -DUSE_GDBM 94 COMPILEDIRS = $(COMPILEDIRS) \ 95 packages\gdbm\gdbm-1.8.3 96 INSTALLDIRS = $(INSTALLDIRS) src\gdbmedit\db2txt src\gdbmedit\txt2db \ 54 97 src\gdbmedit\gdbmset src\gdbmedit\gdbmget \ 55 98 src\gdbmedit\gdbmkeys src\gdbmedit\gdbmdel 56 57 # src\getpw 58 59 PACKAGEDIRS = 60 61 SQLITE_DIR = packages\sqlite\sqlite-amalgamation-3.6.23.1 62 63 64 MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)" BINDIR="$(GSDLHOME)\bin\windows" 65 66 !IF $(GSDL_VC4) 67 MAKECMD = $(MAKECMD) GSDL_VC4=1 68 !ENDIF 69 !IF $(DEBUG) 70 MAKECMD = $(MAKECMD) DEBUG=1 71 !ENDIF 72 !IF $(DLL) 73 MAKECMD = $(MAKECMD) DLL=1 74 !ENDIF 75 !IF $(DLLDEBUG) 76 MAKECMD = $(MAKECMD) DLLDEBUG=1 77 !ENDIF 99 !ELSE 100 GDBM_DEFINES = 101 MAKECMD = $(MAKECMD) USE_GDBM=0 102 !ENDIF 103 104 !IF $(USE_JDBM) 105 JDBM_DEFINES = -DUSE_JDBM 106 PACKAGEDIRS = $(PACKAGEDIRS) $(JDBM_DIR) 107 !ELSE 108 JDBM_DEFINES = 109 MAKECMD = $(MAKECMD) USE_JDBM=0 110 !ENDIF 111 78 112 !IF $(USE_SQLITE) 113 SQLITE_DEFINES = -DUSE_SQLITE 79 114 PACKAGEDIRS = $(PACKAGEDIRS) $(SQLITE_DIR) 80 115 !ELSE 116 SQLITE_DEFINES = 81 117 MAKECMD = $(MAKECMD) USE_SQLITE=0 82 118 !ENDIF 119 83 120 !IF $(USE_MSSQL) 121 MSSQL_DEFINES = -DUSE_MSSQL 84 122 MAKECMD = $(MAKECMD) USE_MSSQL=1 123 !ELSE 124 MSSQL_DEFINES = 85 125 !ENDIF 86 126 87 127 MAKECLEANCMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)" clean 88 128 89 all: win32.mak unzip $(INDEXERSDIR) $(PACKAGEDIRS) $(COMPILEDIRS) $(INSTALLDIRS) 129 all: win32.mak unzip $(INDEXERSDIR) $(PACKAGEDIRS) $(COMPILEDIRS) $(INSTALLDIRS) $(JDBMEDIT_DIR) 90 130 91 131 install: win32.mak $(INDEXERSDIR) $(INSTALLDIRS) … … 102 142 if NOT EXIST "iconv" unzip iconv.zip 103 143 cd "$(COMMONHOME)" 144 104 145 !IF "$(USE_SQLITE)" == "1" 105 146 IF NOT EXIST $(SQLITE_DIR) IF EXIST "$(GSDLHOME)\bin\windows\gunzip.exe" IF EXIST "$(GSDLHOME)\bin\windows\tar.exe" "$(GSDLHOME)\bin\windows\gunzip.exe" -cd "$(SQLITE_DIR).tar.gz" | "$(GSDLHOME)\bin\windows\tar.exe" xv --directory=./packages/sqlite 106 147 @IF NOT EXIST $(SQLITE_DIR) echo ****** Couldn't extract archive $(SQLITE_DIR).tar.gz. Extract it manually, or check that gunzip.exe and tar.exe exist in GSDLHOME\bin\windows. ****** 107 148 @IF NOT EXIST $(SQLITE_DIR) exit /b 1 149 cd "$(COMMONHOME)" 150 !ENDIF 151 152 !IF "$(USE_JDBM)" == "1" 153 IF NOT EXIST $(JDBM_DIR)\jdbm-1.0 IF EXIST "$(GSDLHOME)\bin\windows\gunzip.exe" IF EXIST "$(GSDLHOME)\bin\windows\tar.exe" "$(GSDLHOME)\bin\windows\gunzip.exe" -cd "$(JDBM_DIR)\gs-jdbm-1.0.tar.gz" | "$(GSDLHOME)\bin\windows\tar.exe" xv --directory=./packages/jdbm 154 @IF NOT EXIST $(JDBM_DIR)\jdbm-1.0 echo ****** Couldn't extract archive $(JDBM_DIR)\gs-jdbm-1.0.tar.gz. Extract it manually, or check that gunzip.exe and tar.exe exist in GSDLHOME\bin\windows. ****** 155 @IF NOT EXIST $(JDBM_DIR)\jdbm-1.0 exit /b 1 108 156 !ENDIF 109 157 … … 112 160 cd packages\windows\crypt\crypt 113 161 $(MAKECLEANCMD) 162 !IF EXIST ("packages\gdbm\gdbm-1.8.3") 114 163 cd "$(COMMONHOME)" 115 164 cd packages\gdbm\gdbm-1.8.3 116 165 $(MAKECLEANCMD) 166 !ENDIF 117 167 cd "$(COMMONHOME)" 118 168 cd packages\windows\expat\expat … … 121 171 cd src\lib 122 172 $(MAKECLEANCMD) 173 !IF EXIST ("src\gdbmedit") 123 174 cd "$(COMMONHOME)" 124 175 cd src\gdbmedit\txt2db … … 139 190 cd src\gdbmedit\gdbmdel 140 191 $(MAKECLEANCMD) 192 !ENDIF 141 193 # cd "$(COMMONHOME)" 142 194 # cd src\getpw … … 162 214 if exist "$(COMMONHOME)\packages\sqlite\lib\sqlite3.lib" del "$(COMMONHOME)\packages\sqlite\lib\sqlite3.lib" 163 215 !ENDIF 164 cd "$(COMMONHOME)" 216 cd "$(COMMONHOME)" 165 217 166 218 $(COMPILEDIRS): FORCE … … 170 222 cd "$(GSDLHOME)" 171 223 224 !IF "$(INSTALLDIRS)" != "" 172 225 $(INSTALLDIRS): FORCE 173 226 cd "$(COMMONHOME)" … … 176 229 $(MAKECMD) install 177 230 cd "$(COMMONHOME)" 231 !ENDIF 178 232 179 233 $(SQLITE_DIR): FORCE 180 !IF "$(USE_SQLITE)" == "1"181 234 cd "$(COMMONHOME)" 182 235 cd "$@" 183 236 $(MAKECMD) 184 237 $(MAKECMD) install 185 !ENDIF 186 cd "$(COMMONHOME)" 238 cd "$(COMMONHOME)" 239 240 $(JDBM_DIR): FORCE 241 cd "$(COMMONHOME)\$(JDBM_DIR)\jdbm-1.0" 242 set DEBUG=$(DEBUG) 243 call winMake.bat all 244 call winMake.bat install 245 set DEBUG= 246 247 $(JDBMEDIT_DIR): FORCE 248 !IF "$(USE_JDBM)" == "1" 249 cd "$(COMMONHOME)" 250 cd "$@" 251 set DEBUG=$(DEBUG) 252 call winMake.bat all 253 call winMake.bat install 254 set DEBUG= 255 !ENDIF 187 256 188 257 $(INDEXERSDIR): FORCE … … 211 280 if exist %%i copy %%i "$(GSDLHOME)\bin\windows" 212 281 if EXIST "lucene-gs\LuceneWrapper.jar" copy "lucene-gs\LuceneWrapper.jar" "$(GSDLHOME)\bin\java" 213 @if NOT EXIST "lucene-gs\LuceneWrapper.jar" echo Warning: Failed to find lucene-gs\LuceneWrapper.jar. 282 @if NOT EXIST "lucene-gs\LuceneWrapper.jar" echo Warning: Failed to find lucene-gs\LuceneWrapper.jar. Greenstone will not be able to use Lucene for indexing 214 283 cd "$(GSDLHOME)" 215 284 -
main/trunk/greenstone2/runtime-src/src/oaiservr/win32.mak
r22080 r22090 43 43 DLLDEBUG = 0 44 44 ENABLE_ACCENTFOLD = 1 45 USE_GDBM = 1 46 USE_JDBM = 1 45 47 USE_SQLITE = 1 48 USE_MSSQL = 0 46 49 ENABLE_MG = 1 47 50 ENABLE_MGPP = 1 … … 74 77 !ENDIF 75 78 79 !IF $(USE_GDBM) 80 GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" \ 81 -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" 82 GDBM_LIBS = "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib" 83 GDBM_DEFINES = -DUSE_GDBM 84 !ELSE 85 GDBM_INCLUDES = 86 GDBM_LIBS = 87 GDBM_DEFINES = 88 !ENDIF 89 90 !IF $(USE_JDBM) 91 JDBM_DEFINES = -DUSE_JDBM 92 !ELSE 93 JDBM_DEFINES = 94 !ENDIF 95 76 96 !IF $(USE_SQLITE) 77 97 SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib" 98 SQLITE_DEFINES = -DUSE_SQLITE 78 99 !ELSE 79 100 SQLITE_LIBS = 101 SQLITE_DEFINES = 102 !ENDIF 103 104 !IF $(USE_MSSQL) 105 MSSQL_DEFINES = -DUSE_MSSQL 106 !ELSE 107 MSSQL_DEFINES = 80 108 !ENDIF 81 109 … … 110 138 CC = cl 111 139 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 112 -DGSDL_NOCACHE $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 140 -DGSDL_NOCACHE $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \ 141 $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 113 142 INCLUDES = -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \ 114 143 $(MGPP_INCLUDES) -I"$(COMMON_PACKAGES_DIR)\windows\crypt\crypt" \ 115 -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows"\144 $(GDBM_INCLUDES) \ 116 145 -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat" 117 146 LDFLAGS = 118 147 LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \ 119 "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib"$(ACCENTFOLD_LIBS) $(SQLITE_LIBS)148 $(GDBM_LIBS) $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) 120 149 121 150 !IF $(GSDL_VC4) -
main/trunk/greenstone2/runtime-src/src/protocol/win32.mak
r22080 r22090 38 38 DLL = 0 39 39 DLLDEBUG = 0 40 USE_GDBM = 1 41 USE_JDBM = 1 42 USE_SQLITE = 1 43 USE_MSSQL = 0 40 44 ENABLE_MG = 1 41 45 ENABLE_MGPP = 1 … … 60 64 CXXFLAGS = $(CXXFLAGS) -MDd 61 65 !ENDIF 66 !ENDIF 67 68 !IF $(USE_GDBM) 69 GDBM_DEFINES = -DUSE_GDBM 70 GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\packages\gdbm\gdbm-1.8.3\windows" 71 !ELSE 72 GDBM_DEFINES = 73 GDBM_INCLUDES = 74 !ENDIF 75 76 !IF $(USE_JDBM) 77 JDBM_DEFINES = -DUSE_JDBM 78 !ELSE 79 JDBM_DEFINES = 80 !ENDIF 81 82 !IF $(USE_SQLITE) 83 SQLITE_DEFINES = -DUSE_SQLITE 84 !ELSE 85 SQLITE_DEFINES = 86 !ENDIF 87 88 !IF $(USE_MSSQL) 89 MSSQL_DEFINES = -DUSE_MSSQL 90 !ELSE 91 MSSQL_DEFINES = 62 92 !ENDIF 63 93 … … 85 115 CC = cl 86 116 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 117 $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \ 87 118 $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 88 119 # Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist! 89 120 INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" $(MGPP_INCLUDES) \ 90 -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm"121 $(GDBM_INCLUDES) 91 122 92 123 !IF $(GSDL_VC4) -
main/trunk/greenstone2/runtime-src/src/recpt/win32.mak
r22080 r22090 45 45 ENABLE_ACCENTFOLD = 1 46 46 USE_GDBM = 1 47 USE_JDBM = 1 47 48 USE_SQLITE = 1 49 USE_MSSQL = 0 48 50 ENABLE_MG = 1 49 51 ENABLE_MGPP = 1 … … 78 80 !IF $(USE_GDBM) 79 81 GDBM_DEFINES = -DUSE_GDBM 82 GDBM_LIBS = "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib" 80 83 GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" 81 84 !ELSE 82 85 GDBM_DEFINES = 86 GDBM_LIBS = 83 87 GDBM_INCLUDES = 88 !ENDIF 89 90 !IF $(USE_JDBM) 91 JDBM_DEFINES = -DUSE_JDBM 92 !ELSE 93 JDBM_DEFINES = 84 94 !ENDIF 85 95 … … 94 104 SQL_OBJECTS = 95 105 SQLITE_LIBS = 106 !ENDIF 107 108 !IF $(USE_MSSQL) 109 MSSQL_DEFINES = -DUSE_MSSQL 110 !ELSE 111 MSSQL_DEFINES = 96 112 !ENDIF 97 113 … … 142 158 CC = cl 143 159 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 144 -DGSDL_NOCACHE $(GDBM_DEFINES) $(Z3950_DEFS) $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 160 -DGSDL_NOCACHE $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \ 161 $(Z3950_DEFS) $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 145 162 INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \ 146 163 $(MG_INCLUDES) $(MGPP_INCLUDES) \ … … 150 167 LDFLAGS = 151 168 LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \ 152 "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib"$(ACCENTFOLD_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS)169 $(GDBM_LIBS) $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS) 153 170 154 171 !IF $(GSDL_VC4) -
main/trunk/greenstone2/runtime-src/src/w32server/win32.mak
r22080 r22090 40 40 DEBUG = 0 41 41 ENABLE_ACCENTFOLD = 1 42 USE_GDBM = 1 43 USE_JDBM = 1 42 44 USE_SQLITE = 1 45 USE_MSSQL = 0 43 46 ENABLE_MG = 1 44 47 ENABLE_MGPP = 1 … … 66 69 !ENDIF 67 70 71 !IF $(USE_GDBM) 72 GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" \ 73 -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" 74 GDBM_LIBS = "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib" 75 GDBM_DEFINES = -DUSE_GDBM 76 !ELSE 77 GDBM_INCLUDES = 78 GDBM_LIBS = 79 GDBM_DEFINES = 80 !ENDIF 81 82 !IF $(USE_JDBM) 83 JDBM_DEFINES = -DUSE_JDBM 84 !ELSE 85 JDBM_DEFINES = 86 !ENDIF 87 68 88 !IF $(USE_SQLITE) 69 89 SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib" 90 SQLITE_DEFINES = -DUSE_SQLITE 70 91 !ELSE 71 92 SQLITE_LIBS = 93 SQLITE_DEFINES = 94 !ENDIF 95 96 !IF $(USE_MSSQL) 97 MSSQL_DEFINES = -DUSE_MSSQL 98 !ELSE 99 MSSQL_DEFINES = 72 100 !ENDIF 73 101 … … 103 131 CC = cl 104 132 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -D_LITTLE_ENDIAN -DPARADOCNUM -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 133 $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \ 105 134 $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 106 135 INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \ 107 -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows"\136 $(GDBM_INCLUDES) \ 108 137 -I"$(COLSERVR_DIR)" \ 109 138 $(MG_INCLUDES) \ … … 111 140 112 141 LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \ 113 "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib"$(ACCENTFOLD_LIBS) $(SQLITE_LIBS)142 $(GDBM_LIBS) $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) 114 143 RSC = rc 115 144 WINLIBS = kernel32.lib user32.lib gdi32.lib winspool.lib \ -
main/trunk/greenstone2/runtime-src/src/z3950/win32.mak
r22080 r22090 41 41 DLLDEBUG = 0 42 42 ENABLE_ACCENTFOLD = 1 43 USE_GDBM = 1 44 USE_JDBM = 1 43 45 USE_SQLITE = 1 46 USE_MSSQL = 0 44 47 ENABLE_MG = 1 45 48 ENABLE_MGPP = 1 … … 72 75 !ENDIF 73 76 77 !IF $(USE_GDBM) 78 GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" \ 79 -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" 80 GDBM_LIBS = "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib" 81 GDBM_DEFINES = -DUSE_GDBM 82 !ELSE 83 GDBM_INCLUDES = 84 GDBM_LIBS = 85 GDBM_DEFINES = 86 !ENDIF 87 88 !IF $(USE_JDBM) 89 JDBM_DEFINES = -DUSE_JDBM 90 !ELSE 91 JDBM_DEFINES = 92 !ENDIF 93 74 94 !IF $(USE_SQLITE) 75 95 SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib" 96 SQLITE_DEFINES = -DUSE_SQLITE 76 97 !ELSE 77 98 SQLITE_LIBS = 99 SQLITE_DEFINES = 100 !ENDIF 101 102 !IF $(USE_MSSQL) 103 MSSQL_DEFINES = -DUSE_MSSQL 104 !ELSE 105 MSSQL_DEFINES = 78 106 !ENDIF 79 107 … … 107 135 CC = cl 108 136 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 137 $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \ 109 138 $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 110 139 # Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist! … … 112 141 $(MGPP_INCLUDES) -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\include" \ 113 142 -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\client" -I"$(PACKAGES_DIR)\d2m" \ 114 -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows"143 $(GDBM_INCLUDES) 115 144 LDFLAGS = 116 LIBS = "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib"\145 LIBS = "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" $(GDBM_LIBS) \ 117 146 "$(PACKAGES_DIR)\d2m\libd2m.lib" "$(PACKAGES_DIR)\yaz\yaz-2.1.4\lib\yaz.lib" $(ACCENTFOLD_LIBS) \ 118 147 $(SQLITE_LIBS) -
main/trunk/greenstone2/runtime-src/win32.mak
r21435 r22090 34 34 DLL = 0 35 35 DLLDEBUG = 0 36 USE_GDBM = 1 37 USE_JDBM = 1 36 38 USE_SQLITE = 1 37 39 USE_MSSQL = 0 … … 71 73 !IF $(DLLDEBUG) 72 74 MAKECMD = $(MAKECMD) DLLDEBUG=1 75 !ENDIF 76 !IF !$(USE_GDBM) 77 MAKECMD = $(MAKECMD) USE_GDBM=0 78 !ENDIF 79 !IF !$(USE_JDBM) 80 MAKECMD = $(MAKECMD) USE_JDBM=0 73 81 !ENDIF 74 82 !IF !$(USE_SQLITE) -
main/trunk/greenstone2/win32.mak
r21435 r22090 33 33 DLL = 0 34 34 DLLDEBUG = 0 35 # The main database backends are enabled by default 36 USE_GDBM = 1 37 USE_JDBM = 1 35 38 # USE_SQLITE is enabled by default for GS2. Need to turn off explicitly for GS3 in build.xml 36 39 USE_SQLITE = 1 … … 73 76 !IF $(DLLDEBUG) 74 77 MAKECMD = $(MAKECMD) DLLDEBUG=1 78 !ENDIF 79 !IF !$(USE_GDBM) 80 MAKECMD = $(MAKECMD) USE_GDBM=0 81 !ENDIF 82 !IF !$(USE_JDBM) 83 MAKECMD = $(MAKECMD) USE_JDBM=0 75 84 !ENDIF 76 85 !IF !$(USE_SQLITE)
Note:
See TracChangeset
for help on using the changeset viewer.