Merge pull request #61 from cortex-command-community/macos-crosscompile

Macos crosscompile

Author: Causeless

.github/actions/osxcross/action.yml

@@ -0,0 +1,154 @@
+name: "Setup osxcross"
+author: mbround18
+description: Setup osxcross for rust/other compilation projects.
+branding:
+  icon: 'aperture'  
+  color: 'green'
+
+
+inputs:
+  osx-version:
+    description: "Version of osx to use."
+    required: true
+
+outputs:
+  legacy-ssl:
+    value: ${{steps.gen_configs.outputs.legacy-ssl}}
+  meson-osxcross:
+    value: ${{steps.gen_configs.outputs.meson-osxcross}}
+
+runs:
+  using: "composite"
+  steps:
+    - shell: bash
+      run: |
+        mkdir -p $GITHUB_ACTION_PATH/osxcross
+        echo "OSXCROSS_FOLDER=$(echo "$GITHUB_ACTION_PATH/osxcross" | sed 's/\.\/*//g')" >> $GITHUB_ENV
+
+
+    - uses: actions/checkout@v4
+      with:
+        repository: tpoechtrager/osxcross
+        path: ${{env.OSXCROSS_FOLDER}}
+
+    - shell: bash
+      id: target
+      run: |
+        repeat(){
+          for i in {1..90}; do echo -n "$1"; done
+        }
+
+        echo "::group::Disclaimer Click Here for Info"
+        echo ""
+        repeat "-"
+        echo ""
+        echo "The first time you run this it will take upwards of 9 minutes to compile. Subsequent builds are cached."
+        echo ""
+        repeat "-"
+        echo ""
+        echo "::endgroup::"
+
+
+        echo "::group::Installing Deps"
+
+        sudo apt-get update
+        sudo apt-get install --no-install-recommends -y -qq clang gcc g++ zlib1g-dev libmpc-dev libmpfr-dev libgmp-dev  cmake libxml2-dev libssl-dev xz-utils 
+        echo "::endgroup::"
+
+        # Check setup for osx version
+        echo "::group::Fetching macosx SDK"
+        FILE_NAME="MacOSX${{ inputs.osx-version }}.sdk.tar.xz"
+
+        # Check joseluisq/macosx-sdks for release
+        wget -nc "https://github.com/joseluisq/macosx-sdks/releases/download/${{ inputs.osx-version }}/${FILE_NAME}" -O "$OSXCROSS_FOLDER/tarballs/${FILE_NAME}"
+        echo "::endgroup::"
+
+        echo "OSXCROSS_TARGET=${OSXCROSS_FOLDER}/target" >> $GITHUB_ENV
+
+    - uses: actions/cache@v4
+      id: cache
+      with:
+        key: ${{ runner.os }}-osxcross-${{ inputs.osx-version }}
+        path: |
+          ${{ env.OSXCROSS_TARGET }}
+          
+
+    - shell: bash
+      if: steps.cache.outputs.cache-hit != 'true'
+      env:
+        SDK_VERSION: "${{ inputs.osx-version }}"
+        UNATTENDED: "yes"
+      run: |
+        cd ${OSXCROSS_FOLDER}
+        echo "::group::Build osxcross"
+        ./build.sh
+        echo "::endgroup::"
+        echo "::group::Build GCC"
+        ./build_gcc.sh
+        echo "::endgroup::"
+
+    - shell: bash
+      id: gen_configs
+      run: |
+        echo "::group::Setting up Bin files"
+        OSXCROSS_FOLDER="$(echo "${GITHUB_ACTION_PATH}/osxcross" | sed 's/\.\/*//g')"
+        echo "OSXCROSS Folder = ${OSXCROSS_FOLDER}"
+
+        if [ ! -d "$OSXCROSS_FOLDER/target/bin" ]; then
+          echo "Error! Failed to find ${OSXCROSS_FOLDER}/target/bin folder!"
+          exit 1
+        else
+          if hash sudo 2>/dev/null; then
+            sudo chmod +x $OSXCROSS_FOLDER/target/bin/*
+          else
+            chmod +x $OSXCROSS_FOLDER/target/bin/*
+          fi
+        fi        
+        echo "::endgroup::"
+
+        echo "::group::Finding Arch Name"
+        echo "$OSXCROSS_FOLDER/target/bin" >> $GITHUB_PATH
+        ARCH_TARGET="$(ls $OSXCROSS_FOLDER/target | grep apple)"
+        echo "::endgroup::"
+
+        ln -sf ${ARCH_TARGET}-otool ${OSXCROSS_TARGET}/bin/otool
+        ln -sf ${ARCH_TARGET}-install_name_tool ${OSXCROSS_TARGET}/bin/install_name_tool
+
+        echo "::group::Write meson cross file"
+        cat << EOF > $OSXCROSS_FOLDER/meson_osxcross.txt
+        [constants]
+        arch = '${ARCH_TARGET}'
+        [binaries]
+        c = ['ccache', arch + '-gcc']
+        cpp = ['ccache', arch + '-g++']
+        strip = arch + '-strip'
+        pkg-config = arch  + '-pkg-config'
+        ranlib = arch + '-gcc-ranlib'
+        ar = arch + '-gcc-ar'
+        
+        [host_machine]
+        system = 'darwin'
+        cpu_family = 'x86_64'
+        cpu = 'x86_64'
+        endian = 'little'
+        EOF
+        echo "::endgroup::"
+
+        echo "meson-osxcross=${OSXCROSS_FOLDER}/meson_osxcross.txt" >> $GITHUB_OUTPUT
+
+    - shell: bash
+      run: |
+        OUT=$(patch -N -i ${GITHUB_ACTION_PATH}/macports.patch ${OSXCROSS_FOLDER}/target/bin/osxcross-macports) || echo "${OUT}" | grep "Skipping patch" -q || (echo "$OUT" && false);
+
+    - uses: actions/checkout@v4
+      with:
+        repository: auriamg/macdylibbundler
+        path: ${{env.OSXCROSS_FOLDER}}/dylibbundler
+
+    - shell: bash
+      run: |
+        echo "::group::Install dylibbundler"
+        cd ${OSXCROSS_FOLDER}/dylibbundler
+        make
+        echo "${OSXCROSS_FOLDER}/dylibbundler" >> $GITHUB_PATH
+        echo "::endgroup::"

.github/actions/osxcross/macports.patch

@@ -0,0 +1,26 @@
+diff --git a/tools/osxcross-macports b/tools/osxcross-macports
+index 3e87735..5c48e4e 100755
+--- a/tools/osxcross-macports
++++ b/tools/osxcross-macports
+@@ -250,8 +250,10 @@ verifyFileIntegrity()
+     getFile $PUBKEYURL "$PUBKEY"
+   fi
+ 
+-  local rmd160=$(openssl rmd160 "$PUBKEY" | awk '{print $2}')
+-  local sha1=$(openssl sha1 "$PUBKEY" | awk '{print $2}')
++  errorMsg "set rmd160"
++  local rmd160=$(openssl rmd160 -provider legacy "$PUBKEY" | awk '{print $2}')
++  errorMsg "set sha1"
++  local sha1=$(openssl sha1 "$PUBKEY" | awk '{print $2}')
+ 
+   if [ "$rmd160" != "$PUBKEYRMD160" -o "$sha1" != "$PUBKEYSHA1" ]; then
+     errorMsg "invalid macports public key (hash check failed)"
+@@ -262,7 +264,7 @@ verifyFileIntegrity()
+ 
+   set +e
+ 
+-  openssl dgst -ripemd160 -verify "$PUBKEY" -signature \
++  openssl dgst -provider legacy -provider default -ripemd160 -verify "$PUBKEY" -signature \
+     "$CACHE/$file.rmd160" "$CACHE/$file" 1>/dev/null
+ 
+   if [ $? -ne 0 ]; then

.github/workflows/meson.yml

@@ -29,6 +29,14 @@ on:
       new_release_version:
         type: string
         required: false
+      osx-version:
+        type: string
+        required: false
+        default: "11.1"
+      macosx-deployment-target:
+        type: string
+        required: false
+        default: "10.15"
 
   # Triggers the workflow when called by a top-level workflow
   workflow_call:
@@ -48,6 +56,14 @@ on:
       new_release_version:
         type: string
         required: false
+      osx-version:
+        type: string
+        required: false
+        default: "11.1"
+      macosx-deployment-target:
+        type: string
+        required: false
+        default: "10.15"
 
 jobs:
   build-linux:
@@ -56,8 +72,10 @@ jobs:
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.x"
 
       - name: Install Dependencies
         run: |
@@ -66,7 +84,7 @@ jobs:
           sudo pip install meson
 
       - name: ccache
-        uses: hendrikmuhs/[email protected]
+        uses: hendrikmuhs/[email protected].11
         with:
           key: ${{ github.job }}-${{ matrix.os }}
 
@@ -82,14 +100,14 @@ jobs:
           CC: "ccache gcc"
           CXX: "ccache g++"
         run: |
-          meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} -Db_lto=true build
+          meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} -Db_lto=false build
 
       - name: Configure for AppImage
         if: ${{inputs.upload_artefacts}}
         env:
           CC: "ccache gcc"
           CXX: "ccache g++"
-        run: meson configure -Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=/usr/lib/ --prefix=/usr/ build
+        run: meson configure -Db_lto=true -Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=/usr/lib/ --prefix=/usr/ build
 
       - name: Build
         env:
@@ -123,27 +141,47 @@ jobs:
 
       - name: Upload Appimage
         if: ${{inputs.upload_artefacts}}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: CortexCommand (Linux)
           path: CortexCommand.AppImage
           if-no-files-found: error
 
   build-macos:
-    runs-on: macos-11
+    runs-on: ubuntu-latest
     name: MacOS Build
 
     env:
-      GCC_VERSION: "13"
-      MACOSX_DEPLOYMENT_TARGET: 10.15
+      MACOSX_DEPLOYMENT_TARGET: ${{inputs.macosx-deployment-target}}
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.x"
 
-      - name: "Install Dependencies"
-        uses: melusina-org/setup-macports@v1
+      - name: "Install Osxcross"
+        id: osxcross
+        uses: ./.github/actions/osxcross
         with:
-          parameters: ".github/parameters/macports.yml"
+          osx-version: ${{ inputs.osx-version }}
+      
+      - name: "Cache Dependencies"
+        uses: actions/cache@v4
+        with:
+          key: ${{runner.os}}-${{inputs.osx-version}}-macports
+          path: ${{env.OSXCROSS_FOLDER}}/target/macports
+
+      - name: "Install Dependencies"
+        env:
+          OSXCROSS_MACPORTS_MIRROR: "https://packages.macports.org"
+        run: |
+          echo "::group::Installing mac deps"
+          omp install libsdl2 onetbb lz4 libpng minizip luajit flac
+          echo "OSXCROSS_PKG_CONFIG_PATH=${{env.OSXCROSS_TARGET}}/macports/pkgs/opt/local/libexec/onetbb/lib/pkgconfig" >> $GITHUB_ENV
+          echo "::endgroup::"
+          echo "::group::Installing meson"
+          pip install meson ninja
+          echo "::endgroup::"
 
       - name: Set Version
         if: ${{inputs.new_release_version}}
@@ -153,48 +191,43 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: ccache
-        uses: hendrikmuhs/[email protected]
+        uses: hendrikmuhs/[email protected].11
         with:
           key: ${{ github.job }}-${{ matrix.os }}
 
       - name: Setup Meson
         env:
-          CC: "ccache gcc-${{env.GCC_VERSION}}"
-          CXX: "ccache g++-${{env.GCC_VERSION}}"
           LDFLAGS: "-static-libgcc -static-libstdc++"
         run: |
-          meson setup --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} -Db_lto=false build
+          meson setup --cross-file=${{steps.osxcross.outputs.meson-osxcross}} --buildtype=${{inputs.build_type}} -Ddebug_type=${{inputs.debug_level}} -Db_lto=false build
 
       - name: Configure for App Bundle
         if: ${{inputs.upload_artefacts}}
         env:
-          CC: "ccache gcc-${{env.GCC_VERSION}}"
-          CXX: "ccache g++-${{env.GCC_VERSION}}"
           LDFLAGS: "-static-libgcc -static-libstdc++"
         run: |
           meson configure \
           -Dinstall_data=false -Dinstall_runner=false -Dfmod_dir=Contents/Frameworks \
           --bindir=Contents/MacOS \
           --prefix="/" \
+          -Ddylibbundler_args="-ns -s ${{env.OSXCROSS_TARGET}}/macports/pkgs/opt/local/lib/ \
+            -s ${{env.OSXCROSS_TARGET}}/macports/pkgs/opt/local/libexec/onetbb/lib/" \
           build
 
       - name: Build
         env:
-          CC: "ccache gcc-${{env.GCC_VERSION}}"
-          CXX: "ccache g++-${{env.GCC_VERSION}}"
           LDFLAGS: "-static-libgcc -static-libstdc++"
         run: |
           meson compile -C build
 
       - name: Create App Bundle
         if: ${{inputs.upload_artefacts}}
         run: |
-          DESTDIR="/tmp/Cortex Command.app" meson install -C build
+          meson install --destdir="/tmp/Cortex Command.app" -C build
 
       - name: Tar files
         if: ${{inputs.upload_artefacts}}
         run: |
-          tree /tmp/
           cd /tmp/
           tar -cvf CortexCommand.tar "Cortex Command.app"
 
@@ -204,7 +237,7 @@ jobs:
 
       - name: Artifact Deploy
         if: ${{inputs.upload_artefacts}}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: CortexCommand (macOS)
           path: |
@@ -216,8 +249,10 @@ jobs:
     name: Windows Build
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.x"
 
       - name: Install Dependencies
         run: |

Resources/bundle_dylibs.sh

@@ -3,4 +3,4 @@
 dylibbundler -od -b -x "${MESON_INSTALL_DESTDIR_PREFIX}/Contents/MacOS/${1}" \
  -d "${MESON_INSTALL_DESTDIR_PREFIX}/Contents/Frameworks" \
  -p "@executable_path/../Frameworks" \
- -s "${MESON_SOURCE_ROOT}/external/lib/macos"
+ -s "${MESON_SOURCE_ROOT}/external/lib/macos" ${2}