xcframeworkにmacOS向けのライブラリも同梱する

.github/workflows/build_and_deploy.yml

@@ -241,12 +241,18 @@ jobs:
           ESIGNERCKA_USERNAME: ${{ secrets.ESIGNERCKA_USERNAME }}
           ESIGNERCKA_PASSWORD: ${{ secrets.ESIGNERCKA_PASSWORD }}
           ESIGNERCKA_TOTP_SECRET: ${{ secrets.ESIGNERCKA_TOTP_SECRET }}
-      - name: Upload artifact to build XCFramework
+      - name: Upload artifact to build XCFramework(iOS)
         if: matrix.c_release_format == 'ios-xcframework'
         uses: actions/upload-artifact@v4
         with:
           name: voicevox_core-${{ matrix.target }}
           path: artifact/${{ env.ASSET_NAME }}
+      - name: Upload artifact to build XCFramework(macOS)
+        if: matrix.artifact_name == 'osx-arm64' || matrix.artifact_name == 'osx-x64'
+        uses: actions/upload-artifact@v4
+        with:
+          name: voicevox_core-${{ matrix.target }}
+          path: artifact/${{ env.ASSET_NAME }}
       - name: Archive artifact
         run: |
           cd artifact
@@ -284,7 +290,9 @@ jobs:
       IOS_X86_64_PATH: artifact/voicevox_core-x86_64-apple-ios
       IOS_AARCH64_SIM_PATH: artifact/voicevox_core-aarch64-apple-ios-sim
       IOS_AARCH64_PATH: artifact/voicevox_core-aarch64-apple-ios
-      ASSET_NAME: voicevox_core-ios-xcframework-cpu-${{ needs.config.outputs.version }}
+      MACOS_ARM64_PATH: artifact/voicevox_core-aarch64-apple-darwin
+      MACOS_X64_PATH: artifact/voicevox_core-x86_64-apple-darwin
+      ASSET_NAME: voicevox_core-xcframework-cpu-${{ needs.config.outputs.version }}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/download-artifact@v4
@@ -299,13 +307,21 @@ jobs:
         with:
           name: voicevox_core-aarch64-apple-ios
           path: ${{ env.IOS_AARCH64_PATH }}
+      - uses: actions/download-artifact@v4
+        with:
+          name: voicevox_core-aarch64-apple-darwin
+          path: ${{ env.MACOS_ARM64_PATH }}
+      - uses: actions/download-artifact@v4
+        with:
+          name: voicevox_core-x86_64-apple-darwin
+          path: ${{ env.MACOS_X64_PATH }}
       - name: Create xcframework
         id: create-xcframework
         run: |
-          build_util/make_ios_xcframework.bash
+          build_util/make_xcframework.bash
           echo "output_asset_path=${OUTPUT_ASSET_PATH}" >> "$GITHUB_OUTPUT"
         env:
-          OUTPUT_ASSET_PATH: artifact/voicevox_core-ios-xcframework-cpu
+          OUTPUT_ASSET_PATH: artifact/voicevox_core-xcframework-cpu
       - name: Archive artifact
         run: |
           cd ${{ steps.create-xcframework.outputs.output_asset_path }}

build_util/make_ios_xcframework.bash → build_util/make_xcframework.bash

@@ -13,6 +13,14 @@ if [ ! -v IOS_AARCH64_PATH ]; then # AARCH64用のモジュールのディレク
     echo "IOS_AARCH64_PATHが未定義です"
     exit 1
 fi
+if [ ! -v MACOS_ARM64_PATH ]; then # MACOS_ARM64用のモジュールのディレクトリ
+    echo "MACOS_ARM64_PATHが未定義です"
+    exit 1
+fi
+if [ ! -v MACOS_X64_PATH ]; then # MACOS_X64用のモジュールのディレクトリ
+    echo "MACOS_X64_PATHが未定義です"
+    exit 1
+fi
 if [ ! -v OUTPUT_ASSET_PATH ]; then # 出力するASSETのディレクトリ
     echo "OUTPUT_ASSET_PATHが未定義です"
     exit 1
@@ -37,8 +45,8 @@ fi
 echo "Original onnx dylib file name: $dylib_string"
 
 echo "* Copy Framework template"
-arches=("aarch64" "sim")
-artifacts=("${IOS_AARCH64_PATH}" "${IOS_AARCH64_SIM_PATH}")
+arches=("aarch64" "sim" "arm64")
+artifacts=("${IOS_AARCH64_PATH}" "${IOS_AARCH64_SIM_PATH}" "${MACOS_ARM64_PATH}")
 for i in "${!arches[@]}"; do
     arch="${arches[$i]}"
     artifact="${artifacts[$i]}"
@@ -59,12 +67,22 @@ lipo -create "${IOS_X86_64_PATH}/lib/libvoicevox_core.dylib" \
     "${IOS_AARCH64_SIM_PATH}/lib/libvoicevox_core.dylib" \
     -output "Framework-sim/voicevox_core.framework/voicevox_core"
 
+# macはx64とarrch64を合わせてdylib作成
+lipo -create "${MACOS_X64_PATH}/lib/libvoicevox_core.dylib" \
+    "${MACOS_ARM64_PATH}/lib/libvoicevox_core.dylib" \
+    -output "Framework-arm64/voicevox_core.framework/voicevox_core"
+
 for arch in "${arches[@]}"; do
     echo "* Change ${arch} @rpath"
     # 自身への@rpathを変更
     install_name_tool -id "@rpath/voicevox_core.framework/voicevox_core" \
         "Framework-${arch}/voicevox_core.framework/voicevox_core"
 
+    # arm64（macOS）はonnxruntimeを依存に入れていないため、以下の処理はスキップ
+    if [[ "$arch" == "arm64" ]]; then
+        continue
+    fi
+
     # onnxruntimeへの@rpathを、voicevox_onnxruntimeのXCFrameworkに変更
     install_name_tool -change "@rpath/$dylib_string" \
         "@rpath/voicevox_onnxruntime.framework/voicevox_onnxruntime" \
@@ -76,4 +94,5 @@ mkdir -p "${OUTPUT_ASSET_PATH}"
 xcodebuild -create-xcframework \
     -framework "Framework-sim/voicevox_core.framework" \
     -framework "Framework-aarch64/voicevox_core.framework" \
+    -framework "Framework-arm64/voicevox_core.framework" \
     -output "${OUTPUT_ASSET_PATH}/voicevox_core.xcframework"

crates/voicevox_core_c_api/xcframework/Frameworks/arm64/voicevox_core.framework/Info.plist

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildMachineOSBuild</key>
+	<string>23B81</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>voicevox_core</string>
+	<key>CFBundleIdentifier</key>
+	<string>jp.hiroshiba.voicevox.voicevox-core</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>voicevox_core</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string>21C52</string>
+	<key>DTPlatformName</key>
+	<string>macosx</string>
+	<key>DTPlatformVersion</key>
+	<string>13.0</string>
+	<key>DTSDKBuild</key>
+	<string>21C52</string>
+	<key>DTSDKName</key>
+	<string>macosx13.0</string>
+	<key>DTXcode</key>
+	<string>1510</string>
+	<key>DTXcodeBuild</key>
+	<string>15C65</string>
+	<key>MinimumOSVersion</key>
+	<string>11.0</string>
+</dict>
+</plist>

crates/voicevox_core_c_api/xcframework/Frameworks/arm64/voicevox_core.framework/Modules/module.modulemap

@@ -0,0 +1,6 @@
+framework module voicevox_core {
+  umbrella header "voicevox_core.h"
+  export *
+
+  module * { export * }
+}

crates/voicevox_core_c_api/xcframework/README.md

@@ -1,6 +1,6 @@
 # xcframeworkフォルダの内容について
 ## Frameworks
 
-iOS向けの配布ライブラリXCFramework内のFrameworkを作るための雛形です。
-雛形は端末用とシミュレータ用の2種類です。
+iOSとmacOS向けの配布ライブラリXCFramework内のFrameworkを作るための雛形です。
+雛形はiOS端末用（aarch64）とシミュレータ用（sim）、およびmacOS端末用（arm64）の3種類です。