Changeset 20464 for greenstone3/trunk/build.xml

Timestamp:

2009-09-01T13:59:08+12:00 (15 years ago)

Author:

oranfry

Message:

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

File:

• greenstone3/trunk/build.xml (modified) (5 diffs)

greenstone3/trunk/build.xml

@@ -69 +69 @@
     <property file="${user.home}/build.properties"/>
   </if>
+
+  <!-- now we've read in properties, apply defaults -->
+  <property name="disable.collection.building" value="false"/>
 
   <!-- get properties from the environment -->
@@ -187 +190 @@
   
   <condition property="collection.building.disabled">
-    <isset property="disable.collection.building"/>
+    <and>
+      <isset property="disable.collection.building"/>
+      <istrue value="${disable.collection.building}"/>
+    </and>
   </condition>
 
   <condition property="collection.building.enabled">
     <not>
-      <isset property="disable.collection.building"/>
+      <istrue value="${disable.collection.building}"/>
     </not>
   </condition>
@@ -198 +204 @@
   <condition property="collection.building.enabled.windows">
     <and>
-      <isset property="collection.building.enabled"/>
+      <istrue value="${collection.building.enabled}"/>
       <isset property="current.os.iswindows"/>
     </and>
@@ -205 +211 @@
   <condition property="collection.building.enabled.unix">
     <and>
-      <isset property="collection.building.enabled"/>
+      <istrue value="${collection.building.enabled}"/>
       <isset property="current.os.isunix"/>
     </and>
@@ -227 +233 @@
 
   <condition property="common.src.home" value="${basedir}/common-src" else="${gs2build.home}/common-src">
-    <isset property="disable.collection.building"/>
+    <istrue value="${disable.collection.building}"/>
   </condition>