Skip to content

Commit

Permalink
Add linux build.
Browse files Browse the repository at this point in the history
  • Loading branch information
airycanon committed Aug 24, 2017
1 parent 75cf2f1 commit 12429a4
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion main.js
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ const createMainWindow = () => {
};

app.setName(pkg.name);
app.dock.setIcon(`${__dirname}/src/assets/images/dock.png`);
app.dock && app.dock.setIcon(`${__dirname}/src/assets/images/dock.png`);

app.on('ready', createMainWindow);
app.on('activate', e => {
Expand Down
13 changes: 9 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"build-main": "cross-env NODE_ENV=production node -r babel-register ./node_modules/webpack/bin/webpack --config ./config/webpack.config.electron.js --progress --profile --colors",
"build-renderer": "cross-env NODE_ENV=production node -r babel-register ./node_modules/webpack/bin/webpack --config ./config/webpack.config.production.js --progress --profile --colors",
"build": "rm -rf dist && npm run build-main && npm run build-renderer",
"package": "npm run build && rm -rf release && build --projectDir ./dist",
"package-linux": "npm run build && rm -rf release && build --linux --projectDir ./dist",
"package-mac": "npm run build && rm -rf release && build --mac --projectDir ./dist",
"hot-server": "cross-env NODE_ENV=development node -r babel-register scripts/dev.js",
"start-hot": "cross-env HOT=1 NODE_ENV=development ./node_modules/.bin/electron -r babel-register -r babel-polyfill ./main",
"dev": "concurrently --kill-others \"npm run hot-server\" \"npm run start-hot\""
Expand Down Expand Up @@ -41,6 +42,10 @@
"mac": {
"icon": "../resource/icon.icns"
},
"linux": {
"icon": "../resource",
"category": "Chat"
},
"directories": {
"output": "../release"
}
Expand Down Expand Up @@ -86,6 +91,7 @@
"cross-env": "^5.0.1",
"css-loader": "^0.28.4",
"electron": "^1.6.11",
"electron-builder": "^19.24.1",
"eslint": "^4.1.1",
"eslint-config-standard": "^10.2.1",
"eslint-config-standard-react": "^5.0.0",
Expand All @@ -96,8 +102,9 @@
"eslint-plugin-react": "^7.1.0",
"eslint-plugin-standard": "^3.0.1",
"express": "^4.15.3",
"electron-builder": "^19.24.1",
"extract-text-webpack-plugin": "^3.0.0",
"file-loader": "^0.11.2",
"html-webpack-plugin": "^2.30.1",
"json-loader": "^0.5.4",
"postcss-autoreset": "^2.0.0",
"postcss-cssnext": "^2.11.0",
Expand All @@ -109,8 +116,6 @@
"stylelint-config-standard": "^17.0.0",
"url-loader": "^0.5.9",
"webpack": "^3.0.0",
"html-webpack-plugin": "^2.30.1",
"extract-text-webpack-plugin": "^3.0.0",
"webpack-dev-middleware": "^1.11.0",
"webpack-hot-middleware": "^2.18.0"
}
Expand Down
Binary file added resource/128x128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resource/16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resource/32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resource/48x48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resource/64x64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resource/96x96.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 12429a4

Please sign in to comment.