Changeset 22976

Show
Ignore:
Timestamp:
28.09.2010 10:24:24 (9 years ago)
Author:
davidb
Message:

Adjustment to arguments inside targets relating to building Greenstone without JNI support, i.e. for a 100% Java runtime

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r22940 r22976  
    317317  </condition> 
    318318  <condition property="gs2.windows.enablejni" value="1" else="0"> 
     319    <istrue value="${with.jni}"/> 
     320  </condition> 
     321  <condition property="gs2.windows.enablemg" value="1" else="0"> 
     322    <istrue value="${with.jni}"/> 
     323  </condition> 
     324  <condition property="gs2.windows.enablemgpp" value="1" else="0"> 
     325    <istrue value="${with.jni}"/> 
     326  </condition> 
     327  <!-- Should accent folding not also be set here ?? --> 
     328  <condition property="gs2.windows.usegdbm" value="1" else="0"> 
     329    <istrue value="${with.jni}"/> 
     330  </condition> 
     331  <condition property="gs2.windows.usesqlite" value="1" else="0"> 
    319332    <istrue value="${with.jni}"/> 
    320333  </condition> 
     
    14231436  </target> 
    14241437   
    1425   <target name="install-jni-files" depends="init,install-jni-files-linux,install-jni-files-windows,install-jni-files-macos" if="with.jni"/> 
     1438  <target name="install-jni-files" depends="init" if="with.jni"> 
     1439    <antcall target="install-jni-files-linux"/> 
     1440    <antcall target="install-jni-files-windows"/> 
     1441    <antcall target="install-jni-files-macos"/> 
     1442  </target> 
    14261443 
    14271444  <target name="install-jni-files-linux" depends="init" if="current.os.isunixnotmac"> 
     
    15321549      <arg value="GSDLHOME=${gs2build.home}"/> 
    15331550      <arg value="ENABLE_JNI=${gs2.windows.enablejni}"/> 
    1534       <arg value="USE_SQLITE=0"/> <!-- Why is this not on by default? --> 
     1551      <arg value="ENABLE_MG=${gs2.windows.enablemg}"/> 
     1552      <arg value="ENABLE_MGPP=${gs2.windows.enablemgpp}"/> 
     1553      <arg value="USE_GDBM=${gs2.windows.usegdbm}"/> 
     1554      <arg value="USE_SQLITE=${gs2.windows.usesqlite}"/> 
    15351555    </exec> 
    15361556  </target>