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.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.