Changeset 36426 for main/trunk


Ignore:
Timestamp:
2022-08-22T14:11:45+12:00 (20 months ago)
Author:
davidb
Message:

Introduction of with.wvware property, and conditional install of collection depending on with.jni value

Location:
main/trunk/greenstone3
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone3/build.properties.svn

    r36127 r36426  
    148148#   e.g Lucene and JDBM
    149149#
    150 # Ant 1.7.1 and before only test for *existence* so this needs to be commented
    151 # in or out to control whether jni is used or not
    152150with.jni=true
     151
     152# Controls whether or not we want wv-ware compiled up for processing
     153# Word docs. If setting to false, then you might want to add in the
     154# OpenOffice and Tika gs2 extensions
     155with.wvware=true
    153156
    154157## Controls whether or not we want GLI and GEMS to be checked out and compiled

  • main/trunk/greenstone3/build.xml

    r36355 r36426  
    759759   </condition>
    760760
    761 <!-- if you want to disable wvware, do so here: set the value (not else) field to contain minus-minus-disable-wvware -->
    762   <condition property="gs2.opt.args" value="${opt.gnomelibext.arg} " else="--disable-mg --disable-mgpp --disable-accentfold --disable-gdbm --disable-sqlite">
     761   <condition property="opt.wvware.arg" value=" " else="--disable-wvware ">
     762     <istrue value="${with.wvware}"/>
     763   </condition>
     764
     765  <condition property="gs2.opt.args" value="${opt.gnomelibext.arg} ${opt.wvware.arg}" else="${opt.wvware.arg} --disable-mg --disable-mgpp --disable-accentfold --disable-gdbm --disable-sqlite">
    763766    <istrue value="${with.jni}"/>
    764767  </condition>
    … …  
    16151618    <property name="index-and-archives.zip" value="index-and-archives.zip"/>
    16161619
    1617     <echo message="installing collections..."/>
    1618     <antcall target="gs2mgdemo-install"/>
    1619     <antcall target="gs2mgppdemo-install"/>
     1620    <echo message="Installing collections ..."/>
     1621    <!-- collections requiring jni -->
     1622    <if>
     1623      <istrue property="with.jni"/>
     1624      <then>
     1625    <antcall target="gs2mgdemo-install"/>
     1626      </then>
     1627    </if>
     1628    <if>
     1629      <istrue property="with.jni"/>
     1630      <then>
     1631    <antcall target="gs2mgppdemo-install"/>
     1632      </then>
     1633    </if>
     1634    <!-- pure java ones -->
    16201635    <antcall target="gberg-install"/>
    16211636    <antcall target="lucene-jdbm-demo-install"/>
Note: See TracChangeset for help on using the changeset viewer.