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

Installers #339

Merged
merged 8 commits into from
Jun 23, 2017
Merged

Installers #339

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b9d76c9
Add electron-builder and create installers
martpie Apr 18, 2017
4da84c4
Fix builds not including app.html
martpie Apr 18, 2017
57aedce
Fix images not included in builds
martpie Apr 18, 2017
ec704fd
Fix conflicts from master
martpie May 22, 2017
cde9ff8
Fix Linux build and add productName key in package.json
martpie May 22, 2017
8495ae2
Add AppImage for Linux (fix #335)
martpie May 22, 2017
9cd37bb
Remove electron-packager
martpie May 22, 2017
02bc493
Add category for Linux build, clean some files
martpie May 22, 2017
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
node_modules/
src/dist
dist/
cache/
build/dist

Expand Down
Binary file added build/icon.icns
View file
Open in desktop
Binary file not shown.
Binary file added build/icon.ico
View file
Open in desktop
Binary file not shown.
9 changes: 0 additions & 9 deletions build/museeks.desktop
View file
Open in desktop

This file was deleted.

42 changes: 40 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type": "git",
"url": "https://github.com/KeitIG/museeks"
},
"author": "Pierre de la Martinière",
"author": "Pierre de la Martinière <[email protected]>",
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can be split into multiple fields: https://docs.npmjs.com/files/package.json#people-fields-author-contributors

Copy link
Owner Author

Choose a reason for hiding this comment

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

Or you can shorten that all into a single string, and npm will parse it for you "Barney Rubble <[email protected]> (http://barnyrubble.tumblr.com/)"

I guess it's fine

"license": "MIT",
"bugs": {
"url": "https://github.com/KeitIG/museeks/issues"
Expand All @@ -20,7 +20,42 @@
"compile": "webpack --config webpack.config.js --progress --colors",
"lint": "eslint . --config .eslintrc --cache",
"dev": "webpack --config webpack.config.js --progress --colors --watch",
"build": "npm run build:eslint && npm run build:compile && node build.js"
"build": "npm run build:eslint && npm run build:compile && node build.js",
"package:lw": "build -lw --ia32 --x64",
"package:l": "build -l --ia32 --x64",
"package:w": "build -w --ia32 --x64",
"package:m": "build -m"
},
"build": {
"appId": "io.museeks.app",
"files": [
"src/*",
"src/dist/**/*",
"src/main-process/**/*",
"node_modules/teeny-conf/**/*"
],
"mac": {
"category": "public.app-category.music"
},
"dmg": {
"contents": [
{
"x": 110,
"y": 150
},
{
"x": 240,
"y": 150,
"type": "link",
"path": "/Applications"
}
]
},
"linux": {
"target": [
"deb"
]
}
},
"dependencies": {
"bluebird": "^3.5.0",
Expand Down Expand Up @@ -49,6 +84,7 @@
"teeny-conf": "1.1.0"
},
"devDependencies": {
"asar": "^0.13.0",
"babel-core": "6.23.1",
"babel-eslint": "7.1.1",
"babel-loader": "6.3.2",
Expand All @@ -58,6 +94,8 @@
"babel-preset-react": "6.23.0",
"babili-webpack-plugin": "0.0.11",
"css-loader": "0.26.2",
"electron": "^1.6.2",
"electron-builder": "^17.0.1",
"electron-packager": "8.5.2",
"eslint": "3.17.0",
"eslint-plugin-import": "2.2.0",
Expand Down