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

Jump to bottom

Fix dependencies for electron windows builds #8397

Closed
wants to merge 6 commits into from
Closed

Fix dependencies for electron windows builds #8397

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c421c0b
cleanup script for the deployment dir
Feb 2, 2019
db9cace
Fix dependencies for electron windows builds
anoadragon453 Feb 4, 2019
9837310
Add different arches and update script name
anoadragon453 Feb 4, 2019
dad28a6
Merge branch 'develop' of github.com:vector-im/riot-web into anoa/bui…
anoadragon453 Feb 4, 2019
9d891ef
Remove mysterious script
anoadragon453 Feb 4, 2019
186a163
Add linux and mac specific electron build scripts
anoadragon453 Feb 4, 2019
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
5 changes: 4 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
"build:bundle": "cross-env NODE_ENV=production webpack -p --progress --bail --mode production",
"build:bundle:dev": "webpack --progress --bail --mode development",
"build:electron": "npm run clean && npm run build && npm run install:electron && build -wml --ia32 --x64",
"build:electron:linux": "npm run build && build -l --ia32 --x64",
"build:electron:macos": "npm run build && build -m --ia32 --x64",
"build:electron:windows": "npm run build && build -w --ia32 --x64",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you're adding this we should probably add equivalents for linux & windows

"build:react-sdk": "node scripts/npm-sub.js matrix-react-sdk run build",
"build:js-sdk": "node scripts/npm-sub.js matrix-js-sdk run start:init",
"build": "npm run build:js-sdk && npm run build:react-sdk && npm run reskindex && npm run build:res && npm run build:bundle",
Expand Down Expand Up @@ -102,7 +105,7 @@
"cross-env": "^4.0.0",
"css-loader": "^2.1.0",
"electron-builder": "^20.38.5",
"electron-builder-squirrel-windows": "^11.6.1",
"electron-builder-squirrel-windows": "^20.38.5",
"electron-devtools-installer": "^2.2.4",
"emojione": "^2.2.7",
"eslint": "^5.8.0",
Expand Down