Changeset 23857 for main/trunk/greenstone3/build.xml

Timestamp:

2011-04-06T15:42:21+12:00 (13 years ago)

Author:

ak19

Message:

1. Slight adjustment to previous commit: the test is no longer for the existence of gs2build's build-src, but the existence of gs2build itself. If gs2build does not exist, then perl.path will be set to the empty string. 2. Previous commit: if, outside build.properties, we only set perl.path if we have gs2build/build-src (collection building), then we won't set perl.path in a (flax) binary, since it doesn't have build-src

File:

• main/trunk/greenstone3/build.xml (modified) (2 diffs)

main/trunk/greenstone3/build.xml

@@ -560 +560 @@
          is on environment PATH -->
     <!-- if, outside build.properties, we only set perl.path if we have gs2build/build-src (collection building), then we won't set perl.path in a (flax) binary, since it doesn't have build-src -->
-    <!--<if><bool><available file="${build.src.home}"/></bool>-->
+    <if><bool><available file="${gs2build.home}"/></bool>
 
       <if><bool><not><isset property="perl.path"/></not></bool>
@@ -602 +602 @@
         </else>
       </if>
-    <!-- </if>-->
+
+      <!-- gs2build not available, perl.path -->
+      <else>
+    <property name="perl.path" value=""/>
+      </else>
+    </if>
   </target>