Fixed macOS bindist launcher asking for Rosetta

git-svn-id: https://svn.code.sf.net/p/vice-emu/code/trunk@45911 379a1393-f5fb-40a0-bcee-ef074d9b53f7

Author: dqh-au

vice/src/arch/shared/Makefile.am

@@ -44,6 +44,16 @@ AM_LDFLAGS = @VICE_LDFLAGS@
 
 noinst_LIBRARIES = libarchdep.a
 
+if MACOS_COMPILE
+# Build native wrapper executable used by macOS apps
+noinst_PROGRAMS = macOS-launcher
+macOS_launcher_SOURCES = macOS-launcher.c
+# Don't link this launcher app to the usual deps
+macOS-launcher$(EXEEXT): CPPFLAGS =
+macOS-launcher$(EXEEXT): CFLAGS =
+macOS-launcher$(EXEEXT): LDFLAGS =
+endif
+
 libarchdep_a_SOURCES = \
 	archdep_access.c \
 	archdep_boot_path.c \
@@ -266,4 +276,9 @@ EXTRA_DIST = \
 	uiactions.h \
 	README-bindist.txt
 
+if !MACOS_COMPILE
+# Distribute the native launcher source on non-macOS platforms
+EXTRA_DIST += macOS-launcher.c
+endif
+
 # FIXME: the Extra MacOS script stuff should live elsewhere

vice/src/arch/shared/macOS-launcher.c

@@ -0,0 +1,74 @@
+/*
+ * macOS-launcher.c - Native wrapper for the macOS launcher bash script
+ *
+ * This file is part of VICE, the Versatile Commodore Emulator.
+ * See README for copyright notice.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ *  02111-1307  USA.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <libgen.h>
+#include <limits.h>
+
+int main(int argc, char *argv[])
+{
+    /*
+     * This exists to ensure that macOS doesn't think Rosetta 2 is needed
+     * to run the bash script launcher. It simply finds the path to the
+     * bash script (which is in the same directory as this executable) and
+     * execs it with the same arguments.
+     */
+
+    char exe_path[PATH_MAX];
+    char real_path[PATH_MAX];
+    char script_path[PATH_MAX];
+    char *exe_dirname;
+    char *exe_filename;
+    uint32_t size = sizeof(exe_path);
+    
+    /* Get the path to this executable \*/
+    if (_NSGetExecutablePath(exe_path, &size) != 0) {
+        fprintf(stderr, "Error: Could not determine executable path\n");
+        return 1;
+    }
+    
+    /* Resolve symlinks */
+    if (realpath(exe_path, real_path) == NULL) {
+        fprintf(stderr, "Error: Could not resolve executable path\n");
+        return 1;
+    }
+    
+    /* Split into dirname and basename */
+    exe_dirname  = dirname(real_path);
+    exe_filename = basename(real_path);
+    
+    /* Build path to the bash script (same directory as this executable) */
+    snprintf(script_path, sizeof(script_path), "%s/../Resources/%s.sh", exe_dirname, exe_filename);
+    
+    /* Replace argv[0] with the script path */
+    argv[0] = script_path;
+    
+    /* Execute the bash script */
+    execv(script_path, argv);
+    
+    /* If we get here, execv failed */
+    perror("Error executing launcher script");
+    return 1;
+}

vice/src/arch/shared/macOS-launcher.sh

@@ -40,7 +40,7 @@ if [[ "$1" == "--program" && -n "$2" ]]; then
   shift 2
 fi
 
-ROOT_DIR="$(cd "$(dirname "$0")" && pwd -P)/../Resources"
+ROOT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 
 cd "$ROOT_DIR"
 source "./bin/common-runtime.sh"

vice/src/arch/shared/make-bindist_osx.sh

@@ -266,7 +266,7 @@ make_app_bundle() {
   rm -rf "$app_path"
 
   # 2) Install launcher
-  if [[ "$app_launcher" == *.applescript ]]; then  
+  if [[ "$app_launcher" == *.applescript ]]; then
     osacompile -o "$app_path" "$app_launcher"
     app_exe_filename=droplet
 
@@ -284,14 +284,22 @@ make_app_bundle() {
     cp "$TOP_DIR/data/common/vice-${src_icon_name}_256.png" "$resources/VICE.iconset/icon_256x256.png"
     iconutil -c icns "$resources/VICE.iconset" -o "$resources/$icon_name"
     rm -rf "$resources/VICE.iconset"
-  else
+  elif [[ "$app_launcher" == *.sh ]]; then
     mkdir -p "$macos"
-    cp "$app_launcher" "$macos/$app_name"
-    chmod +x "$macos/$app_name"
 
-    # Install icon
+    # A native wrapper is needed for macOS to not think it needs Rosetta
+    cp src/arch/shared/macOS-launcher "$macos/$app_name"
+
+    # Move shell script to Resources to avoid code signing issues
     mkdir -p "$resources"
+    cp "$app_launcher" "$resources/${app_name}.sh"
+    chmod +x "$resources/${app_name}.sh"
+
+    # Install icon
     cp "$RUN_PATH/Resources/VICE.icns" "$resources/$icon_name"
+  else
+    >&2 echo "ERROR: Unknown launcher type: $app_launcher"
+    exit 1
   fi
 
   # 3) Minimal Info.plist
@@ -323,12 +331,11 @@ make_app_bundle() {
   <array>
     <dict>
       <key>CFBundleTypeName</key><string>VICE Files</string>
-      <key>CFBundleTypeRole</key><string>Viewer</string> <!-- or Editor if you really want -->
+      <key>CFBundleTypeRole</key><string>Viewer</string>
       <key>CFBundleTypeExtensions</key>
       <array>
-        $(for ext in $DROP_EXTENSIONS; do printf '        <string>%s</string>\n' "$ext"; done)
+$(for ext in $DROP_EXTENSIONS; do printf '        <string>%s</string>\n' "$ext"; done)
       </array>
-      <!-- optional: <key>LSHandlerRank</key><string>Default</string> -->
     </dict>
   </array>
 </dict>
@@ -513,7 +520,7 @@ elif [ "$UI_TYPE" = "GTK3" ]; then
   # Keep only the necessary GTK schemas
   TMPDIR=$(mktemp -d)
   mv "$APP_SHARE/glib-2.0/schemas/org.gtk.Settings."*.xml $TMPDIR/
-  rm "$APP_SHARE/glib-2.0/schemas/"*.xml
+  find "$APP_SHARE"/glib-2.0/schemas/ -name "*.xml" -exec rm {} \;
   mv $TMPDIR/* "$APP_SHARE/glib-2.0/schemas/"
   rmdir $TMPDIR
   glib-compile-schemas "$APP_SHARE/glib-2.0/schemas"
@@ -730,8 +737,25 @@ code_sign_file () {
     # Ad-hoc signing
     codesign --force --sign - -f "$1"
   else
-    # Signing with provided identity
-    codesign -s "$CODE_SIGN_ID" --timestamp --options runtime -f "$1"
+    # Signing with provided identity. Can intermittently fail due to server allocated timestamps.
+    local codesign_succeeded=false
+    for in in $(seq 1 4)
+    do
+      if codesign -s "$CODE_SIGN_ID" --timestamp --options runtime -f "$1"
+      then
+        codesign_succeeded=true
+        break
+      else
+        >&2 echo "Codesign failed, will retry"
+        sleep 1
+      fi
+    done
+
+    if ! $codesign_succeeded
+    then
+      >&2 echo "Codesign failed, giving up"
+      false
+    fi
   fi
 }