Browse Source

Update electron-winstaller

We can now use a more recent electron-winstaller as we now handle our shortcuts and their appUserModelId's internally
pull/1438/head
Samuel Attard 6 years ago
parent
commit
a72a524bd9
  1. 12
      gulpfile.babel.js
  2. 6
      package.json
  3. 1
      vendor/rebuild_ia32.bat

12
gulpfile.babel.js

@ -48,7 +48,7 @@ const defaultPackageConf = {
'app-version': packageJSON.version,
arch: 'all',
'build-version': packageJSON.version,
dir: '.',
dir: __dirname,
icon: './build/assets/img/main',
ignore: (path) => {
const tests = [
@ -230,7 +230,6 @@ gulp.task('watch', ['build'], () => {
});
gulp.task('package:win', ['clean-dist-win', 'build-release'], (done) => {
console.log('Rebuilding ll-keyboard-hook-win'); // eslint-disable-line
rebuild('rebuild_ia32.bat')
.then(() => {
packager(_.extend({}, defaultPackageConf, { platform: 'win32', arch: 'ia32' }), () => {
@ -242,7 +241,8 @@ gulp.task('package:win', ['clean-dist-win', 'build-release'], (done) => {
});
}, 1000);
});
});
})
.catch((err) => done(err));
});
gulp.task('make:win', ['package:win'], (done) => {
@ -253,14 +253,16 @@ gulp.task('make:win', ['package:win'], (done) => {
done();
});
});
});
})
.catch((err) => done(err));
});
gulp.task('package:darwin', ['clean-dist-darwin', 'build-release'], (done) => {
rebuild('./rebuild_null.sh')
.then(() => {
packager(_.extend({}, defaultPackageConf, { platform: 'darwin', 'osx-sign': { identity: 'Developer ID Application: Samuel Attard (S7WPQ45ZU2)' } }), done); // eslint-disable-line
});
})
.catch((err) => done(err));
});
gulp.task('make:darwin', ['package:darwin'], (done) => {

6
package.json

@ -17,12 +17,12 @@
"make:deb:64": "gulp deb:linux:64",
"make:rpm:32": "gulp rpm:linux:32",
"make:rpm:64": "gulp rpm:linux:64",
"make:win": "gulp make:win && npm run postinstall",
"make:win": "gulp make:win",
"package:darwin": "gulp package:darwin",
"package:linux": "gulp package:linux",
"package:linux:32": "gulp package:linux:32",
"package:linux:64": "gulp package:linux:64",
"package:win": "gulp package:win && npm run postinstall",
"package:win": "gulp package:win",
"postinstall": "node vendor/rebuild.js --instant",
"test": "npm run lint",
"pretest-unit": "npm run build",
@ -78,7 +78,7 @@
"electron-mocha": "^3.0.0",
"electron-packager": "^7.0.1",
"electron-rebuild": "^1.1.4",
"electron-winstaller": "2.2.0",
"electron-winstaller": "2.3.3",
"eslint": "^3.1.1",
"eslint-config-airbnb-base": "^5.0.0",
"eslint-plugin-import": "^1.7.0",

1
vendor/rebuild_ia32.bat

@ -1,3 +1,4 @@
@echo off
cd ..
cd node_modules
rmdir /Q /S nslog\build 2>nul

Loading…
Cancel
Save