Changeset 21945

Show
Ignore:
Timestamp:
22.04.2010 20:38:17 (9 years ago)
Author:
ak19
Message:

Fixed up win32.mak files in runtime-src that set DEFS for ANY of the indexers that can be ENABLEd/DISABLEd, such that DEFS for ALL the indexers are now set. Not doing so was causing memory overwrite problems (and consequently crashing) since different windows makefiles specified different indexers as specifically defined (leaving others unmentioned) whereas other makefiles would particularly pass on DEFS flags for all indexers. This made classes which were compiled which such makefiles and which contained references to these indexer objects a different size.

Location:
main/trunk/greenstone2/runtime-src/src
Files:
6 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/src/colservr/win32.mak

    r21472 r21945  
    130130!ENDIF 
    131131 
    132 !IF "$(ENABLE_LUCENE)" == "0" 
     132!IF $(ENABLE_LUCENE) 
     133LUCENE_DEFS = -DENABLE_LUCENE 
     134!ELSE 
    133135LUCENE_DEFS = 
    134 !ELSE 
    135 LUCENE_DEFS = -DENABLE_LUCENE 
    136136!ENDIF 
    137137 
  • main/trunk/greenstone2/runtime-src/src/oaiservr/win32.mak

    r21931 r21945  
    8181 
    8282!IF $(ENABLE_MG) 
     83MG_DEFS = -DENABLE_MG 
    8384MG_LIBS = "$(INDEXERS_DIR)\mg\src\text\libmgtext.lib" \ 
    8485    "$(INDEXERS_DIR)\mg\lib\libmglib.lib"    
    8586!ELSE 
     87MG_DEFS = 
    8688MG_LIBS = 
    8789!ENDIF 
    8890 
    8991!IF $(ENABLE_MGPP) 
     92MGPP_DEFS = -DENABLE_MGPP 
    9093MGPP_LIBS = "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \ 
    9194    "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib" 
    9295MGPP_INCLUDES = -I"$(INDEXERS_DIR)\mgpp\text" 
    9396!ELSE 
     97MGPP_DEFS = 
    9498MGPP_LIBS = 
    9599MGPP_INCLUDES = 
     100!ENDIF 
     101 
     102!IF $(ENABLE_LUCENE) 
     103LUCENE_DEFS = -DENABLE_LUCENE 
     104!ELSE 
     105LUCENE_DEFS= 
    96106!ENDIF 
    97107 
     
    100110CC = cl 
    101111DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 
    102         -DGSDL_NOCACHE 
     112        -DGSDL_NOCACHE $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 
    103113INCLUDES = -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \ 
    104114        $(MGPP_INCLUDES) -I"$(COMMON_PACKAGES_DIR)\windows\crypt\crypt" \ 
  • main/trunk/greenstone2/runtime-src/src/protocol/win32.mak

    r21435 r21945  
    3838DLL = 0 
    3939DLLDEBUG = 0 
     40ENABLE_MG = 1 
    4041ENABLE_MGPP = 1 
     42ENABLE_LUCENE = 1 
    4143 
    4244!IF $(DEBUG) 
     
    6062!ENDIF 
    6163 
     64!IF $(ENABLE_MG) 
     65MG_DEFS = -DENABLE_MG 
     66!ELSE 
     67MG_DEFS= 
     68!ENDIF 
     69 
    6270!IF $(ENABLE_MGPP) 
     71MGPP_DEFS = -DENABLE_MGPP 
    6372MGPP_INCLUDES = -I"$(INDEXERS_DIR)\mgpp\text" 
    6473!ELSE 
     74MGPP_DEFS = 
    6575MGPP_INCLUDES = 
     76!ENDIF 
     77 
     78!IF $(ENABLE_LUCENE) 
     79LUCENE_DEFS = -DENABLE_LUCENE 
     80!ELSE 
     81LUCENE_DEFS= 
    6682!ENDIF 
    6783 
    6884AR = lib 
    6985CC = cl 
    70 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE 
     86DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 
     87    $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 
    7188# Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist! 
    7289INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" $(MGPP_INCLUDES) \ 
  • main/trunk/greenstone2/runtime-src/src/recpt/win32.mak

    r21485 r21945  
    127127!ENDIF 
    128128 
     129!IF $(ENABLE_LUCENE) 
     130LUCENE_DEFS = -DENABLE_LUCENE 
     131!ELSE 
     132LUCENE_DEFS= 
     133!ENDIF 
     134 
    129135AR = lib 
    130136CC = cl 
    131137DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 
    132         -DGSDL_NOCACHE $(GDBM_DEFINES) $(Z3950_DEFS) $(MG_DEFS) $(MGPP_DEFS) 
     138        -DGSDL_NOCACHE $(GDBM_DEFINES) $(Z3950_DEFS) $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 
    133139INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \ 
    134140    $(MG_INCLUDES) $(MGPP_INCLUDES) \ 
  • main/trunk/greenstone2/runtime-src/src/w32server/win32.mak

    r21435 r21945  
    7373 
    7474!IF $(ENABLE_MG) 
     75MG_DEFS = -DENABLE_MG 
    7576MG_LIBS = "$(INDEXERS_DIR)\mg\src\text\libmgtext.lib" \ 
    7677    "$(INDEXERS_DIR)\mg\lib\libmglib.lib" 
    7778MG_INCLUDES = -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" 
    7879!ELSE 
     80MG_DEFS =  
    7981MG_LIBS = 
    8082MG_INCLUDES = 
     
    9294!ENDIF 
    9395 
     96!IF $(ENABLE_LUCENE) 
     97LUCENE_DEFS = -DENABLE_LUCENE 
     98!ELSE 
     99LUCENE_DEFS= 
     100!ENDIF 
     101 
    94102AR = lib 
    95103CC = cl 
    96 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -D_LITTLE_ENDIAN -DPARADOCNUM -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE $(MGPP_DEFS) 
     104DEFS = -D__WIN32__ -DHAVE_CONFIG_H -D_LITTLE_ENDIAN -DPARADOCNUM -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 
     105    $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 
    97106INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \ 
    98107    -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" \ 
  • main/trunk/greenstone2/runtime-src/src/z3950/win32.mak

    r21435 r21945  
    7979 
    8080!IF $(ENABLE_MG) 
     81MG_DEFS = -DENABLE_MG 
    8182MG_LIBS = "$(INDEXERS_DIR)\mg\src\text\libmgtext.lib" \ 
    8283    "$(INDEXERS_DIR)\mg\lib\libmglib.lib" 
    8384!ELSE 
     85MG_DEFS = 
    8486MG_LIBS = 
    8587!ENDIF 
    8688 
    8789!IF $(ENABLE_MGPP) 
     90MGPP_DEFS = -DENABLE_MGPP 
    8891MGPP_LIBS = "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \ 
    8992    "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib" 
    9093MGPP_INCLUDES = -I"$(INDEXERS_DIR)\mgpp\text" 
    9194!ELSE 
     95MGPP_DEFS = 
    9296MGPP_LIBS = 
    9397MGPP_INCLUDES = 
    9498!ENDIF 
    9599 
     100!IF $(ENABLE_LUCENE) 
     101LUCENE_DEFS = -DENABLE_LUCENE 
     102!ELSE 
     103LUCENE_DEFS= 
     104!ENDIF 
     105 
    96106AR = lib 
    97107CC = cl 
    98 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE 
     108DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 
     109    $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 
    99110# Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist! 
    100111INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \