Merge pull request #39 from ales-erjavec/macos-arm64

Bring changes connected to renaming arm orange and changing running to master

.cirrus.yml

@@ -4,8 +4,8 @@ macos_arm64_dmg_task:
   env:
     REPO: https://github.com/biolab/orange3.git
     BUILD_BRANCH: master
-    BUILD_COMMIT: 3.36.0
-    APP: "/Applications/Orange3.app"
+    BUILD_COMMIT: 3.36.1
+    APP: "/Applications/Orange.app"
 
     PYTHON_VERSION: 3.9.12
     PIP_PREFER_BINARY: "1"
@@ -45,7 +45,7 @@ macos_arm64_dmg_task:
   test_script:
     - mkdir -p ~/Applications
     - mv -f $APP ~/Applications/
-    - APP=( ~/Applications/Orange3.app )
+    - APP=( ~/Applications/$(basename $APP) )
     - $APP/Contents/MacOS/python --version
     - $APP/Contents/MacOS/pip --version
     - $APP/Contents/MacOS/pip freeze

scripts/macos/arm64.patch

@@ -15,13 +15,15 @@
 # Patch Orange startup script to force arm46 execution
 --- a/Contents/MacOS/Orange
 +++ b/Contents/MacOS/Orange
-@@ -1,2 +1,2 @@
--#!/bin/bash
-+#!/usr/bin/arch -arm64 /bin/bash
+@@ -1,2 +1,4 @@
+ #!/bin/bash
++
++export ARCHPREFERENCE=arm64
 
 # Patch pip startup script to force arm46 execution
 --- a/Contents/MacOS/pip
 +++ b/Contents/MacOS/pip
-@@ -1,2 +1,2 @@
--#!/bin/bash
-+#!/usr/bin/arch -arm64 /bin/bash
+@@ -1,2 +1,4 @@
+ #!/bin/bash
++
++export ARCHPREFERENCE=arm64

scripts/macos/create-dmg-installer.sh

@@ -57,8 +57,11 @@ echo "============================================="
 
 mkdir -p "${TMP_TEMPLATE}"/
 
+BASENAME=$(basename $APP)
+echo "Copying the app ${BASENAME}"
+
 # Copy the .app directory in place
-cp -a "${APP}" "${TMP_TEMPLATE}"/Orange3.app
+cp -a "${APP}" "${TMP_TEMPLATE}"/"${BASENAME}"
 
 mkdir -p "$(dirname "${DMG}")"
 
@@ -79,8 +82,8 @@ create-dmg \
   --window-size 400 244 \
   --icon-size 75 \
   --text-size 12 \
-  --hide-extension "Orange3.app" \
-  --icon "Orange3.app" 95 125 \
+  --hide-extension "${BASENAME}" \
+  --icon "${BASENAME}" 95 125 \
   --app-drop-link 305 125 \
   ${EXTRA_DS_STORE[*]} \
   "${DMG}" \