1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-24 16:55:22 +03:00

Merge branch 'master' into dzikuvx-pid-tuning-tabs

This commit is contained in:
Pawel Spychalski (DzikuVx) 2019-12-09 17:57:42 +01:00
commit f56b6ef40c
11 changed files with 477 additions and 173 deletions

View file

@ -8,6 +8,7 @@ var minimist = require('minimist');
var archiver = require('archiver');
var del = require('del');
var NwBuilder = require('nw-builder');
var semver = require('semver');
var gulp = require('gulp');
var concat = require('gulp-concat');
@ -237,6 +238,7 @@ gulp.task('apps', gulp.series('dist', function(done) {
flavor: 'normal',
macIcns: './images/inav.icns',
winIco: './images/inav.ico',
version: get_nw_version()
});
builder.on('log', console.log);
builder.build(function (err) {
@ -250,6 +252,10 @@ gulp.task('apps', gulp.series('dist', function(done) {
});
}));
function get_nw_version() {
return semver.valid(semver.coerce(require('./package.json').dependencies.nw));
}
function get_release_filename(platform, ext) {
var pkg = require('./package.json');
return 'INAV-Configurator_' + platform + '_' + pkg.version + '.' + ext;
@ -307,9 +313,10 @@ function releaseLinux(bits) {
var dirname = 'linux' + bits;
var pkg = require('./package.json');
var src = path.join(appsDir, pkg.name, dirname);
var output = fs.createWriteStream(path.join(appsDir, get_release_filename(dirname, 'zip')));
var archive = archiver('zip', {
zlib: { level: 9 }
var output = fs.createWriteStream(path.join(appsDir, get_release_filename(dirname, 'tar.gz')));
var archive = archiver('tar', {
zlib: { level: 9 },
gzip: true
});
archive.on('warning', function(err) { throw err; });
archive.on('error', function(err) { throw err; });