Changeset 20464 for greenstone3

Show
Ignore:
Timestamp:
01.09.2009 13:59:08 (11 years ago)
Author:
oranfry
Message:

we should look at the _value_ of disable.collection.building, not just check if it's set

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r20290 r20464  
    6969    <property file="${user.home}/build.properties"/> 
    7070  </if> 
     71 
     72  <!-- now we've read in properties, apply defaults --> 
     73  <property name="disable.collection.building" value="false"/> 
    7174 
    7275  <!-- get properties from the environment --> 
     
    187190   
    188191  <condition property="collection.building.disabled"> 
    189     <isset property="disable.collection.building"/> 
     192    <and> 
     193      <isset property="disable.collection.building"/> 
     194      <istrue value="${disable.collection.building}"/> 
     195    </and> 
    190196  </condition> 
    191197 
    192198  <condition property="collection.building.enabled"> 
    193199    <not> 
    194       <isset property="disable.collection.building"/> 
     200      <istrue value="${disable.collection.building}"/> 
    195201    </not> 
    196202  </condition> 
     
    198204  <condition property="collection.building.enabled.windows"> 
    199205    <and> 
    200       <isset property="collection.building.enabled"/> 
     206      <istrue value="${collection.building.enabled}"/> 
    201207      <isset property="current.os.iswindows"/> 
    202208    </and> 
     
    205211  <condition property="collection.building.enabled.unix"> 
    206212    <and> 
    207       <isset property="collection.building.enabled"/> 
     213      <istrue value="${collection.building.enabled}"/> 
    208214      <isset property="current.os.isunix"/> 
    209215    </and> 
     
    227233 
    228234  <condition property="common.src.home" value="${basedir}/common-src" else="${gs2build.home}/common-src"> 
    229     <isset property="disable.collection.building"/> 
     235    <istrue value="${disable.collection.building}"/> 
    230236  </condition> 
    231237