Changeset 34587 for main/trunk/release-kits/kits/rk3

Timestamp:

2020-12-06T02:35:52+13:00 (3 years ago)

Author:

anupama

Message:

Working with separate folders (MacShortcuts32bit and MacShortcuts64bit) of .app mac shortcuts that work on Mojave and earlier, versus those that work on Catalina (and hopefully later). Catalina only likes .app built on Catalina not earlier machines, presumably this is because it's not backwards compatible with any 32 bit binary inside the .app folder, but Mojave doesn't like the 64 bit version built on Catalina. Since Mojave works with the (32 bit) versions built on a much earlier MacOS, everything before and upto Mojave is left to work with those. This rk3 installer change goes with the commit 34585 of changes in GS3's main build.xml and 2 folders of the older .app and newer (Catalina) .app files.

File:

• main/trunk/release-kits/kits/rk3/installer/build.xml (modified) (2 diffs)

main/trunk/release-kits/kits/rk3/installer/build.xml

@@ -176 +176 @@
         <!-- if windows|linux -->
         <echo>Deleting mac shortcuts</echo>
-        <delete dir="${installDir}/gs3-server.app"/>
-        <delete dir="${installDir}/gli.app"/>
-        <delete dir="${installDir}/client-gli.app"/>
-        <delete dir="${installDir}/gems.app"/>
+        
+        <!-- from now on, we have 64 bit .app as well as 32 bit .app files in their own separate folders.
+          One or more of these folders or .app files won't exist, so don't fail on error if they can't be deleted for that reason -->
+        <delete failonerror="false" dir="${installDir}/MacShortcuts64bit"/>
+        <delete failonerror="false" dir="${installDir}/MacShortcuts32bit"/>
         <!-- /if -->        
         
         <!-- if mac -->
         <echo>Installing Mac Shortcuts</echo>
+        <!-- convert template document.wflow.in files inside the .app mac shortcuts into their live files -->
         <ant dir="${installDir}" antfile="build.xml" target="gen-mac-shortcuts" inheritAll="false" />
+
         <!-- need to give executable permissions to the Mac shortcuts -->
         <chmod file="${installDir}/gs3-server.app/Contents/MacOS/gs2-server" perm="775"/><!--called gs2-server, since the gs3-server.app is a copy of the one generated for gs2-->
@@ -191 +194 @@
         <chmod file="${installDir}/gems.app/Contents/MacOS/gems" perm="775"/>
 
+        <!-- From Catalina (Darwin kernel version 19.x onwards) the executables are called: Application Stub -->        
+        <chmod file="${installDir}/gs3-server.app/Contents/MacOS/Application Stub" perm="775"/>
+        <chmod file="${installDir}/gli.app/Contents/MacOS/Application Stub" perm="775"/>
+        <chmod file="${installDir}/client-gli.app/Contents/MacOS/Application Stub" perm="775"/>
+        <chmod file="${installDir}/gems.app/Contents/MacOS/Application Stub" perm="775"/>
+
         <!--<chmod dir="${installDir}" includes="*.app" perm="755"/>
         <chmod dir="${installDir}" includes="*.app/**/*" perm="755"/>-->
 
+        <!-- can get rid of the shortcuts folders -->
+        <delete failonerror="false" dir="${installDir}/MacShortcuts64bit"/>
+        <delete failonerror="false" dir="${installDir}/MacShortcuts32bit"/>
         <!-- /if -->