Changeset 34584 for main/trunk/greenstone3/build.xml

Timestamp:

2020-12-05T22:00:33+13:00 (3 years ago)

Author:

anupama

Message:

The Catalina generated .app shortcuts do not work on Mojave, though both are 64 bit, so can't have local release-kit modifications. Instead, the original .app shortcuts (folders) that worked up to and including Mojave (darwin kernel version 18.*, as found by doing uname -r) are now in MacShortcuts32bit. The Catalina generated .app folders are in MacShortcuts64bit

File:

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

main/trunk/greenstone3/build.xml

@@ -9 +9 @@
 <project name="greenstone3" default="usage" basedir=".">
   <echo>os.name: ${os.name}</echo>
-  
+  <!--
+      <echo>os.arch: ${os.arch}</echo>
+      <echo>os.version: ${os.version}</echo>
+      -->
+
   <!-- ============ classpath =================== -->
   <path id="project.classpath">
@@ -4250 +4254 @@
   <!-- for macs, set up the .app shortcuts to gsi, gli, client-gli and gems -->
   <target name="gen-mac-shortcuts">    
+    <exec executable="uname" dir="${basedir}" failonerror="false"
+      outputproperty="darwin.kernel.version">
+      <arg value="-r"/>
+    </exec>
+
+    <echo>darwin kernel version: ${darwin.kernel.version}</echo>
+
+    <if>
+      <bool><matches string="${darwin.kernel.version}" pattern="^([0-9]|1[0-8])\."/></bool>
+      <property name="mac.app.bitness" value="32"/>
+      <else>
+    <property name="mac.app.bitness" value="64"/>
+      </else>      
+    </if>
+
+    <echo>bitness for mac apps: ${mac.app.bitness}</echo>
+
+    <!--(recursively) copy the .app files from the MacShortcutsXbit folder of the correct bitness 
+      https://stackoverflow.com/questions/1685442/how-to-copy-a-directory-using-ant -->
+    <copy todir="${basedir}" >  
+      <fileset dir="${basedir}/MacShortcuts${mac.app.bitness}bit" includes="**"/>  
+    </copy> 
+
     <if><bool><istrue value="${current.os.ismac}"/></bool>
       <filter token="gsdl3srchome" value="${basedir}"/>