cross build for x86_64; drop macos-13 runner (#228)

Author: eagleoflqj

.github/workflows/ci.yml

@@ -23,17 +23,15 @@ jobs:
 
   build:
     needs: lint
-    runs-on: ${{ matrix.os }}
+    runs-on: macos-15
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-15, macos-13]
-        type: [Release, Debug]
         include:
-          - { os: macos-15, arch: arm64, type: Release, postfix: '' }
-          - { os: macos-15, arch: arm64, type: Debug, postfix: -debug }
-          - { os: macos-13, arch: x86_64, type: Release, postfix: '' }
-          - { os: macos-13, arch: x86_64, type: Debug, postfix: -debug }
+          - { arch: arm64, type: Release, postfix: '' }
+          - { arch: arm64, type: Debug, postfix: -debug }
+          - { arch: x86_64, type: Release, postfix: '' }
+          - { arch: x86_64, type: Debug, postfix: -debug }
 
     steps:
       - uses: actions/checkout@v4
@@ -46,7 +44,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 22.x
 
       - name: Install dependencies
         env:
@@ -69,13 +67,13 @@ jobs:
       - name: Build
         run: |
           # Don't log key on any CI artifact.
-          cmake -B build -G Ninja \
+          cmake -B build/${{ matrix.arch }} -G Ninja \
             -DCMAKE_Swift_COMPILER=`which swiftc` \
             -DVERBOSE_LOGGING=OFF \
             -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} \
             -DCMAKE_BUILD_TYPE=${{ matrix.type }}
-          cmake --build build
-          sudo cmake --install build
+          cmake --build build/${{ matrix.arch }}
+          sudo cmake --install build/${{ matrix.arch }}
 
       - name: Package and remove dev files
         run: |
@@ -87,7 +85,7 @@ jobs:
           ./scripts/code-sign.sh # after tar to avoid local signature in tarball
 
       - name: Test
-        run: ctest --test-dir build --output-on-failure
+        run: ctest --test-dir build/${{ matrix.arch }} --output-on-failure
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
@@ -102,12 +100,12 @@ jobs:
           md5sum -c checksum
 
       - name: Generate meta.json
-        if: ${{ matrix.os == 'macos-15' && matrix.type == 'Release' }}
+        if: ${{ matrix.arch == 'arm64' && matrix.type == 'Release' }}
         run: |
           echo "{\"object\": {\"sha\": \"$(git rev-parse HEAD)\"}}" > meta.json
 
       - name: Upload meta.json
-        if: ${{ matrix.os == 'macos-15' && matrix.type == 'Release' }}
+        if: ${{ matrix.arch == 'arm64' && matrix.type == 'Release' }}
         uses: actions/upload-artifact@v4
         with:
           name: meta.json

.vscode/tasks.json

@@ -3,32 +3,56 @@
     "tasks": [
         {
             "type": "shell",
-            "label": "Install dependencies",
-            "command": "./scripts/install-deps.sh",
+            "label": "Install dependencies (arm64)",
+            "command": "./scripts/install-deps.sh arm64",
             "group": {
                 "kind": "build"
             }
         },
         {
             "type": "shell",
-            "label": "Configure",
-            "command": "cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug",
+            "label": "Install dependencies (x86_64)",
+            "command": "./scripts/install-deps.sh x86_64",
             "group": {
                 "kind": "build"
             }
         },
         {
             "type": "shell",
-            "label": "Build",
-            "command": "cmake --build build",
+            "label": "Configure (arm64)",
+            "command": "cmake -B build/arm64 -G Ninja -DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_BUILD_TYPE=Debug",
+            "group": {
+                "kind": "build"
+            }
+        },
+        {
+            "type": "shell",
+            "label": "Configure (x86_64)",
+            "command": "cmake -B build/x86_64 -G Ninja -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_BUILD_TYPE=Debug",
+            "group": {
+                "kind": "build"
+            }
+        },
+        {
+            "type": "shell",
+            "label": "Build (arm64)",
+            "command": "cmake --build build/arm64",
+            "group": {
+                "kind": "build"
+            }
+        },
+        {
+            "type": "shell",
+            "label": "Build (x86_64)",
+            "command": "cmake --build build/x86_64",
             "group": {
                 "kind": "build"
             }
         },
         {
             "type": "shell",
             "label": "Install",
-            "command": "sudo cmake --install build && ./scripts/code-sign.sh",
+            "command": "sudo cmake --install build/$(uname -m) && ./scripts/code-sign.sh",
             "group": {
                 "kind": "build"
             }
@@ -52,7 +76,7 @@
         {
             "type": "shell",
             "label": "Test",
-            "command": "ctest --test-dir build --output-on-failure",
+            "command": "ctest --test-dir build/$(uname -m) --output-on-failure",
             "group": {
                 "kind": "build"
             }

CMakeLists.txt

@@ -4,33 +4,33 @@ project(fcitx5-macos VERSION 0.1.0 LANGUAGES CXX Swift)
 
 list(PREPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-set(CMAKE_Swift_LANGUAGE_VRSION 5.9)
 
 # On x86 /Library/Frameworks/Mono.framework will mess up libintl.
 set(CMAKE_FIND_FRAMEWORK LAST)
 
+if(NOT CMAKE_OSX_ARCHITECTURES)
+    set(CMAKE_OSX_ARCHITECTURES "${CMAKE_HOST_SYSTEM_PROCESSOR}")
+endif()
+
+set(CMAKE_OSX_DEPLOYMENT_TARGET 13)
+set(F5M_TARGET "${CMAKE_OSX_ARCHITECTURES}-apple-macos${CMAKE_OSX_DEPLOYMENT_TARGET}")
+add_definitions(-target "${F5M_TARGET}")
+
 # Disallow InitializeSwift to execute link_directories which adds Xcode paths to rpath.
 set(SWIFT_LIBRARY_SEARCH_PATHS "")
 include(InitializeSwift)
 include(AddSwift)
 
 set(CMAKE_CXX_STANDARD 17)
 
-if(NOT CMAKE_OSX_ARCHITECTURES)
-    set(CMAKE_OSX_ARCHITECTURES "${CMAKE_HOST_SYSTEM_PROCESSOR}")
-endif()
-
-set(CMAKE_OSX_DEPLOYMENT_TARGET 13)
-add_definitions(-target "${CMAKE_OSX_ARCHITECTURES}-apple-macos${CMAKE_OSX_DEPLOYMENT_TARGET}")
-
-set(FIND_ROOT_PATH "${PROJECT_BINARY_DIR}/sysroot/usr")
+set(FIND_ROOT_PATH "${PROJECT_BINARY_DIR}/usr")
 set(PREBUILDER_INCLUDE_DIR "${FIND_ROOT_PATH}/include")
 set(PREBUILDER_LIB_DIR "${FIND_ROOT_PATH}/lib")
 set(PREBUILDER_SHARE_DIR "${FIND_ROOT_PATH}/share")
 
 list(APPEND CMAKE_FIND_ROOT_PATH "${FIND_ROOT_PATH}")
 
-set(ENV{PKG_CONFIG_SYSROOT_DIR} "${PROJECT_BINARY_DIR}/sysroot")
+set(ENV{PKG_CONFIG_SYSROOT_DIR} "${PROJECT_BINARY_DIR}")
 set(ENV{PKG_CONFIG_PATH} "${PREBUILDER_LIB_DIR}/pkgconfig;${PREBUILDER_SHARE_DIR}/pkgconfig")
 
 add_library(Libuv_static STATIC IMPORTED)

README.md

@@ -28,9 +28,9 @@ pnpm --prefix=fcitx5-webview i
 
 ### Build with CMake
 ```sh
-cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Debug
-cmake --build build
-sudo cmake --install build
+cmake -B build/$(uname -m) -G Ninja -DCMAKE_BUILD_TYPE=Debug
+cmake --build build/$(uname -m)
+sudo cmake --install build/$(uname -m)
 ```
 After the first time you execute `cmake --install`, you need to logout and login,
 then add Fcitx5 in System Setttings -> Keyboard -> Input Sources, Chinese Simplified.
@@ -85,15 +85,15 @@ use the built-in Plugin Manager.
 ### Swift sources
 To update .strings files for each supported locale, run
 ```sh
-cmake --build build --target GenerateStrings
+cmake --build build/$(uname -m) --target GenerateStrings
 ```
 
 This will, e.g., update assets/zh-Hans/Localizable.strings, and then the translator can work on it.
 
 ### C++ sources
 First, create assets/po/base.pot file:
 ```sh
-cmake --build build --target pot
+cmake --build build/$(uname -m) --target pot
 ```
 
 To add a new language, do

cache/README.md

@@ -1,3 +1,3 @@
 This directory caches tarball of build dependencies
 (downloaded from [prebuilder](https://github.com/fcitx-contrib/fcitx5-prebuilder/releases/macos)),
-which will be extracted to `build/sysroot/usr`.
+which will be extracted to `build/ARCH/usr`.

cmake/AddSwift.cmake

@@ -58,6 +58,7 @@ function(_swift_generate_cxx_header target header)
       ${ARG_SEARCH_PATHS}
       ${_SwiftSources}
       ${SDK_FLAGS}
+      -target ${F5M_TARGET}
       -module-name "${ARG_MODULE_NAME}"
       -cxx-interoperability-mode=default
       -emit-clang-header-path ${header_path}

cmake/InitializeSwift.cmake

@@ -34,7 +34,7 @@ function(_setup_swift_paths)
     #       To handle it correctly, we would need to pass the target triple and
     #       flags to this compiler invocation.
     execute_process(
-      COMMAND ${CMAKE_Swift_COMPILER} ${SDK_FLAGS} -print-target-info
+      COMMAND ${CMAKE_Swift_COMPILER} ${SDK_FLAGS} -target ${F5M_TARGET} -print-target-info
       OUTPUT_VARIABLE SWIFT_TARGET_INFO
     )
 

scripts/install-deps.sh

@@ -6,7 +6,7 @@ else
   ARCH=$1
 fi
 
-EXTRACT_DIR=build/sysroot/usr
+EXTRACT_DIR=build/$ARCH/usr
 mkdir -p $EXTRACT_DIR
 
 deps=(