Changeset 35523 for main/trunk

Timestamp:

2021-09-29T15:25:27+13:00 (3 years ago)

Author:

anupama

Message:

Ant target prepare-gnome-lib updated to display a message that it essentially does nothing on Windows. Follows Dr Bainbridge's pseudocode for conditional structure.

File:

• main/trunk/greenstone3/build.xml (modified) (1 diff)

main/trunk/greenstone3/build.xml

@@ -4128 +4128 @@
   <target name="prepare-gnome-lib" depends="init" if="collection.building.enabled" unless="gnome-lib.present">
     <if>
-      <bool>
-    <and>
-      <istrue value="${checkout.gnomelib.ext}"/>
-      <istrue value="${current.os.isunix}"/>
-    </and>
-      </bool>
-
-      <antcall target="checkout-gnome-lib"/>
-      <!--Compilation of gnome-lib happens during ant install, just before configuring (common-src and) build-src-->
-
+      <bool><istrue value="${checkout.gnomelib.ext}"/></bool>
+      <if>
+    <bool><istrue value="${current.os.iswindows}"/></bool>
+    
+    <echo>Skipping prepare-gnome-lib, because compilation is on Windows which checks out binaries that do not rely on gnomelib</echo>
+    <else>
+      <!-- current.os.isunix -->
+
+      <antcall target="checkout-gnome-lib"/>
+      <!--Compilation of gnome-lib happens during ant install, just before configuring (common-src and) build-src-->
+      
+    </else>
+      </if>
       <else>
-    <echo>**** Not preparing gnome-lib:</echo>
-    <echo>property checkout.gnomelib.ext in build.properties was not set or was set to false, or OS is not unix.</echo>
-      </else>
+    <if><bool><istrue value="${current.os.isunix}"/></bool>
+      <!-- current.os.isunix and checkout.gnomelib.ext not turned on -->
+      <echo>**** Not preparing gnome-lib:</echo>
+      <echo>property checkout.gnomelib.ext in build.properties was not set or was set to false.</echo>
+    </if>
+      </else>      
     </if>
   </target>