Ignore:
Timestamp:
2020-12-05T22:00:33+13:00 (22 months 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:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r34574 r34584  
    99<project name="greenstone3" default="usage" basedir=".">
    1010  <echo>os.name: ${os.name}</echo>
    11  
     11  <!--
     12      <echo>os.arch: ${os.arch}</echo>
     13      <echo>os.version: ${os.version}</echo>
     14      -->
     15
    1216  <!-- ============ classpath =================== -->
    1317  <path id="project.classpath">
     
    42504254  <!-- for macs, set up the .app shortcuts to gsi, gli, client-gli and gems -->
    42514255  <target name="gen-mac-shortcuts">   
     4256    <exec executable="uname" dir="${basedir}" failonerror="false"
     4257      outputproperty="darwin.kernel.version">
     4258      <arg value="-r"/>
     4259    </exec>
     4260
     4261    <echo>darwin kernel version: ${darwin.kernel.version}</echo>
     4262
     4263    <if>
     4264      <bool><matches string="${darwin.kernel.version}" pattern="^([0-9]|1[0-8])\."/></bool>
     4265      <property name="mac.app.bitness" value="32"/>
     4266      <else>
     4267    <property name="mac.app.bitness" value="64"/>
     4268      </else>     
     4269    </if>
     4270
     4271    <echo>bitness for mac apps: ${mac.app.bitness}</echo>
     4272
     4273    <!--(recursively) copy the .app files from the MacShortcutsXbit folder of the correct bitness
     4274      https://stackoverflow.com/questions/1685442/how-to-copy-a-directory-using-ant -->
     4275    <copy todir="${basedir}" > 
     4276      <fileset dir="${basedir}/MacShortcuts${mac.app.bitness}bit" includes="**"/> 
     4277    </copy>
     4278
    42524279    <if><bool><istrue value="${current.os.ismac}"/></bool>
    42534280      <filter token="gsdl3srchome" value="${basedir}"/>
Note: See TracChangeset for help on using the changeset viewer.