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:59:34 +08:00
parent 92c900d4ff
commit c6555370dc
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bin/builders/MacBuilder.ts vendored
View File

@@ -53,7 +53,7 @@ export default class MacBuilder implements IBuilder {
} }
dmgName = `${name}_${tauriConf.package.version}_${arch}.dmg`; dmgName = `${name}_${tauriConf.package.version}_${arch}.dmg`;
} }
const appPath = this.getBuildAppPath(npmDirectory, dmgName); const appPath = this.getBuildAppPath(npmDirectory, dmgName, options.multi_arch);
const distPath = path.resolve(`${name}.dmg`); const distPath = path.resolve(`${name}.dmg`);
await fs.copyFile(appPath, distPath); await fs.copyFile(appPath, distPath);
await fs.unlink(appPath); await fs.unlink(appPath);
@@ -62,11 +62,13 @@ export default class MacBuilder implements IBuilder {
logger.success('You can find the app installer in', distPath); logger.success('You can find the app installer in', distPath);
} }
getBuildAppPath(npmDirectory: string, dmgName: string) { getBuildAppPath(npmDirectory: string, dmgName: string, multiArch: boolean) {
return path.join( let dmgPath: string;
npmDirectory, if (multiArch) {
'src-tauri/target/universal-apple-darwin/release/bundle/dmg', dmgPath = 'src-tauri/target/universal-apple-darwin/release/bundle/dmg';
dmgName } else {
); dmgPath = 'src-tauri/target/release/bundle/dmg';
}
return path.join(npmDirectory, dmgPath, dmgName);
} }
} }

13
dist/cli.js vendored
View File

@@ -2033,7 +2033,7 @@ class MacBuilder {
} }
dmgName = `${name}_${tauriConf.package.version}_${arch}.dmg`; dmgName = `${name}_${tauriConf.package.version}_${arch}.dmg`;
} }
const appPath = this.getBuildAppPath(npmDirectory, dmgName); const appPath = this.getBuildAppPath(npmDirectory, dmgName, options.multi_arch);
const distPath = path.resolve(`${name}.dmg`); const distPath = path.resolve(`${name}.dmg`);
yield fs.copyFile(appPath, distPath); yield fs.copyFile(appPath, distPath);
yield fs.unlink(appPath); yield fs.unlink(appPath);
@@ -2041,8 +2041,15 @@ class MacBuilder {
logger.success('You can find the app installer in', distPath); logger.success('You can find the app installer in', distPath);
}); });
} }
getBuildAppPath(npmDirectory, dmgName) { getBuildAppPath(npmDirectory, dmgName, multiArch) {
return path.join(npmDirectory, 'src-tauri/target/universal-apple-darwin/release/bundle/dmg', dmgName); let dmgPath;
if (multiArch) {
dmgPath = 'src-tauri/target/universal-apple-darwin/release/bundle/dmg';
}
else {
dmgPath = 'src-tauri/target/release/bundle/dmg';
}
return path.join(npmDirectory, dmgPath, dmgName);
} }
} }