From 3c3eb5209b7667980238baca01db52d660c9fee4 Mon Sep 17 00:00:00 2001 From: Cutls Date: Sat, 13 Apr 2019 01:48:26 +0900 Subject: [PATCH 1/8] readme --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 2f52bbaf..9b7050d3 100644 --- a/README.md +++ b/README.md @@ -91,6 +91,12 @@ 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 +106,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? From 4029f168dfb3ca849998c4e79cc09e0d1d315722 Mon Sep 17 00:00:00 2001 From: Cutls Date: Sat, 13 Apr 2019 01:55:01 +0900 Subject: [PATCH 2/8] readme --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 9b7050d3..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,14 +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 From f9090e261d899646fef65c47979caa4640075bff Mon Sep 17 00:00:00 2001 From: Cutls Date: Sat, 13 Apr 2019 02:21:21 +0900 Subject: [PATCH 3/8] travis --- .travis.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index b4137415..1eacd718 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,15 @@ -os: osx -language: node_js -node_js: -- '10.15.2' +language: objective-c +cache: + directories: + - node_modules +env: + - NODE_VERSION="10.15.2" +before_install: + - git clone https://github.com/creationix/nvm.git /tmp/.nvm + - source /tmp/.nvm/nvm.sh + - nvm install $NODE_VERSION + - nvm use --delete-prefix $NODE_VERSION + - node --version script: node -v before_deploy: - brew update From b13849a427c7022b659bc58d3b974abb94345c27 Mon Sep 17 00:00:00 2001 From: Cutls Date: Sun, 14 Apr 2019 03:26:19 +0900 Subject: [PATCH 4/8] readme --- README.md | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index fe23c6b3..5bd1b26f 100644 --- a/README.md +++ b/README.md @@ -73,15 +73,34 @@ iTunes NowPlayingにアルバムアートワークを付けてくれた人 ## Build/ビルド Misskey(misskey.xyz) application token is not in cutls/TheDesk -Misskey(misskey.xyz)のトークンは含まれておりません。 -`git clone https://github.com/cutls/TheDesk` -`npm install electron -g` -`cd TheDesk/app` -`npm install` +Misskey(misskey.xyz)のトークンは含まれておりません。 + +```sh +git clone https://github.com/cutls/TheDesk +cd TheDesk/app +npm install +npm install --only=dev +``` ### electron-builder(推奨) -`electron-builder --target` -`target`は`win`か`linux`か`mac`を指定してください。 +Use npm scripts. +npm scriptsを利用します + +```sh +# Build for current platform +# 実行している環境向けにビルド +npm run build + +# Select build target +# ターゲットを指定してビルド +## Windows +npm run build:win + +## Windows and Linux (The macOS target should run on macOS. So, this option hasn't include the build for macOS) +## macOS向けのビルドにはmacOSで実行する必要があるためこのコマンドではビルドされません +npm run build:all +``` + Config is all on package.json ビルド設定はすべてpackage.jsonに記載しています。 From 6b58c88118f109600a31395006982eca3f6bb4f5 Mon Sep 17 00:00:00 2001 From: Cutls Date: Sun, 14 Apr 2019 03:46:15 +0900 Subject: [PATCH 5/8] travis --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1eacd718..465c275f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,11 +12,10 @@ before_install: - node --version script: node -v before_deploy: - - brew update - npm install electron-builder -g - cd app - npm install - - electron-builder --mac --x64 + - electron-builder --mac --x64 p never - mv ../build/TheDesk*.dmg ../TheDesk.dmg - mv ../build/TheDesk*.zip ../TheDesk-darwin-x64.zip - cd ../ From e36942180e6d6f3b9f50e309290b1e65766e3596 Mon Sep 17 00:00:00 2001 From: Cutls Date: Sun, 14 Apr 2019 03:48:44 +0900 Subject: [PATCH 6/8] restart --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 465c275f..98f40871 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ before_deploy: - npm install electron-builder -g - cd app - npm install - - electron-builder --mac --x64 p never + - electron-builder --mac --x64 -p never - mv ../build/TheDesk*.dmg ../TheDesk.dmg - mv ../build/TheDesk*.zip ../TheDesk-darwin-x64.zip - cd ../ From 68a3786fb839cad02d464935886fd05e00e162f6 Mon Sep 17 00:00:00 2001 From: Cutls Date: Sat, 25 May 2019 14:53:51 +0900 Subject: [PATCH 7/8] Create FUNDING.yml --- .github/FUNDING.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 00000000..dec2486b --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,8 @@ +# These are supported funding model platforms + +github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] +patreon: cutls +open_collective: # Replace with a single Open Collective username +ko_fi: # Replace with a single Ko-fi username +tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel +custom: # Replace with a single custom sponsorship URL From b0db765f2533d4734d76f478b74662de386c2d4a Mon Sep 17 00:00:00 2001 From: Cutls Date: Sat, 25 May 2019 16:43:13 +0900 Subject: [PATCH 8/8] Update FUNDING.yml --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index dec2486b..1a606dff 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -5,4 +5,4 @@ patreon: cutls open_collective: # Replace with a single Open Collective username ko_fi: # Replace with a single Ko-fi username tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel -custom: # Replace with a single custom sponsorship URL +custom: https://www.pixiv.net/fanbox/creator/28105985