From 932e6731c914ec80e1426bc41688dd869ae579a1 Mon Sep 17 00:00:00 2001 From: Cutls Date: Sat, 13 Apr 2019 01:49:22 +0900 Subject: [PATCH 01/17] readme package --- README.md | 12 +++++++----- app/package.json | 6 +++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 2f52bbaf..5b3df83d 100644 --- a/README.md +++ b/README.md @@ -91,6 +91,13 @@ WindowsでPython 2.xやVisualC++を一発でインストールできるツール 日本語話者向けですが、macOSビルドにはXCodeが要るとの情報があります。([とねぢ](https://minohdon.jp/@toneji)氏談) +### electron-builder +`electron-builder --target` +`target`は`win`か`linux`か`mac`を指定してください。 +Config is all on package.json +ビルド設定はすべてpackage.jsonに記載しています。 + + ### electron-packager Windows @@ -100,11 +107,6 @@ Linux macOS `electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=darwin --arch=all --electron-version=4.0.5 --icon=./app/icon.icns --overwrite` -### electron-builder - -Config is all on package.json -ビルド設定はすべてpackage.jsonに記載しています。 - ## Pleroma support Did you find a bug with Pleroma accounts? diff --git a/app/package.json b/app/package.json index 7096c92b..987c1613 100644 --- a/app/package.json +++ b/app/package.json @@ -91,12 +91,12 @@ "target": ["dmg","zip"] }, "electronDownload": { - "version": "4.0.6" + "version": "4.1.2" }, - "electronVersion": "4.0.6" + "electronVersion": "4.1.2" }, "devDependencies": { - "electron": "^4.0.6", + "electron": "^4.1.2", "electron-packager": "^13.1.1", "electron-rebuild": "^1.8.4" } From 7965e7c74228731df40a575613ba9bafb537e54f Mon Sep 17 00:00:00 2001 From: Cutls Date: Sat, 13 Apr 2019 01:54:33 +0900 Subject: [PATCH 02/17] pavkage --- README.md | 17 ++++++++--------- app/package.json | 6 +++--- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 5b3df83d..fe23c6b3 100644 --- a/README.md +++ b/README.md @@ -78,6 +78,14 @@ Misskey(misskey.xyz)のトークンは含まれておりません。 `npm install electron -g` `cd TheDesk/app` `npm install` + +### electron-builder(推奨) +`electron-builder --target` +`target`は`win`か`linux`か`mac`を指定してください。 +Config is all on package.json +ビルド設定はすべてpackage.jsonに記載しています。 + +### electron-packager(非推奨) `npm install --save-dev electron-rebuild` Linux/macOS @@ -91,15 +99,6 @@ WindowsでPython 2.xやVisualC++を一発でインストールできるツール 日本語話者向けですが、macOSビルドにはXCodeが要るとの情報があります。([とねぢ](https://minohdon.jp/@toneji)氏談) -### electron-builder -`electron-builder --target` -`target`は`win`か`linux`か`mac`を指定してください。 -Config is all on package.json -ビルド設定はすべてpackage.jsonに記載しています。 - - -### electron-packager - Windows `electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --win32metadata.CompanyName="TheDesk&Cutls.com" --win32metadata.FileDescription="TheDesk" --win32metadata.OriginalFilename="TheDesk" --win32metadata.InternalName="TheDesk" --win32metadata.ProductName="TheDesk" --platform=win32 --arch=all --electron-version=4.0.5 --icon=.\app\thedesk.ico --overwrite` Linux diff --git a/app/package.json b/app/package.json index 987c1613..b96ad005 100644 --- a/app/package.json +++ b/app/package.json @@ -91,12 +91,12 @@ "target": ["dmg","zip"] }, "electronDownload": { - "version": "4.1.2" + "version": "4.1.4" }, - "electronVersion": "4.1.2" + "electronVersion": "4.1.4" }, "devDependencies": { - "electron": "^4.1.2", + "electron": "^4.1.4", "electron-packager": "^13.1.1", "electron-rebuild": "^1.8.4" } From a1048b3243260cfeb3e934957680646e1a49d2c0 Mon Sep 17 00:00:00 2001 From: Cutls Date: Sat, 13 Apr 2019 02:31:07 +0900 Subject: [PATCH 03/17] to linux --- app/main/system.js | 2 +- app/package.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/main/system.js b/app/main/system.js index 715c1a3e..05f86167 100644 --- a/app/main/system.js +++ b/app/main/system.js @@ -11,7 +11,6 @@ function system(mainWindow, dir, lang) { const BrowserWindow = electron.BrowserWindow; const dialog = electron.dialog; const os = require('os') - const fm = require('font-manager'); const language=require("../main/language.js"); ipc.on('native-notf', function(e, args) { @@ -172,6 +171,7 @@ function system(mainWindow, dir, lang) { fn(data); // ソート後の配列を返す } ipc.on('fonts', (e, arg) => { + const fm = require('font-manager'); var fonts = fm.getAvailableFontsSync(); object_array_sort(fonts, 'family', 'asc', function(fonts_sorted) { mainWindow.webContents.send('font-list', fonts_sorted); diff --git a/app/package.json b/app/package.json index b96ad005..256c3e35 100644 --- a/app/package.json +++ b/app/package.json @@ -40,7 +40,6 @@ "license": "GPL-3.0", "dependencies": { "electron-dl": "^1.11.0", - "font-manager": "^0.3.0", "jimp": "^0.2.28", "json5": "^2.1.0", "node-notifier": "^5.2.1", @@ -49,7 +48,8 @@ }, "optionalDependencies": { "nowplaying-node": "^0.1.3", - "itunes-nowplaying-mac": "git+https://github.com/rinsuki/itunes-nowplaying-mac#pull/1/head" + "itunes-nowplaying-mac": "git+https://github.com/rinsuki/itunes-nowplaying-mac#pull/1/head", + "font-manager": "^0.3.0" }, "build": { "productName": "TheDesk", From b5d1686c125f76a24e948951f4ef476f7cafd1cb Mon Sep 17 00:00:00 2001 From: Cutls Date: Sat, 13 Apr 2019 02:32:42 +0900 Subject: [PATCH 04/17] update package --- app/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/app/package.json b/app/package.json index 256c3e35..0edca0d9 100644 --- a/app/package.json +++ b/app/package.json @@ -83,6 +83,7 @@ "linux": { "icon": "build/icons", "target": [ + "zip", "snap" ], "category": "Network" From 7df51c161bcfe26b1babc428a379535c9673213b Mon Sep 17 00:00:00 2001 From: Cutls Date: Sat, 13 Apr 2019 03:55:05 +0900 Subject: [PATCH 05/17] mac 18.2.2 --- app/package.json | 2 +- app/view/en/index.html | 2 +- app/view/ja/index.html | 2 +- app/view/ps/index.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/package.json b/app/package.json index 0edca0d9..5a65ff13 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "thedesk", - "version": "18.2.1", + "version": "18.2.2", "description": "TheDesk is a Mastodon client for PC.", "main": "main.js", "scripts": { diff --git a/app/view/en/index.html b/app/view/en/index.html index c90ba9ad..269ffb26 100644 --- a/app/view/en/index.html +++ b/app/view/en/index.html @@ -32,7 +32,7 @@