Changeset 34608

Timestamp:

2020-12-16T20:43:06+13:00 (3 years ago)

Author:

anupama

Message:

Minimum change to get isisgdl to work for the final GS3 release without breaking linux 64 bit or windows or 32 bit linux by changing over to Dr Bainbridge's new isis-gdl source code: switched over to downloading IsisGdl.mac64mojave when the OS is mojave. Still untested on Catalina, but this is for building the rk3 release-kit with the correct IsisGdl binary anyway. And if it doesn't work on Catalina, it's no worse off as no IsisGdl binary worked on Catalina before and this change won't have broken it for other OS-es. Already uploaded IsisGdl.mac64mojave onto the old and new greenstone.org machines

File:

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

main/trunk/greenstone3/build.xml

@@ -1596 +1596 @@
       <echo>Bitness: ${uname.val}</echo>
       <if><bool><contains string="${os.bin.dir}" substring="darwin" casesensitive="false"/></bool>
+    <exec executable="uname" dir="${basedir}" failonerror="false"
+          outputproperty="darwin.kernel.version">
+      <arg value="-r"/>
+    </exec>
+    
+    <echo>darwin kernel version: ${darwin.kernel.version}</echo>
+    <!-- up to high sierra/kernel (version 17.x) us IsisGdl.macleopard
+         From Mojave onwards, we can use the Mojave generated IsisGdl.mac64mojave -->
+    <if>
+      <bool><matches string="${darwin.kernel.version}" pattern="^([0-9]|1[0-7])\."/></bool>
+      <property name="mac.isisgdl.suffix" value="macleopard"/>
+      <else>
+        <property name="mac.isisgdl.suffix" value="mac64mojave"/>
+      </else>      
+    </if>   
+
+
     <!--<get src="${gsorg.root}/caveat-emptor/IsisGdl.macleopard"
              dest="${basedir}/gs2build/bin/${os.bin.dir}/IsisGdl"/>-->
@@ -1602 +1619 @@
       <arg value="${basedir}/gs2build/bin/${os.bin.dir}"/>
       <arg value="--no-check-certificate"/>
-      <arg value="${gsorg.root}/caveat-emptor/IsisGdl.macleopard"/>
+      <arg value="${gsorg.root}/caveat-emptor/IsisGdl.${mac.isisgdl.suffix}"/>
     </exec>
-    <move file="${basedir}/gs2build/bin/${os.bin.dir}/IsisGdl.macleopard"
+    <move file="${basedir}/gs2build/bin/${os.bin.dir}/IsisGdl.${mac.isisgdl.suffix}"
           tofile="${basedir}/gs2build/bin/${os.bin.dir}/IsisGdl"/>
       </if>