Proper two package.json format, release.sh bumps 2nd json ver too

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2017-05-05 16:54:55 +01:00
parent 9e2324fb69
commit f54708227e
3 changed files with 26 additions and 7 deletions

View file

@ -1,5 +1,9 @@
{ {
"description": "Electron main process dependencies", "name": "riot-web",
"main": "src/electron-main.js",
"version": "0.0.0",
"description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.",
"dependencies": { "dependencies": {
"electron-window-state": "^4.1.0" "electron-window-state": "^4.1.0"
} }

View file

@ -146,11 +146,12 @@
"dereference": true, "dereference": true,
"//files": "We bundle everything, so we only need to include webapp/", "//files": "We bundle everything, so we only need to include webapp/",
"files": [ "files": [
"electron/node_modules/**", "node_modules/**",
"electron/src/**", "src/**",
"electron/img/**", "img/**"
"webapp/**", ],
"package.json" "extraResources": [
"webapp/**/*"
], ],
"linux": { "linux": {
"target": "deb", "target": "deb",
@ -164,7 +165,8 @@
}, },
"directories": { "directories": {
"buildResources": "electron/build", "buildResources": "electron/build",
"output": "electron/dist" "output": "electron/dist",
"app": "electron"
} }
} }
} }

View file

@ -9,4 +9,17 @@ set -e
cd `dirname $0` cd `dirname $0`
# bump Electron's package.json first
release="${1#v}"
tag="v${release}"
echo "electron npm version"
cd electron
npm version --no-git-tag-version "$release"
git commit package.json -m "$tag"
cd ..
exec ./node_modules/matrix-js-sdk/release.sh -z "$@" exec ./node_modules/matrix-js-sdk/release.sh -z "$@"