Merge https://github.com/supertuxkart/stk-code 1.4 (412f30d) into com…

…mand-manager-prototype

.github/workflows/apple.yml

@@ -131,8 +131,19 @@ jobs:
           echo "${{ env.release_pre }}"
       - name: Download binaries
         uses: actions/download-artifact@v2
-      - name: Run dylibbundler and archive
+      - name: Mask developer name
+        run: |
+          echo "::add-mask::${{ secrets.MAC_DEVELOPER_NAME }}"
+      - name: Import certificates
+        if: ${{ env.release_tag != '' }}
+        uses: apple-actions/import-codesign-certs@v1
+        with:
+          p12-file-base64: ${{ secrets.MAC_DEVELOPER_ID_P12_FILE }}
+          p12-password: ${{ secrets.MAC_DEVELOPER_ID_P12_PASSWORD }}
+      - name: Run dylibbundler and sign STK
         if: ${{ env.release_tag != '' }}
+        env:
+          developer_id: "Developer ID Application: ${{ secrets.MAC_DEVELOPER_NAME }} (${{ secrets.MAC_DEVELOPER_TEAM }})"
         run: |
           wget https://github.com/supertuxkart/dependencies/releases/download/preview/dependencies-macosx.tar.xz
           tar xf dependencies-macosx.tar.xz
@@ -148,10 +159,20 @@ jobs:
           rm stk-assets-full.zip
           cd ../../../../..
           mv ./macosx-arm64/supertuxkart.app SuperTuxKart.app
-          # Use Ad Hoc certificate for now, use Apple developer certificate after STK is on App Store later
-          codesign --force -s - SuperTuxKart.app/Contents/libs/*.dylib
-          codesign --force --deep -s - SuperTuxKart.app
-          zip -r SuperTuxKart-${{ env.release_tag }}-mac.zip SuperTuxKart.app
+          codesign --force --sign "$developer_id" SuperTuxKart.app/Contents/libs/*.dylib
+          codesign --force --options=runtime --deep --sign "$developer_id" SuperTuxKart.app
+      - name: "Notarize release build"
+        if: ${{ env.release_tag != '' && github.ref != 'refs/heads/master' }}
+        run: |
+          ditto -c -k --sequesterRsrc --keepParent SuperTuxKart.app tmp.zip
+          xcrun notarytool submit tmp.zip --apple-id ${{ secrets.STK_NOTARIZATION_USERNAME }} \
+                                          --password ${{ secrets.STK_NOTARIZATION_PASSWORD }} \
+                                          --team-id ${{ secrets.MAC_DEVELOPER_TEAM }} --wait
+          xcrun stapler staple SuperTuxKart.app
+      - name: Archive
+        if: ${{ env.release_tag != '' }}
+        run: |
+          ditto -c -k --sequesterRsrc --keepParent SuperTuxKart.app SuperTuxKart-${{ env.release_tag }}-mac.zip
       - name: Create release
         if: ${{ env.release_tag != '' }}
         uses: ncipollo/[email protected]

android/make.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # (C) 2016-2017 Dawid Gan, under the GPLv3
 #

cmake/Toolchain-cctools.cmake

@@ -16,11 +16,6 @@ else()
   set(CLANG_ARCH ${CCTOOLS_ARCH})
 endif()
 
-if (NOT CCTOOLS_PLATFORM MATCHES MacOSX)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fembed-bitcode")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fembed-bitcode")
-endif()
-
 SET(CMAKE_C_COMPILER ${CCTOOLS_PREFIX}/bin/${CCTOOLS_ARCH}-${platform_lower}-clang)
 SET(CMAKE_CXX_COMPILER ${CCTOOLS_PREFIX}/bin/${CCTOOLS_ARCH}-${platform_lower}-clang++)
 SET(CMAKE_RANLIB ${CCTOOLS_PREFIX}/bin/${CLANG_ARCH}-apple-darwin11-ranlib)

cmake/Toolchain-ios-xcode.cmake

@@ -101,12 +101,7 @@ set(CMAKE_C_OSX_CURRENT_VERSION_FLAG "-current_version ")
 set(CMAKE_CXX_OSX_COMPATIBILITY_VERSION_FLAG "${CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG}")
 set(CMAKE_CXX_OSX_CURRENT_VERSION_FLAG "${CMAKE_C_OSX_CURRENT_VERSION_FLAG}")
 
-# For archive
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fembed-bitcode")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fembed-bitcode")
-
 # Fixed variables in iOS STK
-set(CMAKE_XCODE_ATTRIBUTE_ENABLE_BITCODE YES CACHE INTERNAL "")
 set(CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC NO CACHE INTERNAL "")
 set(CMAKE_XCODE_ATTRIBUTE_GCC_SYMBOLS_PRIVATE_EXTERN YES CACHE INTERNAL "")
 set(USE_WIIUSE FALSE CACHE BOOL "")