Changeset 22090


Ignore:
Timestamp:
2010-05-14T19:29:30+12:00 (14 years ago)
Author:
ak19
Message:

Windows makefiles to work with USE_GDBM and USE_JDBM: 1. Added winMake.bat to both gs-jdbm-1.0.tar.gz and common-src's jdbmedit so that jdbm java files can now get compiled up. 2. These new winMake bat files are then called from the updated windows makefiles in common-src and common-src's src-lib folder. 3. Changed win32.mak files to work with USE_GDBM and USE_JDBM: these set their USE_DBDEFINES flag when on to prevent memory errors due to makefiles' inconsistent setting of USE_DEFINES between folders. Also certain gdbm related lib, includes and dir statements are moved out of the general part of the windows makefiles into the USE_GDBM section of the makefiles.

Location:
main/trunk/greenstone2
Files:
1 added
12 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone2/common-src/src/getpw/win32.mak

    r19875 r22090  
    3535DLL = 0
    3636DLLDEBUG = 0
    37 USE_SQLITE = 1
    38 USE_MSSQL = 0
    3937
    4038!IF $(DEBUG)

  • main/trunk/greenstone2/common-src/src/lib/win32.mak

    r22062 r22090  
    3636DLL = 0
    3737DLLDEBUG = 0
     38USE_GDBM = 1
     39USE_JDBM = 1
    3840USE_SQLITE = 1
    3941USE_MSSQL = 0
    40 ENABLE_JDBM=1
    4142
    4243!IF $(DEBUG)
    … …  
    6465MSSQL_OBJECTS = mssqldbclass.obj
    6566MSSQL_SOURCES = mssqldbclass.cpp
     67MSSQL_DEFINES = -DUSE_MSSQL
    6668!ELSE
    6769MSSQL_OBJECTS =
    6870MSSQL_SOURCES =
     71MSSQL_DEFINES =
    6972!ENDIF
    7073
    … …  
    7376SQLITE_OBJECTS = sqlitedbclass.obj
    7477SQLITE_SOURCES = sqlitedbclass.cpp
     78SQLITE_DEFINES = -DUSE_SQLITE
    7579!ELSE
    7680SQLITE_INCLUDES =
    7781SQLITE_OBJECTS =
    7882SQLITE_SOURCES =
    79 !ENDIF
    80 
    81 !IF $(ENABLE_JDBM)
     83SQLITE_DEFINES =
     84!ENDIF
     85
     86!IF $(USE_GDBM)
     87GDBM_LIBS =
     88GDBM_SOURCES = gdbmclass.cpp
     89GDBM_OBJECTS = gdbmclass.obj
     90GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" \
     91    -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows"
     92GDBM_DEFINES = -DUSE_GDBM
     93!ELSE
     94GDBM_LIBS =
     95GDBM_SOURCES =
     96GDBM_OBJECTS =
     97GDBM_INCLUDES =
     98GDBM_DEFINES =
     99!ENDIF
     100
     101!IF $(USE_JDBM)
    82102JDBM_SOURCES = jdbmnaiveclass.cpp
    83103JDBM_OBJECTS = jdbmnaiveclass.obj
     104JDBM_DEFINES = -DUSE_JDBM
    84105!ELSE
    85106JDBM_SOURCES =
    86107JDBM_OBJECTS =
     108JDBM_DEFINES =
    87109!ENDIF
    88110
    89111AR = lib
    90112CC = cl
    91 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE
     113DEFS = -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)
    92115INCLUDES = -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) \
    94117    $(SQLITE_INCLUDES)
    95118
    … …  
    119142    display.cpp \
    120143    fileutil.cpp \
    121     gdbmclass.cpp \
     144    $(GDBM_SOURCES) \
    122145    gsdlsitecfg.cpp \
    123146    gsdltimes.cpp \
    … …  
    142165    display.obj \
    143166    fileutil.obj \
    144     gdbmclass.obj \
     167    $(GDBM_OBJECTS) \
    145168    gsdlsitecfg.obj \
    146169    gsdltimes.obj \

  • main/trunk/greenstone2/common-src/win32.mak

    r21871 r22090  
    3535DLL = 0
    3636DLLDEBUG = 0
     37USE_GDBM = 1
     38USE_JDBM = 1
    3739USE_SQLITE = 1
    3840USE_MSSQL = 0
    … …  
    4850INDEXERSDIR = indexers
    4951
    50 COMPILEDIRS = packages\windows\crypt\crypt packages\gdbm\gdbm-1.8.3 \
     52COMPILEDIRS = packages\windows\crypt\crypt \
    5153          packages\windows\expat\expat packages\search4j src\lib
    5254
    53 INSTALLDIRS = src\gdbmedit\db2txt src\gdbmedit\txt2db \
     55INSTALLDIRS =
     56
     57#    src\getpw
     58
     59PACKAGEDIRS =
     60
     61SQLITE_DIR = packages\sqlite\sqlite-amalgamation-3.6.23.1
     62JDBM_DIR = packages\jdbm
     63JDBMEDIT_DIR = src\jdbmedit
     64
     65MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)" BINDIR="$(GSDLHOME)\bin\windows"
     66
     67!IF $(GSDL_VC4)
     68MAKECMD = $(MAKECMD) GSDL_VC4=1
     69!ENDIF
     70!IF $(DEBUG)
     71MAKECMD = $(MAKECMD) DEBUG=1
     72!ENDIF
     73!IF $(DLL)
     74MAKECMD = $(MAKECMD) DLL=1
     75!ENDIF
     76!IF $(DLLDEBUG)
     77MAKECMD = $(MAKECMD) DLLDEBUG=1
     78!ENDIF
     79!IF $(ENABLE_JNI)
     80MAKECMD = $(MAKECMD) ENABLE_JNI=1
     81!ENDIF
     82!IF !$(ENABLE_MG)
     83MAKECMD = $(MAKECMD) ENABLE_MG=0
     84!ENDIF
     85!IF !$(ENABLE_MGPP)
     86MAKECMD = $(MAKECMD) ENABLE_MGPP=0
     87!ENDIF
     88!IF !$(ENABLE_LUCENE)
     89MAKECMD = $(MAKECMD) ENABLE_LUCENE=0
     90!ENDIF
     91
     92!IF $(USE_GDBM)
     93GDBM_DEFINES = -DUSE_GDBM
     94COMPILEDIRS = $(COMPILEDIRS) \
     95    packages\gdbm\gdbm-1.8.3
     96INSTALLDIRS = $(INSTALLDIRS) src\gdbmedit\db2txt src\gdbmedit\txt2db \
    5497    src\gdbmedit\gdbmset src\gdbmedit\gdbmget \
    5598    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
     100GDBM_DEFINES =
     101MAKECMD = $(MAKECMD) USE_GDBM=0
     102!ENDIF
     103
     104!IF $(USE_JDBM)
     105JDBM_DEFINES = -DUSE_JDBM
     106PACKAGEDIRS = $(PACKAGEDIRS) $(JDBM_DIR)
     107!ELSE
     108JDBM_DEFINES =
     109MAKECMD = $(MAKECMD) USE_JDBM=0
     110!ENDIF
     111
    78112!IF $(USE_SQLITE)
     113SQLITE_DEFINES = -DUSE_SQLITE
    79114PACKAGEDIRS = $(PACKAGEDIRS) $(SQLITE_DIR)
    80115!ELSE
     116SQLITE_DEFINES =
    81117MAKECMD = $(MAKECMD) USE_SQLITE=0
    82118!ENDIF
     119
    83120!IF $(USE_MSSQL)
     121MSSQL_DEFINES = -DUSE_MSSQL
    84122MAKECMD = $(MAKECMD) USE_MSSQL=1
     123!ELSE
     124MSSQL_DEFINES =
    85125!ENDIF
    86126
    87127MAKECLEANCMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)" clean
    88128
    89 all: win32.mak unzip $(INDEXERSDIR) $(PACKAGEDIRS) $(COMPILEDIRS) $(INSTALLDIRS)
     129all: win32.mak unzip $(INDEXERSDIR) $(PACKAGEDIRS) $(COMPILEDIRS) $(INSTALLDIRS) $(JDBMEDIT_DIR)
    90130
    91131install: win32.mak $(INDEXERSDIR) $(INSTALLDIRS)
    … …  
    102142    if NOT EXIST "iconv" unzip iconv.zip
    103143    cd "$(COMMONHOME)"
     144
    104145!IF "$(USE_SQLITE)" == "1"
    105146    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
    106147    @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. ******
    107148    @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
    108156!ENDIF
    109157
    … …  
    112160    cd packages\windows\crypt\crypt
    113161    $(MAKECLEANCMD)
     162!IF EXIST ("packages\gdbm\gdbm-1.8.3")
    114163    cd "$(COMMONHOME)"
    115164    cd packages\gdbm\gdbm-1.8.3
    116165    $(MAKECLEANCMD)
     166!ENDIF
    117167    cd "$(COMMONHOME)"
    118168    cd packages\windows\expat\expat
    … …  
    121171    cd src\lib
    122172    $(MAKECLEANCMD)
     173!IF EXIST ("src\gdbmedit")
    123174    cd "$(COMMONHOME)"
    124175    cd src\gdbmedit\txt2db
    … …  
    139190    cd src\gdbmedit\gdbmdel
    140191    $(MAKECLEANCMD)
     192!ENDIF
    141193#   cd "$(COMMONHOME)"
    142194#   cd src\getpw
    … …  
    162214    if exist "$(COMMONHOME)\packages\sqlite\lib\sqlite3.lib" del "$(COMMONHOME)\packages\sqlite\lib\sqlite3.lib"
    163215!ENDIF
    164     cd "$(COMMONHOME)"
     216    cd "$(COMMONHOME)" 
    165217
    166218$(COMPILEDIRS): FORCE
    … …  
    170222    cd "$(GSDLHOME)"
    171223
     224!IF "$(INSTALLDIRS)" != ""
    172225$(INSTALLDIRS): FORCE
    173226    cd "$(COMMONHOME)"
    … …  
    176229    $(MAKECMD) install
    177230    cd "$(COMMONHOME)"
     231!ENDIF
    178232
    179233$(SQLITE_DIR): FORCE
    180 !IF "$(USE_SQLITE)" == "1"
    181234    cd "$(COMMONHOME)"
    182235    cd "$@"
    183236    $(MAKECMD)
    184237    $(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
    187256
    188257$(INDEXERSDIR): FORCE
    … …  
    211280      if exist %%i copy %%i "$(GSDLHOME)\bin\windows"
    212281    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.  Greenstone will not be able to use Lucene for indexing
     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
    214283    cd "$(GSDLHOME)"
    215284

  • main/trunk/greenstone2/runtime-src/src/oaiservr/win32.mak

    r22080 r22090  
    4343DLLDEBUG = 0
    4444ENABLE_ACCENTFOLD = 1
     45USE_GDBM = 1
     46USE_JDBM = 1
    4547USE_SQLITE = 1
     48USE_MSSQL = 0
    4649ENABLE_MG = 1
    4750ENABLE_MGPP = 1
    … …  
    7477!ENDIF
    7578
     79!IF $(USE_GDBM)
     80GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" \
     81    -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows"
     82GDBM_LIBS = "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib"
     83GDBM_DEFINES = -DUSE_GDBM
     84!ELSE
     85GDBM_INCLUDES =
     86GDBM_LIBS =
     87GDBM_DEFINES =
     88!ENDIF
     89
     90!IF $(USE_JDBM)
     91JDBM_DEFINES = -DUSE_JDBM
     92!ELSE
     93JDBM_DEFINES =
     94!ENDIF
     95
    7696!IF $(USE_SQLITE)
    7797SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
     98SQLITE_DEFINES = -DUSE_SQLITE
    7899!ELSE
    79100SQLITE_LIBS =
     101SQLITE_DEFINES =
     102!ENDIF
     103
     104!IF $(USE_MSSQL)
     105MSSQL_DEFINES = -DUSE_MSSQL
     106!ELSE
     107MSSQL_DEFINES =
    80108!ENDIF
    81109
    … …  
    110138CC = cl
    111139DEFS = -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)
    113142INCLUDES = -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \
    114143        $(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) \
    116145    -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat"
    117146LDFLAGS =
    118147LIBS = "$(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)
    120149
    121150!IF $(GSDL_VC4)

  • main/trunk/greenstone2/runtime-src/src/protocol/win32.mak

    r22080 r22090  
    3838DLL = 0
    3939DLLDEBUG = 0
     40USE_GDBM = 1
     41USE_JDBM = 1
     42USE_SQLITE = 1
     43USE_MSSQL = 0
    4044ENABLE_MG = 1
    4145ENABLE_MGPP = 1
    … …  
    6064CXXFLAGS = $(CXXFLAGS) -MDd
    6165!ENDIF
     66!ENDIF
     67
     68!IF $(USE_GDBM)
     69GDBM_DEFINES = -DUSE_GDBM
     70GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\packages\gdbm\gdbm-1.8.3\windows"
     71!ELSE
     72GDBM_DEFINES =
     73GDBM_INCLUDES =
     74!ENDIF
     75
     76!IF $(USE_JDBM)
     77JDBM_DEFINES = -DUSE_JDBM
     78!ELSE
     79JDBM_DEFINES =
     80!ENDIF
     81
     82!IF $(USE_SQLITE)
     83SQLITE_DEFINES = -DUSE_SQLITE
     84!ELSE
     85SQLITE_DEFINES =
     86!ENDIF
     87
     88!IF $(USE_MSSQL)
     89MSSQL_DEFINES = -DUSE_MSSQL
     90!ELSE
     91MSSQL_DEFINES =
    6292!ENDIF
    6393
    … …  
    85115CC = cl
    86116DEFS = -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) \
    87118    $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS)
    88119# Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist!
    89120INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" $(MGPP_INCLUDES) \
    90      -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm"
     121     $(GDBM_INCLUDES)
    91122
    92123!IF $(GSDL_VC4)

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

    r22080 r22090  
    4545ENABLE_ACCENTFOLD = 1
    4646USE_GDBM = 1
     47USE_JDBM = 1
    4748USE_SQLITE = 1
     49USE_MSSQL = 0
    4850ENABLE_MG = 1
    4951ENABLE_MGPP = 1
    … …  
    7880!IF $(USE_GDBM)
    7981GDBM_DEFINES = -DUSE_GDBM
     82GDBM_LIBS = "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib"
    8083GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows"
    8184!ELSE
    8285GDBM_DEFINES =
     86GDBM_LIBS =
    8387GDBM_INCLUDES =
     88!ENDIF
     89
     90!IF $(USE_JDBM)
     91JDBM_DEFINES = -DUSE_JDBM
     92!ELSE
     93JDBM_DEFINES =
    8494!ENDIF
    8595
    … …  
    94104SQL_OBJECTS =
    95105SQLITE_LIBS =
     106!ENDIF
     107
     108!IF $(USE_MSSQL)
     109MSSQL_DEFINES = -DUSE_MSSQL
     110!ELSE
     111MSSQL_DEFINES =
    96112!ENDIF
    97113
    … …  
    142158CC = cl
    143159DEFS = -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)
    145162INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \
    146163    $(MG_INCLUDES) $(MGPP_INCLUDES) \
    … …  
    150167LDFLAGS =
    151168LIBS = "$(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)
    153170
    154171!IF $(GSDL_VC4)

  • main/trunk/greenstone2/runtime-src/src/w32server/win32.mak

    r22080 r22090  
    4040DEBUG = 0
    4141ENABLE_ACCENTFOLD = 1
     42USE_GDBM = 1
     43USE_JDBM = 1
    4244USE_SQLITE = 1
     45USE_MSSQL = 0
    4346ENABLE_MG = 1
    4447ENABLE_MGPP = 1
    … …  
    6669!ENDIF
    6770
     71!IF $(USE_GDBM)
     72GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" \
     73    -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows"
     74GDBM_LIBS = "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib"
     75GDBM_DEFINES = -DUSE_GDBM
     76!ELSE
     77GDBM_INCLUDES =
     78GDBM_LIBS =
     79GDBM_DEFINES =
     80!ENDIF
     81
     82!IF $(USE_JDBM)
     83JDBM_DEFINES = -DUSE_JDBM
     84!ELSE
     85JDBM_DEFINES =
     86!ENDIF
     87
    6888!IF $(USE_SQLITE)
    6989SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
     90SQLITE_DEFINES = -DUSE_SQLITE
    7091!ELSE
    7192SQLITE_LIBS =
     93SQLITE_DEFINES =
     94!ENDIF
     95
     96!IF $(USE_MSSQL)
     97MSSQL_DEFINES = -DUSE_MSSQL
     98!ELSE
     99MSSQL_DEFINES =
    72100!ENDIF
    73101
    … …  
    103131CC = cl
    104132DEFS = -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) \
    105134    $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS)
    106135INCLUDES = -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) \
    108137    -I"$(COLSERVR_DIR)" \
    109138    $(MG_INCLUDES) \
    … …  
    111140
    112141LIBS = "$(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)
    114143RSC = rc
    115144WINLIBS = kernel32.lib user32.lib gdi32.lib winspool.lib \

  • main/trunk/greenstone2/runtime-src/src/z3950/win32.mak

    r22080 r22090  
    4141DLLDEBUG = 0
    4242ENABLE_ACCENTFOLD = 1
     43USE_GDBM = 1
     44USE_JDBM = 1
    4345USE_SQLITE = 1
     46USE_MSSQL = 0
    4447ENABLE_MG = 1
    4548ENABLE_MGPP = 1
    … …  
    7275!ENDIF
    7376
     77!IF $(USE_GDBM)
     78GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" \
     79    -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows"
     80GDBM_LIBS = "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib"
     81GDBM_DEFINES = -DUSE_GDBM
     82!ELSE
     83GDBM_INCLUDES =
     84GDBM_LIBS =
     85GDBM_DEFINES =
     86!ENDIF
     87
     88!IF $(USE_JDBM)
     89JDBM_DEFINES = -DUSE_JDBM
     90!ELSE
     91JDBM_DEFINES =
     92!ENDIF
     93
    7494!IF $(USE_SQLITE)
    7595SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
     96SQLITE_DEFINES = -DUSE_SQLITE
    7697!ELSE
    7798SQLITE_LIBS =
     99SQLITE_DEFINES =
     100!ENDIF
     101
     102!IF $(USE_MSSQL)
     103MSSQL_DEFINES = -DUSE_MSSQL
     104!ELSE
     105MSSQL_DEFINES =
    78106!ENDIF
    79107
    … …  
    107135CC = cl
    108136DEFS = -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) \
    109138    $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS)
    110139# Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist!
    … …  
    112141    $(MGPP_INCLUDES) -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\include" \
    113142    -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)
    115144LDFLAGS =
    116 LIBS = "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib" \
     145LIBS = "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" $(GDBM_LIBS) \
    117146        "$(PACKAGES_DIR)\d2m\libd2m.lib" "$(PACKAGES_DIR)\yaz\yaz-2.1.4\lib\yaz.lib" $(ACCENTFOLD_LIBS) \
    118147    $(SQLITE_LIBS)

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

    r21435 r22090  
    3434DLL = 0
    3535DLLDEBUG = 0
     36USE_GDBM = 1
     37USE_JDBM = 1
    3638USE_SQLITE = 1
    3739USE_MSSQL = 0
    … …  
    7173!IF $(DLLDEBUG)
    7274MAKECMD = $(MAKECMD) DLLDEBUG=1
     75!ENDIF
     76!IF !$(USE_GDBM)
     77MAKECMD = $(MAKECMD) USE_GDBM=0
     78!ENDIF
     79!IF !$(USE_JDBM)
     80MAKECMD = $(MAKECMD) USE_JDBM=0
    7381!ENDIF
    7482!IF !$(USE_SQLITE)

  • main/trunk/greenstone2/win32.mak

    r21435 r22090  
    3333DLL = 0
    3434DLLDEBUG = 0
     35# The main database backends are enabled by default
     36USE_GDBM = 1
     37USE_JDBM = 1
    3538# USE_SQLITE is enabled by default for GS2. Need to turn off explicitly for GS3 in build.xml
    3639USE_SQLITE = 1
    … …  
    7376!IF $(DLLDEBUG)
    7477MAKECMD = $(MAKECMD) DLLDEBUG=1
     78!ENDIF
     79!IF !$(USE_GDBM)
     80MAKECMD = $(MAKECMD) USE_GDBM=0
     81!ENDIF
     82!IF !$(USE_JDBM)
     83MAKECMD = $(MAKECMD) USE_JDBM=0
    7584!ENDIF
    7685!IF !$(USE_SQLITE)
Note: See TracChangeset for help on using the changeset viewer.