Changeset 34573

Timestamp:

2020-11-28T19:35:56+13:00 (3 years ago)

Author:

anupama

Message:

On Mojave, but not before, the IsisGdl.macleopard on caveat page does not work (32 bit instead of 64 bit, for one, and I think Dr Bainbridge said that from Mojave we notice that Mac is no longer backwards compatible with 32 bit binaries). The IsisGdl generated by GS3 compiled on Mojave does work. So for the release compiled on Mojave, don't want to specially grab the macleopard IsisGdl on caveat and break the working one that got compiled up. The quickest fix to hopefully get and continue testing a working binary is to not to execute the specific target that grabs an IsisGdl from the caveat page if we're on mac.

File:

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

main/trunk/greenstone3/build.xml

@@ -1571 +1571 @@
 
   <!-- 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 -->
-  <target name="get-isisgdl" if="${current.os.isunix}">
+       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}">
     <exec executable="uname" dir="${basedir}" failonerror="false"
       outputproperty="uname.val">