fix macos cmake arch var to allow overriding via command line

only generate fat if compiler supports it
port back some workflow fixes
add aarch64 support to info template
min-api update

Author: Robert Ramirez

.github/workflows/main.yml

@@ -1,6 +1,9 @@
 name: Release
 
 on:
+  create:
+    tags:
+      - v*
   workflow_dispatch:
 
 jobs:
@@ -9,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, windows-latest]
-        config: [debug, release]
+        config: [release]
 
     steps:
     - uses: actions/checkout@v2
@@ -24,7 +27,7 @@ jobs:
 
     - name: configure_macos
       if: matrix.os == 'macos-latest'
-      run: mkdir build && cd build && cmake -G Xcode ..
+      run: mkdir build && cd build && cmake -G Xcode .. "-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64"
 
     - name: configure_windows
       if: matrix.os == 'windows-latest'
@@ -69,6 +72,7 @@ jobs:
         if [ -d java-classes ]; then cp -r java-classes $PACKAGE_NAME; fi
         if [ -d java-doc ]; then cp -r java-doc $PACKAGE_NAME; fi
         if [ -d javascript ]; then cp -r javascript $PACKAGE_NAME; fi
+        if [ -d jsextensions ]; then cp -r jsextensions $PACKAGE_NAME; fi
         if [ -d jsui ]; then cp -r jsui $PACKAGE_NAME; fi
         if [ -d media ]; then cp -r media $PACKAGE_NAME; fi
         if [ -d misc ]; then cp -r misc $PACKAGE_NAME; fi
@@ -101,9 +105,16 @@ jobs:
   release:
     runs-on: ubuntu-latest
     needs: package
-    if: ${{ contains( github.ref, 'refs/tags/' ) }}
 
     steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
+        fetch-depth: '0'
+        
+    - uses: battila7/get-version-action@v2
+      id: get_version
+
     - uses: benjlevesque/[email protected]
       id: short-sha
       with:
@@ -119,15 +130,15 @@ jobs:
       working-directory: ${{ github.event.repository.name }}
 
     - name: zip
-      run: zip -r ${{ github.event.repository.name }}-package-for-max-${{ steps.short-sha.outputs.sha }}.zip ${{ github.event.repository.name }}
+      run: zip -r ${{ github.event.repository.name }}-package-for-max-${{ steps.get_version.outputs.version }}.zip ${{ github.event.repository.name }}
 
     - uses: actions/upload-artifact@v2
       with:
-        name: ${{ github.event.repository.name }}-${{ steps.short-sha.outputs.sha }}-zipped-release
-        path: ${{ github.event.repository.name }}-package-for-max-${{ steps.short-sha.outputs.sha }}.zip
+        name: ${{ github.event.repository.name }}-${{ steps.get_version.outputs.version }}-zipped-release
+        path: ${{ github.event.repository.name }}-package-for-max-${{ steps.get_version.outputs.version }}.zip
 
     - uses: ncipollo/release-action@v1
       with:
-        artifacts: ${{ github.event.repository.name }}-package-for-max-${{ steps.short-sha.outputs.sha }}.zip
+        artifacts: ${{ github.event.repository.name }}-package-for-max-${{ steps.get_version.outputs.version }}.zip
         body: "Max Package for all supported platforms"
         token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

@@ -7,7 +7,7 @@ on:
       - develop
   pull_request:
     branches: 
-      - master
+      - main
       - develop
   workflow_dispatch:
 

CMakeLists.txt

@@ -5,16 +5,25 @@ enable_testing()
 
 string(REGEX REPLACE "(.*)/" "" THIS_PACKAGE_NAME "${CMAKE_CURRENT_SOURCE_DIR}")
 
-set(CMAKE_OSX_ARCHITECTURES x86_64;arm64)
-
-
-if (${CMAKE_GENERATOR} MATCHES "Xcode")
-         if (${XCODE_VERSION} VERSION_LESS 10)
-              message(STATUS "Xcode 10 or higher is required. Please install from the Mac App Store.")
-            return ()
-        endif ()
-endif ()
+if (APPLE)
+    if (${CMAKE_GENERATOR} MATCHES "Xcode")
+            if (${XCODE_VERSION} VERSION_LESS 10)
+                message(STATUS "Xcode 10 or higher is required. Please install from the Mac App Store.")
+                return ()
+            elseif(${XCODE_VERSION} VERSION_GREATER_EQUAL 12)
+                set(C74_BUILD_FAT YES)
+            endif ()
+    endif ()
 
+    if (NOT CMAKE_OSX_ARCHITECTURES)
+        if(C74_BUILD_FAT)
+            set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "macOS architecture" FORCE)
+        else()
+            set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "macOS architecture" FORCE)
+        endif()
+    endif()
+    message("CMAKE_OSX_ARCHITECTURES set to ${CMAKE_OSX_ARCHITECTURES}")
+endif()
 
 # Fetch the correct version of the min-api
 message(STATUS "Updating Git Submodules")

package-info.json.in

@@ -6,7 +6,7 @@
 	"name" : "@C74_PACKAGE_NAME@",
 	"os" : {
 		"macintosh" : {
-			"platform" : [ "x64" ],
+			"platform" : [ "x64", "aarch64" ],
 			"min_version" : "none"
 		},
 		"windows" : {