From 3cb8e35f4e9d608712367a8b5dd36681f5ca57d4 Mon Sep 17 00:00:00 2001 From: vapormusic Date: Tue, 8 Feb 2022 14:25:12 +0700 Subject: [PATCH] arm64 mac --- package.json | 5 +++-- resources/afterPack.js | 9 +++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 657f87ec..f0b7b85a 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,8 @@ "start:darwin": "yarn build && ELECTRON_ENABLE_LOGGING=true && electron ./build/index.js --enable-accelerated-mjpeg-decode --enable-accelerated-video --disable-gpu-driver-bug-workarounds --ignore-gpu-blacklist --enable-native-gpu-memory-buffers", "pack": "electron-builder --dir", "dist": "yarn build && electron-builder", - "dist:mac": "yarn build && electron-builder --mac --universal", + "dist:macarm" : "yarn build && electron-builder --mac --arm64", + "dist:universalNotWorking": "yarn build && electron-builder --mac --universal", "dist:all": "yarn build && electron-builder -mwl", "msft": "yarn build && electron-builder -c msft-package.json", "postinstall": "electron-builder install-app-deps", @@ -66,7 +67,7 @@ "@types/qrcode-terminal": "^0.12.0", "@types/ws": "^8.2.2", "electron": "git+https://github.com/castlabs/electron-releases.git", - "electron-builder": "^22.14.5", + "electron-builder": "^22.14.13", "electron-webpack": "^2.8.2", "musickit-typescript": "^1.2.4", "playwright": "^1.18.1", diff --git a/resources/afterPack.js b/resources/afterPack.js index 6c677c49..c70017c1 100644 --- a/resources/afterPack.js +++ b/resources/afterPack.js @@ -1,5 +1,6 @@ exports.default = function(context) { const { execSync } = require('child_process') + const fs = require('fs') if (process.platform !== 'darwin') return @@ -8,11 +9,15 @@ exports.default = function(context) { execSync('python3 -m pip install --upgrade castlabs-evs') console.log('Castlabs-evs update complete') - + console.log('VMP signing start') - + if (fs.existsSync('dist/mac')) execSync('python3 -m castlabs_evs.vmp -n sign-pkg dist/mac',{stdio: 'inherit'}) + if (fs.existsSync('dist/mac-arm64')) + execSync('python3 -m castlabs_evs.vmp -n sign-pkg dist/mac-arm64 -z',{stdio: 'inherit'}) + if (fs.existsSync('dist/mac-x64')) + execSync('python3 -m castlabs_evs.vmp -n sign-pkg dist/mac-x64',{stdio: 'inherit'}) console.log('VMP signing complete') } \ No newline at end of file