Commit cd3a3708 authored by Niccolò Maggioni's avatar Niccolò Maggioni Committed by Pawel Spychalski (DzikuVx)
Browse files

Pin NW.js version used by NwBuilder

Sourced from package's deps
parent 213955c9
......@@ -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');
......@@ -235,6 +236,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) {
......@@ -248,6 +250,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;
......
{
"name": "inav-configurator",
"version": "2.3.0",
"version": "2.3.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
......@@ -3725,7 +3725,7 @@
"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
"requires": {
"is-plain-object": "2.0.4"
"is-plain-object": "^2.0.4"
}
}
}
......@@ -3857,10 +3857,24 @@
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
"requires": {
<<<<<<< HEAD
"hosted-git-info": "2.7.1",
"resolve": "1.10.0",
"semver": "5.6.0",
"validate-npm-package-license": "3.0.4"
=======
"hosted-git-info": "^2.1.4",
"resolve": "^1.10.0",
"semver": "2 || 3 || 4 || 5",
"validate-npm-package-license": "^3.0.1"
},
"dependencies": {
"semver": {
"version": "5.7.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
}
>>>>>>> fc8cfeb2... Pin NW.js version used by NwBuilder
}
},
"normalize-path": {
......@@ -3934,6 +3948,11 @@
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
"integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8="
},
"semver": {
"version": "5.7.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
},
"yargs": {
"version": "3.32.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
......@@ -3956,6 +3975,7 @@
"integrity": "sha512-7LTQu8oom56xdDeyoUygZytxvyWuh+pw4nY4eFMGUd7/m/eOdAs/6UZjav6CbjnyIg8n4FtwnjCXXLsFI6Ooug==",
"dev": true,
"requires": {
<<<<<<< HEAD
"archiver": "2.1.1",
"boxen": "1.3.0",
"chalk": "2.4.2",
......@@ -3980,6 +4000,32 @@
"thenify": "3.3.0",
"update-notifier": "2.5.0",
"winresourcer": "0.9.0"
=======
"archiver": "^2.1.1",
"boxen": "^1.1.0",
"chalk": "^2.3.2",
"deprecate": "~1.0.0",
"extract-zip": "^1.6.5",
"graceful-fs-extra": "^2.0.0",
"graceful-ncp": "^3.0.0",
"inherits": "~2.0.1",
"lazy-req": "^2.0.0",
"lodash": "~4.17.4",
"optimist": "^0.6.1",
"plist": "^3.0.1",
"progress": "~2.0.0",
"rcedit": "^1.0.0",
"recursive-readdir-sync": "^1.0.6",
"request": "^2.88.0",
"rimraf": "^2.5.2",
"semver": "^5.5.0",
"simple-glob": "~0.2.0",
"tar-fs": "^1.13.0",
"temp": "github:adam-lynch/node-temp#remove_tmpdir_dep",
"thenify": "^3.3.0",
"update-notifier": "^2.4.0",
"winresourcer": "^0.9.0"
>>>>>>> fc8cfeb2... Pin NW.js version used by NwBuilder
},
"dependencies": {
"ansi-styles": {
......@@ -4002,6 +4048,12 @@
"supports-color": "5.5.0"
}
},
"semver": {
"version": "5.7.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
"dev": true
},
"supports-color": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
......@@ -4013,6 +4065,10 @@
},
"temp": {
"version": "github:adam-lynch/node-temp#279c1350cb7e4f02515d91da9e35d39a40774016",
<<<<<<< HEAD
=======
"from": "github:adam-lynch/node-temp#remove_tmpdir_dep",
>>>>>>> fc8cfeb2... Pin NW.js version used by NwBuilder
"dev": true,
"requires": {
"rimraf": "2.2.8"
......@@ -4276,10 +4332,25 @@
"integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
"dev": true,
"requires": {
<<<<<<< HEAD
"got": "6.7.1",
"registry-auth-token": "3.4.0",
"registry-url": "3.1.0",
"semver": "5.6.0"
=======
"got": "^6.7.1",
"registry-auth-token": "^3.0.1",
"registry-url": "^3.0.3",
"semver": "^5.1.0"
},
"dependencies": {
"semver": {
"version": "5.7.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
"dev": true
}
>>>>>>> fc8cfeb2... Pin NW.js version used by NwBuilder
}
},
"parse-filepath": {
......@@ -5064,9 +5135,10 @@
}
},
"semver": {
"version": "5.6.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
"integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
"dev": true
},
"semver-diff": {
"version": "2.1.0",
......@@ -5074,7 +5146,19 @@
"integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
"dev": true,
"requires": {
<<<<<<< HEAD
"semver": "5.6.0"
=======
"semver": "^5.0.3"
},
"dependencies": {
"semver": {
"version": "5.7.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
"dev": true
}
>>>>>>> fc8cfeb2... Pin NW.js version used by NwBuilder
}
},
"semver-greatest-satisfied-range": {
......@@ -5126,7 +5210,7 @@
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"requires": {
"is-extendable": "0.1.1"
"is-extendable": "^0.1.0"
}
}
}
......@@ -5946,7 +6030,7 @@
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"requires": {
"is-extendable": "0.1.1"
"is-extendable": "^0.1.0"
}
},
"set-value": {
......
......@@ -41,6 +41,7 @@
"xml2js": "^0.4.19"
},
"devDependencies": {
"nw-builder": "^3.5.7"
"nw-builder": "^3.5.7",
"semver": "6.3.0"
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment