lostecho/Pake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add multi-architecture support for MacOS

Browse Source
This commit is contained in:
Tlntin
2023-01-26 11:49:18 +08:00
parent 7c07d3f227
commit 92c900d4ff
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bin/builders/MacBuilder.ts vendored
View File

@@ -45,13 +45,13 @@ export default class MacBuilder implements IBuilder {
dmgName = `${name}_${tauriConf.package.version}_universal.dmg`; dmgName = `${name}_${tauriConf.package.version}_universal.dmg`;
} else { } else {
await shellExec(`cd ${npmDirectory} && npm install && npm run build`); await shellExec(`cd ${npmDirectory} && npm install && npm run build`);
let arch: string; let arch = "x64";
if (process.arch === "x64") { if (process.arch === "arm64") {
arch = "amd64"; arch = "aarch64";
} else { } else {
arch = process.arch; arch = process.arch;
} }
dmgName = `${name}_${tauriConf.package.version}_${arch}.deb`; dmgName = `${name}_${tauriConf.package.version}_${arch}.dmg`;
} }
const appPath = this.getBuildAppPath(npmDirectory, dmgName); const appPath = this.getBuildAppPath(npmDirectory, dmgName);
const distPath = path.resolve(`${name}.dmg`); const distPath = path.resolve(`${name}.dmg`);

8
dist/cli.js vendored
View File

@@ -2024,14 +2024,14 @@ class MacBuilder {
} }
else { else {
yield shellExec(`cd ${npmDirectory} && npm install && npm run build`); yield shellExec(`cd ${npmDirectory} && npm install && npm run build`);
let arch; let arch = "x64";
if (process.arch === "x64") { if (process.arch === "arm64") {
arch = "amd64"; arch = "aarch64";
} }
else { else {
arch = process.arch; arch = process.arch;
} }
dmgName = `${name}_${tauriConf.package.version}_${arch}.deb`; dmgName = `${name}_${tauriConf.package.version}_${arch}.dmg`;
} }
const appPath = this.getBuildAppPath(npmDirectory, dmgName); const appPath = this.getBuildAppPath(npmDirectory, dmgName);
const distPath = path.resolve(`${name}.dmg`); const distPath = path.resolve(`${name}.dmg`);