Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade electron-builder #749

Merged
merged 7 commits into from
Apr 6, 2018
Merged

Upgrade electron-builder #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
624b874
Upgrade electron-builder
yuya-oc Feb 28, 2018
1b96df9
Fix electron-builder options
yuya-oc Feb 28, 2018
4d664ac
Use install-app-deps as subcommand
yuya-oc Mar 28, 2018
30640c6
Workaround for Linux icon
yuya-oc Apr 2, 2018
7b80586
Fix cp_artifacts.sh
yuya-oc Apr 2, 2018
3000854
Use zip target for macOS package
yuya-oc Apr 3, 2018
358a04e
Tweak linux icon for tar.gz
yuya-oc Apr 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions electron-builder.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,11 @@
"NOTICE.txt"
]
},
{
"from": "resources",
"filter": "icon.png"
},
{
"from": "resources/linux",
"filter": [
"create_desktop_file.sh",
"icon.png",
"README.md"
]
}
Expand All @@ -50,7 +47,7 @@
"mac": {
"category": "public.app-category.productivity",
"target": [
"tar.gz"
"zip"
],
"extraResources": [
{
Expand Down
10 changes: 5 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"url": "git://github.com/mattermost/desktop.git"
},
"scripts": {
"postinstall": "install-app-deps && npm run extract-dict",
"postinstall": "electron-builder install-app-deps && npm run extract-dict",
"extract-dict": "node scripts/extract_dict.js src/node_modules/simple-spellchecker/dict",
"build": "npm-run-all build:*",
"build:main": "webpack --bail --config webpack.config.main.js",
Expand All @@ -27,9 +27,9 @@
"test": "npm-run-all test:* lint:*",
"test:app": "npm run build && mocha --reporter mocha-circleci-reporter --recursive test/specs",
"package:all": "cross-env NODE_ENV=production npm-run-all check-build-config package:windows package:mac package:linux",
"package:windows": "cross-env NODE_ENV=production npm-run-all check-build-config build && build --win --x64 --ia32 --em.name=mattermost --publish=never && npm run manipulate-windows-zip",
"package:windows": "cross-env NODE_ENV=production npm-run-all check-build-config build && build --win --x64 --ia32 --publish=never && npm run manipulate-windows-zip",
"package:mac": "cross-env NODE_ENV=production npm-run-all check-build-config build && build --mac --publish=never",
"package:linux": "cross-env NODE_ENV=production npm-run-all check-build-config build && build --linux --x64 --ia32 --em.name=mattermost-desktop --publish=never",
"package:linux": "cross-env NODE_ENV=production npm-run-all check-build-config build && build --linux --x64 --ia32 --config.extraMetadata.name=mattermost-desktop --publish=never",
"manipulate-windows-zip": "node scripts/manipulate_windows_zip.js",
"lint:js": "eslint --ignore-path .gitignore --ignore-pattern node_modules --ext .js --ext .jsx .",
"fix:js": "eslint --ignore-path .gitignore --ignore-pattern node_modules --quiet --ext .js --ext .jsx . --fix",
Expand All @@ -48,8 +48,8 @@
"css-loader": "^0.28.9",
"devtron": "^1.4.0",
"electron": "1.8.4",
"electron-builder": "17.4.0",
"electron-builder-squirrel-windows": "17.4.0",
"electron-builder": "20.8.1",
"electron-builder-squirrel-windows": "~20.8.0",
"electron-connect": "^0.6.3",
"eslint": "^4.18.0",
"eslint-plugin-import": "^2.8.0",
Expand Down
0 resources/icon.png → resources/linux/icon.png
View file
Open in desktop
File renamed without changes
6 changes: 3 additions & 3 deletions scripts/cp_artifacts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ DEST=$2

cp "${SRC}/Mattermost-${VERSION}-win.zip" "${DEST}/mattermost-desktop-${VERSION}-win64.zip"
cp "${SRC}/Mattermost-${VERSION}-ia32-win.zip" "${DEST}/mattermost-desktop-${VERSION}-win32.zip"
cp "${SRC}/win/Mattermost Setup ${VERSION}.exe" "${DEST}/mattermost-setup-${VERSION}-win64.exe"
cp "${SRC}/win-ia32/Mattermost Setup ${VERSION}-ia32.exe" "${DEST}/mattermost-setup-${VERSION}-win32.exe"
cp "${SRC}/squirrel-windows/Mattermost Setup ${VERSION}.exe" "${DEST}/mattermost-setup-${VERSION}-win64.exe"
cp "${SRC}/squirrel-windows-ia32/Mattermost Setup ${VERSION}.exe" "${DEST}/mattermost-setup-${VERSION}-win32.exe"

cp "${SRC}/Mattermost-${VERSION}-mac.tar.gz" "${DEST}/mattermost-desktop-${VERSION}-mac.tar.gz"
cp "${SRC}/Mattermost-${VERSION}-mac.zip" "${DEST}/mattermost-desktop-${VERSION}-mac.zip"

cp "${SRC}/mattermost-desktop-${VERSION}.tar.gz" "${DEST}/mattermost-desktop-${VERSION}-linux-x64.tar.gz"
cp "${SRC}/mattermost-desktop-${VERSION}-ia32.tar.gz" "${DEST}/mattermost-desktop-${VERSION}-linux-ia32.tar.gz"
Expand Down
Loading