mas build: cargo target folder is src-tauri/target
This commit is contained in:
parent
5fc15dd773
commit
0263f62443
2 changed files with 3 additions and 3 deletions
|
|
@ -164,8 +164,8 @@ export async function run(ctx: Ctx): Promise<void> {
|
||||||
writeFileSync(configFile, `${JSON.stringify(overlay, null, 2)}\n`);
|
writeFileSync(configFile, `${JSON.stringify(overlay, null, 2)}\n`);
|
||||||
shipPhase('build', `tauri build ${target}, build ${buildNo}`);
|
shipPhase('build', `tauri build ${target}, build ${buildNo}`);
|
||||||
await runLogged(steps.tauri, tauri.cwd, join(out, 'tauri-build.log'), showCmd(steps.tauri, null), env);
|
await runLogged(steps.tauri, tauri.cwd, join(out, 'tauri-build.log'), showCmd(steps.tauri, null), env);
|
||||||
const appDir = findBuiltApp(tauri.cwd, root, target, tauri.productName);
|
const appDir = findBuiltApp(tauri.dir, root, target, tauri.productName);
|
||||||
if (!appDir) throw new Error(`tauri build exited 0 but no ${tauri.productName}.app is under ${join(tauri.cwd, 'target', target, 'release/bundle/macos')} (see ${join(out, 'tauri-build.log')})`);
|
if (!appDir) throw new Error(`tauri build exited 0 but no ${tauri.productName}.app is under ${join(tauri.dir, 'target', target, 'release/bundle/macos')} (see ${join(out, 'tauri-build.log')})`);
|
||||||
shipPhase('verify', `checking ${basenameOf(appDir)}`);
|
shipPhase('verify', `checking ${basenameOf(appDir)}`);
|
||||||
if (!unsigned) {
|
if (!unsigned) {
|
||||||
const v = run1(steps.codesignVerify.map(x => (x.endsWith('.app') ? appDir : x)));
|
const v = run1(steps.codesignVerify.map(x => (x.endsWith('.app') ? appDir : x)));
|
||||||
|
|
|
||||||
|
|
@ -228,7 +228,7 @@ export interface MasPlanInput {
|
||||||
|
|
||||||
/** The commands of one build, as shown by --dry and run by build-mas. Pure. */
|
/** The commands of one build, as shown by --dry and run by build-mas. Pure. */
|
||||||
export function masSteps(i: MasPlanInput): { tauri: string[]; productbuild: string[]; codesignVerify: string[]; pkgCheck: string[] } {
|
export function masSteps(i: MasPlanInput): { tauri: string[]; productbuild: string[]; codesignVerify: string[]; pkgCheck: string[] } {
|
||||||
const appPath = join(i.tauri.cwd, 'target', i.target, 'release', 'bundle', 'macos', `${i.tauri.productName}.app`);
|
const appPath = join(i.tauri.dir, 'target', i.target, 'release', 'bundle', 'macos', `${i.tauri.productName}.app`);
|
||||||
return {
|
return {
|
||||||
tauri: [...i.tauriCmd, 'build', '--bundles', 'app', '--target', i.target, '--config', i.configFile],
|
tauri: [...i.tauriCmd, 'build', '--bundles', 'app', '--target', i.target, '--config', i.configFile],
|
||||||
codesignVerify: ['codesign', '--verify', '--deep', '--strict', '--verbose=2', appPath],
|
codesignVerify: ['codesign', '--verify', '--deep', '--strict', '--verbose=2', appPath],
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue