Update to enable universal builds of Flipper

* added PortForwardingMacApp project target
* updated Podfiles
* updated electron builder to 22.14.10
* updated electron to 16.0.3
* added universal architecture to the build process
This commit is contained in:
Colin Bendell
2021-12-01 10:30:56 -05:00
committed by Lorenzo Blasa
parent 2b927b4e72
commit 6cc083b860
7 changed files with 535 additions and 17 deletions

View File

@@ -103,6 +103,7 @@ const argv = yargs
.check((argv) => {
const targetSpecified =
argv.mac ||
argv.universal ||
argv['mac-dmg'] ||
argv.win ||
argv.linux ||
@@ -222,14 +223,14 @@ async function buildDist(buildFolder: string) {
const postBuildCallbacks: (() => void)[] = [];
if (argv.mac || argv['mac-dmg']) {
targetsRaw.push(Platform.MAC.createTarget(['dir']));
targetsRaw.push(Platform.MAC.createTarget(['dir'], Arch.universal));
// You can build mac apps on Linux but can't build dmgs, so we separate those.
if (argv['mac-dmg']) {
targetsRaw.push(Platform.MAC.createTarget(['dmg']));
targetsRaw.push(Platform.MAC.createTarget(['dmg'], Arch.universal));
}
postBuildCallbacks.push(() =>
spawn('zip', ['-qyr9', '../Flipper-mac.zip', 'Flipper.app'], {
cwd: path.join(distDir, 'mac'),
cwd: path.join(distDir, 'mac-universal'),
encoding: 'utf-8',
}),
);