From 92c900d4ff7827e64906001a03ade0254bc1e588 Mon Sep 17 00:00:00 2001 From: Tlntin Date: Thu, 26 Jan 2023 11:49:18 +0800 Subject: [PATCH] add multi-architecture support for MacOS --- bin/builders/MacBuilder.ts | 8 ++++---- dist/cli.js | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/builders/MacBuilder.ts b/bin/builders/MacBuilder.ts index c0422f3..48cc047 100644 --- a/bin/builders/MacBuilder.ts +++ b/bin/builders/MacBuilder.ts @@ -45,13 +45,13 @@ export default class MacBuilder implements IBuilder { dmgName = `${name}_${tauriConf.package.version}_universal.dmg`; } else { await shellExec(`cd ${npmDirectory} && npm install && npm run build`); - let arch: string; - if (process.arch === "x64") { - arch = "amd64"; + let arch = "x64"; + if (process.arch === "arm64") { + arch = "aarch64"; } else { arch = process.arch; } - dmgName = `${name}_${tauriConf.package.version}_${arch}.deb`; + dmgName = `${name}_${tauriConf.package.version}_${arch}.dmg`; } const appPath = this.getBuildAppPath(npmDirectory, dmgName); const distPath = path.resolve(`${name}.dmg`); diff --git a/dist/cli.js b/dist/cli.js index 1321e1e..f08943f 100644 --- a/dist/cli.js +++ b/dist/cli.js @@ -2024,14 +2024,14 @@ class MacBuilder { } else { yield shellExec(`cd ${npmDirectory} && npm install && npm run build`); - let arch; - if (process.arch === "x64") { - arch = "amd64"; + let arch = "x64"; + if (process.arch === "arm64") { + arch = "aarch64"; } else { arch = process.arch; } - dmgName = `${name}_${tauriConf.package.version}_${arch}.deb`; + dmgName = `${name}_${tauriConf.package.version}_${arch}.dmg`; } const appPath = this.getBuildAppPath(npmDirectory, dmgName); const distPath = path.resolve(`${name}.dmg`);