Changeset 34574

Timestamp:

2020-11-29T15:59:31+13:00 (3 years ago)

Author:

anupama

Message:

Undoing commit 34573, as Mojave was still fine with the mac leopard generated 32 bit IsisGdl (I wrongly thought I had tested the Mojave 64 bit IsisGdl and that it worked), whereas the 64 bit IsisGdl generated on Mojave does not appear to work on Mojave or Catalina. So as the 32 bit worked on more MacOS, and the 64 bit doesn't (yet) work any known Mac OS, putting it back. Testing other tutorials, as they're not affected by this single binary

File:

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

main/trunk/greenstone3/build.xml

@@ -1569 +1569 @@
     <echo>collection solr-jdbm-demo installed</echo>
   </target>
-
+  
   <!-- Until 64 bit Linux and Mac (Lion) machines can generate a working IsisGdl, 
-       use the ones generated on a 32 bit Linux and Mac (Leopard), respectively When compiling Greenstone on Mojave and onwards, don't want Isis.macleopard
-as its bitness (32) is wrong and the one generated during GS compilation works.
--->
-  <target name="get-isisgdl" if="${current.os.isunixnotmac}">
+       use the ones generated on a 32 bit Linux and Mac (Leopard), respectively
+    -->
+  <target name="get-isisgdl" if="${current.os.isunix}">
     <exec executable="uname" dir="${basedir}" failonerror="false"
       outputproperty="uname.val">