From b0fe6dfdad842980144455cd2e39497dc3aaf0b5 Mon Sep 17 00:00:00 2001 From: AlphaX-Qortal <67390536+AlphaX-Qortal@users.noreply.github.com> Date: Sun, 23 Feb 2025 17:26:25 +0100 Subject: [PATCH] Added build mac configs --- electron/electron-builder.config-mac.json | 30 --------- electron/electron-builder.config.mac.json | 81 +++++++++++++++++++++++ electron/package.json | 4 +- 3 files changed, 83 insertions(+), 32 deletions(-) delete mode 100644 electron/electron-builder.config-mac.json create mode 100644 electron/electron-builder.config.mac.json diff --git a/electron/electron-builder.config-mac.json b/electron/electron-builder.config-mac.json deleted file mode 100644 index e53fbf3..0000000 --- a/electron/electron-builder.config-mac.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "appId": "org.Qortal.Qortal-Hub", - "directories": { - "buildResources": "resources" - }, - - "files": ["assets/**/*", "build/**/*", "capacitor.config.*", "app/**/*", "scripts/**/*" ], - "afterPack": "scripts/afterPack.js", - "afterSign": "scripts/notarize.js", - "nsis": { - "allowElevation": true, - "oneClick": false, - "allowToChangeInstallationDirectory": true - }, - "publish": [ - { - "provider": "github", - "owner": "Qortal", - "repo": "Qortal-Hub", - "releaseType": "draft" - } - ], - - "mac": { - "icon": "assets/mac/appIcon.icns", - "category": "public.app-category.utilities", - "target": ["dmg", "zip"] - }, - "productName": "Qortal Hub" -} diff --git a/electron/electron-builder.config.mac.json b/electron/electron-builder.config.mac.json new file mode 100644 index 0000000..a38aefb --- /dev/null +++ b/electron/electron-builder.config.mac.json @@ -0,0 +1,81 @@ +{ + "appId": "org.Qortal.Qortal-Hub", + "productName": "Qortal Hub", + "copyright": "Copyright © 2021 - 2025 Qortal", + "artifactName": "Qortal-Hub-Setup-macOS.${ext}", + + "compression": "normal", + + "asar": true, + + "afterPack": "scripts/afterPack.js", + + "afterSign": "scripts/notarize.js", + + "files": [ + "assets/**/*", + "build/**/*", + "capacitor.config.*", + "app/**/*", + "scripts/**/*" + ], + + "mac": { + "icon": "assets/mac/appIcon.icns", + "hardenedRuntime": true, + "gatekeeperAssess": false, + "entitlements": "buildmac/entitlements.mac.plist", + "entitlementsInherit": "buildmac/entitlements.mac.plist", + "category": "public.app-category.utilities", + "asarUnpack": ["**/*.node"], + "target": ["dmg", "pkg"] + }, + + "dmg": { + "sign": false, + "artifactName": "Qortal-Hub-Setup-macOS.${ext}", + "icon": "assets/mac/appIcon.icns", + "iconSize": 100, + "contents": [ + { + "x": 130, + "y": 220 + }, + { + "x": 410, + "y": 220, + "type": "link", + "path": "/Applications" + } + ] + }, + + "pkg": { + "artifactName": "Qortal-Hub-Setup-macOS.${ext}", + "installLocation": "/Applications", + "background": { + "file": "buildmac/logo-hub.png", + "alignment": "bottomleft", + "scaling": "none" + }, + "allowAnywhere": true, + "allowCurrentUserHome": true, + "allowRootDirectory": true, + "isVersionChecked": true, + "isRelocatable": false, + "overwriteAction": "upgrade" + }, + + "directories": { + "buildResources": "resources" + }, + + "publish": [ + { + "provider": "github", + "owner": "Qortal", + "repo": "Qortal-Hub", + "releaseType": "draft" + } + ] +} \ No newline at end of file diff --git a/electron/package.json b/electron/package.json index 1fa9009..cc5c289 100644 --- a/electron/package.json +++ b/electron/package.json @@ -31,7 +31,7 @@ "electron:make": "npm run build && electron-builder build -c ./electron-builder.config.json -p always", "electron:make-local": "npm run build && electron-builder build -c ./electron-builder.config.json --publish=never", "electron:make-lin": "npm run build && electron-builder build -c ./electron-builder.config.lin.json --publish=never -l", - "electron:make-mac": "npm run build && electron-builder build -c ./electron-builder.config.mac.json --publish=never --mac", + "electron:make-mac": "npm run build && electron-builder build -c ./electron-builder.config.mac.json --publish=never --mac dmg && electron-builder build -c ./electron-builder.config.mac.json --publish=never --mac pkg && electron-builder build -c ./electron-builder.config.mac.json --publish=never --mac zip", "electron:make-win": "npm run build && electron-builder build -c ./electron-builder.config.win.json --publish=never -w", "electron:make-arm": "npm run build && electron-builder build -c ./electron-builder.config.arm.json --publish=never --linux --arm64", "electron:make-all": "npm run build && electron-builder build -c ./electron-builder.config.win.json --publish=never -w && electron-builder build -c ./electron-builder.config.lin.json --publish=never -l && electron-builder build -c ./electron-builder.config.arm.json --publish=never --linux --arm64" @@ -58,4 +58,4 @@ "capacitor", "electron" ] -} +} \ No newline at end of file