Changeset 21378 for main/trunk/gs2build

Show
Ignore:
Timestamp:
18.12.2009 15:13:36 (10 years ago)
Author:
ak19
Message:

The win32.mak of gs2build and greenstone2 are the same, so that they can just be obtained from one source in future.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gs2build/win32.mak

    r21372 r21378  
    2727GSDLHOME = $(MAKEDIR) 
    2828GSDL_VC4 = 0 
     29# It only ever makes sense for GS2 to turn on LOCAL_LIBRARY and APACHE_HTTPD if needed 
    2930LOCAL_LIBRARY = 0 
     31APACHE_HTTPD = 0 
     32DEBUG = 0 
    3033DLL = 0 
    3134DLLDEBUG = 0 
    32 USE_SQLITE = 0 
     35# USE_SQLITE is enabled by default for GS2. Need to turn off explicitly for GS3 in build.xml 
     36USE_SQLITE = 1 
     37# It only ever makes sense for GS2 to turn on MSSQL if needed 
     38USE_MSSQL = 0 
    3339USE_Z3950 = 0 
    3440 
     
    3743ENABLE_MGPP = 1 
    3844ENABLE_LUCENE = 1 
    39 # jni is disabled by default for GS2, GS3 will set this explicitly 
     45# jni is disabled by default as this is the default for GS2. GS3 will set this explicitly 
    4046ENABLE_JNI = 0 
     47 
    4148 
    4249MDEFINES = /f win32.mak 
    4350 
    4451INSTALLDIRS = common-src build-src 
    45  
     52!IF EXIST ("runtime-src") 
     53INSTALLDIRS = $(INSTALLDIRS) runtime-src  
     54!ENDIF 
    4655 
    4756MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)" 
     
    4958!IF $(GSDL_VC4) 
    5059MAKECMD = $(MAKECMD) GSDL_VC4=1 
     60!ENDIF 
     61!IF $(LOCAL_LIBRARY) 
     62MAKECMD = $(MAKECMD) LOCAL_LIBRARY=1 
     63!ENDIF 
     64!IF $(APACHE_HTTPD) 
     65MAKECMD = $(MAKECMD) APACHE_HTTPD=1 
     66!ENDIF 
     67!IF $(DEBUG) 
     68MAKECMD = $(MAKECMD) DEBUG=1 
    5169!ENDIF 
    5270!IF $(DLL) 
     
    6078!ELSE 
    6179MAKECMD = $(MAKECMD) USE_SQLITE=$(USE_SQLITE) 
     80!ENDIF 
     81!IF $(USE_MSSQL) 
     82MAKECMD = $(MAKECMD) USE_MSSQL=1 
     83!ENDIF 
     84!IF $(USE_Z3950) 
     85MAKECMD = $(MAKECMD) USE_Z3950=1 
    6286!ENDIF 
    6387!IF "$(ENABLE_JNI)" == "" 
     
    95119    $(MAKECLEANCMD) 
    96120    cd "$(GSDLHOME)" 
     121!IF EXIST ("runtime-src") 
     122    cd runtime-src 
     123    $(MAKECLEANCMD) 
     124    cd "$(GSDLHOME)" 
     125!ENDIF 
    97126 
    98127$(INSTALLDIRS): FORCE