From 0d4cc9951dd25b98f0e50d236741fba1c073188f Mon Sep 17 00:00:00 2001 From: Nick Denry Date: Wed, 13 May 2020 18:23:33 +0300 Subject: [PATCH] Prepeare for a multiplatform build --- main.js | 4 ++++ modules/menu-service.js | 2 +- package-lock.json | 18 ++++++++--------- package.json | 41 ++++++++++++++++++++++++++++++++++++-- resources/images/logo.ico | Bin 0 -> 6538 bytes 5 files changed, 53 insertions(+), 12 deletions(-) create mode 100644 resources/images/logo.ico diff --git a/main.js b/main.js index ef85a1c..6a48241 100644 --- a/main.js +++ b/main.js @@ -12,6 +12,10 @@ const settingsService = require(__dirname+'/modules/settings-service') function initApp() { createWindow() + // Set Windows platform notifications + if (process.platform === 'win32') { + app.setAppUserModelId("com.denry.chimeverse"); + } } function createWindow () { diff --git a/modules/menu-service.js b/modules/menu-service.js index 42372f2..52b2739 100644 --- a/modules/menu-service.js +++ b/modules/menu-service.js @@ -57,7 +57,7 @@ menuService.createMenu = () => { }, { label: 'Quit', - accelerator: 'Command+Q', + accelerator: 'CmdOrCtrl+Q', click: () => { app.isQuitting = true app.quit() diff --git a/package-lock.json b/package-lock.json index 35096fb..c9476fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1096,9 +1096,9 @@ } }, "electron-rebuild": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-1.10.1.tgz", - "integrity": "sha512-KSqp0Xiu7CCvKL2aEdPp/vNe2Rr11vaO8eM/wq9gQJTY02UjtAJ3l7WLV7Mf8oR+UJReJO8SWOWs/FozqK8ggA==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-1.11.0.tgz", + "integrity": "sha512-cn6AqZBQBVtaEyj5jZW1/LOezZZ22PA1HvhEP7asvYPJ8PDF4i4UFt9be4i9T7xJKiSiomXvY5Fd+dSq3FXZxA==", "dev": true, "requires": { "colors": "^1.3.3", @@ -2144,9 +2144,9 @@ } }, "mime": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", - "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==", + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.5.tgz", + "integrity": "sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w==", "dev": true }, "mime-db": { @@ -3427,9 +3427,9 @@ } }, "tslib": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz", - "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.12.0.tgz", + "integrity": "sha512-5rxCQkP0kytf4H1T4xz1imjxaUUPMvc5aWp0rJ/VMIN7ClRiH1FwFvBt8wOeMasp/epeUnmSW6CixSIePtiLqA==", "dev": true }, "tunnel-agent": { diff --git a/package.json b/package.json index 427b83e..5250f43 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,12 @@ "description": "Jabber/XMPP client based on Converse.js and Electron", "main": "main.js", "scripts": { - "start": "electron ." + "postinstall": "electron-builder install-app-deps", + "start": "electron .", + "pack": "build --dir", + "dist": "build", + "dist:win64": "build --platform win --arch x64", + "dist:linux64deb": "build --platform linux --arch x64" }, "repository": "https://github.com/nick-denry/Chimeverse", "keywords": [ @@ -15,7 +20,7 @@ "Electron", "OMEMO" ], - "author": "Nick Denry", + "author": "Nick Denry ", "license": "GPL-3.0", "devDependencies": { "electron": "^4.2.12", @@ -31,5 +36,37 @@ "keytar": "^4.13.0", "n": "^6.5.1", "open-iconic": "^1.1.1" + }, + "build": { + "appId": "com.denry.chimeverse", + "productName": "Chimeverse", + "mac": { + "category": "public.app-category.social-networking", + "icon": "resources/images/logo.icns", + "target": "dmg" + }, + "dmg": { + "contents": [ + { + "x": 110, + "y": 150 + }, + { + "x": 240, + "y": 150, + "type": "link", + "path": "/Applications" + } + ] + }, + "linux": { + "target": [ + "deb" + ] + }, + "win": { + "target": "nsis", + "icon": "resources/images/logo.ico" + } } } diff --git a/resources/images/logo.ico b/resources/images/logo.ico new file mode 100644 index 0000000000000000000000000000000000000000..af90768dbff343bc75ace0b0dd67392bc49dbe90 GIT binary patch literal 6538 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 literal 0 HcmV?d00001