Changeset 35514

Timestamp:

2021-09-28T19:26:35+13:00 (3 years ago)

Author:

anupama

Message:

Now that checkout.gnomelib.ext is set to true by default in build.properties.svn, make sure that when on Windows, it's not checked out nor compile flags set for it, nor any attempt to compile it up.

File:

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

main/trunk/greenstone3/build.xml

@@ -718 +718 @@
 
   <!-- if we're told to work with gnome-lib, or if there's a gnome-lib-minimal that the user
-       has placed in gs2build/ext, then compile gs2build after sourcing gnome-lib environment -->
+       has placed in gs2build/ext, then compile gs2build after sourcing gnome-lib environment.
+       But don't do anything with gnomelib on windows.
+  -->
   <condition property="opt.gnomelibext.arg" 
          value="--enable-gnome-lib-ext" else=" ">
-    <or>
-      <available file="${gs2build.home}/ext/gnome-lib-minimal" type="dir"/>
-      <istrue value="${use.gnomelib.ext}"/>
-      <istrue value="${checkout.gnomelib.ext}"/>
-    </or>
+    <and>
+      <istrue value="${current.os.isunix}"/>
+      <or>
+    <available file="${gs2build.home}/ext/gnome-lib-minimal" type="dir"/>
+    <istrue value="${use.gnomelib.ext}"/>
+    <istrue value="${checkout.gnomelib.ext}"/>
+      </or>
+    </and>    
    </condition>
 
@@ -4060 +4065 @@
 
 
-  <!-- Compile up gnome-lib src folder if: checkout.gnomelib.ext is turned on, and if not using the binary
-       version (gnome-lib-minimal), and if the gnome-lib src folder is not already compiled up. -->
-  <target name="compile-gnome-lib" if="checkout.gnomelib.ext">
+  <!-- If not on windows, then compile up gnome-lib src folder if:
+       checkout.gnomelib.ext is turned on,
+       and if not using the binary version (gnome-lib-minimal), 
+       and if the gnome-lib src folder is not already compiled up. -->
+  <target name="compile-gnome-lib" if="checkout.gnomelib.ext" unless="current.os.iswindows">
 
     <!-- http://stackoverflow.com/questions/3290307/sourcing-a-shell-profile-in-an-ant-build-file 
@@ -4122 +4129 @@
     <if>
       <bool>
-    <istrue value="${checkout.gnomelib.ext}"/>
+    <and>
+      <istrue value="${checkout.gnomelib.ext}"/>
+      <istrue value="${current.os.isunix}"/>
+    </and>
       </bool>
 
@@ -4130 +4140 @@
       <else>
     <echo>**** Not preparing gnome-lib:</echo>
-    <echo>property checkout.gnomelib.ext in build.properties was not set or was set to false</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>