Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-17 13:25:22 +03:00
Code Wiki Activity

linux installers naming cherrypick from blackbox-explorer

Browse source
This commit is contained in:
Ernest Stepanov (ErNis) 2022-07-15 12:46:45 +03:00
parent b8412534f4
commit bda248dc1c
3 changed files with 43 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

30
gulpfile.js
View file

@ -286,9 +286,13 @@ function get_nw_version() {
return semver.valid(semver.coerce(require('./package.json').dependencies.nw));
}
function get_release_filename_base(platform) {
return 'INAV-Configurator_' + platform;
}
function get_release_filename(platform, ext, addition = '') {
var pkg = require('./package.json');
return 'INAV-Configurator_' + platform + addition + '_' + pkg.version + '.' + ext;
return get_release_filename_base(platform) + addition + '_' + pkg.version + '.' + ext;
}
function build_win_zip(arch) {
@ -582,6 +586,24 @@ function release_deb(arch) {
}
}
function post_release_deb(arch) {
return function post_release_linux_deb(done) {
if ((arch === 'linux32') || (arch === 'linux64')) {
var rename = require("gulp-rename");
const metadata = require('./package.json');
const renameFrom = path.join(appsDir, metadata.name + '_' + metadata.version + '_' + getLinuxPackageArch('.deb', arch) + '.deb');
const renameTo = path.join(appsDir, get_release_filename_base(arch) + '_' + metadata.version + '.deb');
// Rename .deb build to common naming
console.log(`Renaming .deb installer ${renameFrom} to ${renameTo}`);
return gulp.src(renameFrom)
.pipe(rename(renameTo))
.pipe(gulp.dest("."));
}
return done();
}
}
function release_rpm(arch) {
return function release_rpm_proc(done) {
if (!getArguments().installer) {
@ -607,7 +629,7 @@ function release_rpm(arch) {
createDirIfNotExists(appsDir);
const options = {
name: metadata.name,
name: get_release_filename_base(arch), // metadata.name,
version: metadata.version.replace(NAME_REGEX, '_'), // RPM does not like release candidate versions
buildArch: getLinuxPackageArch('rpm', arch),
vendor: metadata.author,
@ -680,8 +702,8 @@ function releaseLinux(bits) {
}
}
gulp.task('release-linux32', gulp.series(releaseLinux(32), post_build('linux32', appsDir), release_deb('linux32')));
gulp.task('release-linux64', gulp.series(releaseLinux(64), post_build('linux64', appsDir), release_deb('linux64'), release_rpm('linux64')));
gulp.task('release-linux32', gulp.series(releaseLinux(32), post_build('linux32', appsDir), release_deb('linux32'), post_release_deb('linux32')));
gulp.task('release-linux64', gulp.series(releaseLinux(64), post_build('linux64', appsDir), release_deb('linux64'), post_release_deb('linux64'), release_rpm('linux64')));
// Create distributable .zip files in ./apps
gulp.task('release', gulp.series('apps', getPlatforms().map(function(v) { return 'release-' + v; })));

16
package-lock.json generated
View file

@ -33,6 +33,7 @@
"devDependencies": {
"@quanle94/innosetup": "^6.0.2",
"gulp-debian": "^0.1.9",
"gulp-rename": "^2.0.0",
"nw-builder": "^3.5.7",
"rpm-builder": "^1.2.1",
"semver": "6.3.0"
@ -4160,6 +4161,15 @@
"graceful-fs": "^4.1.6"
}
},
"node_modules/gulp-rename": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.0.0.tgz",
"integrity": "sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ==",
"dev": true,
"engines": {
"node": ">=4"
}
},
"node_modules/gulp-util": {
"version": "3.0.8",
"resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
@ -12821,6 +12831,12 @@
}
}
},
"gulp-rename": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.0.0.tgz",
"integrity": "sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ==",
"dev": true
},
"gulp-util": {
"version": "3.0.8",
"resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",

1
package.json
View file

@ -46,6 +46,7 @@
},
"devDependencies": {
"gulp-debian": "^0.1.9",
"gulp-rename": "^2.0.0",
"nw-builder": "^3.5.7",
"rpm-builder": "^1.2.1",
"semver": "6.3.0",