masq
/
glowing-bear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #810 from kode54/update_electron 

Update Electron packager, update PhantomJS to latest phantomjs-prebui…
This commit is contained in:
Lorenz Hübschle-Schneider 2016-08-23 10:50:43 +02:00 committed by GitHub
parent 5054d6ba6d 0c319d2ba3
commit 59d3fa6f41
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
electron.makefile
View File

@ -18,10 +18,10 @@ uselocal: copylocal
# build the electron app for various platforms
build-electron-windows: uselocal
electron-packager ${ELECTRON_COMMON} --platform=win32 --arch=ia32 --version=1.0.0 --icon=assets/img/favicon.ico --asar=true
electron-packager ${ELECTRON_COMMON} --platform=win32 --arch=ia32 --version=1.3.3 --icon=assets/img/favicon.ico --asar=true
build-electron-darwin: uselocal
electron-packager ${ELECTRON_COMMON} --platform=darwin --arch=x64 --version=1.0.0 --icon=assets/img/glowing-bear.icns
electron-packager ${ELECTRON_COMMON} --platform=darwin --arch=x64 --version=1.3.3 --icon=assets/img/glowing-bear.icns
build-electron-linux: uselocal
electron-packager ${ELECTRON_COMMON} --platform=linux --arch=x64 --version=1.0.0 --icon=assets/img/favicon.ico
electron-packager ${ELECTRON_COMMON} --platform=linux --arch=x64 --version=1.3.3 --icon=assets/img/favicon.ico

4
package.json
View File

@ -8,7 +8,7 @@
"license": "GPLv3",
"devDependencies": {
"bower": "^1.3.1",
"electron-packager": "^6.0.0",
"electron-packager": "^7.0.0",
"http-server": "^0.6.1",
"jasmine-core": "^2.4.1",
"jshint": "^2.5.2",
@ -16,7 +16,7 @@
"karma-jasmine": "^0.3.6",
"karma-junit-reporter": "^0.2.2",
"karma-phantomjs-launcher": "^0.2.1",
"phantomjs": "^1.9.19",
"phantomjs-prebuilt": "^2.1.1",
"protractor": "~0.20.1",
"shelljs": "^0.2.6",
"uglify-js": "^2.4"