From 72e4ecbc0edf0aed2fac7e071bce41ca31126f3b Mon Sep 17 00:00:00 2001 From: "Ernest Stepanov (ErNis)" Date: Wed, 13 Jul 2022 14:53:01 +0300 Subject: [PATCH 1/3] Naming adjustment for .rpm linux64 build --- gulpfile.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index 99bf935..cb99a14 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -82,6 +82,10 @@ function getRunDebugAppCommand() { } } +function get_release_filename_linux(platform) { + return 'INAV-BlackboxExplorer_' + platform; +} + function get_release_filename(platform, ext, addition = '') { return 'INAV-BlackboxExplorer_' + platform + addition + '_' + pkg.version + '.' + ext; } @@ -582,7 +586,7 @@ function release_rpm(arch) { createDirIfNotExists(appsDir); const options = { - name: metadata.name, + name: get_release_filename_linux(arch), //metadata.name, version: metadata.version.replace(NAME_REGEX, '_'), // RPM does not like release candidate versions buildArch: getLinuxPackageArch('rpm', arch), vendor: metadata.author, From c201c1f5937bd4ed5c7683fb730383d80aabd919 Mon Sep 17 00:00:00 2001 From: "Ernest Stepanov (ErNis)" Date: Wed, 13 Jul 2022 15:25:49 +0300 Subject: [PATCH 2/3] Naming adjustment for .deb linux build --- gulpfile.js | 20 +++++++++++++++++++- package-lock.json | 16 ++++++++++++++++ package.json | 1 + 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index cb99a14..014df5f 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -561,6 +561,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_linux(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) { @@ -660,7 +678,7 @@ 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-linux64', gulp.series(releaseLinux(64), post_build('linux64', appsDir), release_deb('linux64'), post_release_deb('linux64'), release_rpm('linux64'))); gulp.task('release', gulp.series('apps', 'clean-release', getPlatforms().map(function(v) { return 'release-' + v; }))); diff --git a/package-lock.json b/package-lock.json index 1983680..16d28a0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,6 +32,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" @@ -3152,6 +3153,15 @@ "title-case": "^2.1.0" } }, + "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", @@ -10298,6 +10308,12 @@ "title-case": "^2.1.0" } }, + "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", diff --git a/package.json b/package.json index 97a94ca..3aeeb15 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,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" From d59e8ad9dd7f7534f4087e036747227c7fffc90a Mon Sep 17 00:00:00 2001 From: "Ernest Stepanov (ErNis)" Date: Wed, 13 Jul 2022 15:29:29 +0300 Subject: [PATCH 3/3] cleanup --- gulpfile.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 014df5f..98fadc2 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -82,12 +82,12 @@ function getRunDebugAppCommand() { } } -function get_release_filename_linux(platform) { +function get_release_filename_base(platform) { return 'INAV-BlackboxExplorer_' + platform; } function get_release_filename(platform, ext, addition = '') { - return 'INAV-BlackboxExplorer_' + platform + addition + '_' + pkg.version + '.' + ext; + return get_release_filename_base(platform) + addition + '_' + pkg.version + '.' + ext; } function get_nw_version() { @@ -567,7 +567,7 @@ function post_release_deb(arch) { 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_linux(arch) + '_' + metadata.version + '.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) @@ -604,7 +604,7 @@ function release_rpm(arch) { createDirIfNotExists(appsDir); const options = { - name: get_release_filename_linux(arch), //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,