From a5e880d0140c9faa3308bd06e8bac5f4c72f4993 Mon Sep 17 00:00:00 2001 From: Miguel Angel Mulero Martinez Date: Tue, 4 Jan 2022 14:52:22 +0100 Subject: [PATCH] Add portable build to windows --- assets/windows/installer.iss | 2 +- gulpfile.js | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/assets/windows/installer.iss b/assets/windows/installer.iss index 9070c724..345c1d01 100644 --- a/assets/windows/installer.iss +++ b/assets/windows/installer.iss @@ -14,7 +14,7 @@ #define CompanyUrl "https://betaflight.com/" #define ExecutableFileName "betaflight-configurator.exe" #define GroupName "Betaflight" -#define InstallerFileName "betaflight-configurator-installer_" + version + "_" + archName +#define InstallerFileName "betaflight-configurator_" + version + "_" + archName + "-installer" #define SourcePath "..\..\" + sourceFolder + "\betaflight-configurator\" + archName #define TargetFolderName "Betaflight-Configurator" #define UpdatesUrl "https://github.com/betaflight/betaflight-configurator/releases" diff --git a/gulpfile.js b/gulpfile.js index 7d7769a9..9da95533 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -249,8 +249,8 @@ function getRunDebugAppCommand(arch) { return command; } -function getReleaseFilename(platform, ext) { - return `${metadata.name}_${metadata.version}_${platform}.${ext}`; +function getReleaseFilename(platform, ext, portable = false) { + return `${metadata.name}_${metadata.version}_${platform}${portable ? "-portable" : ""}.${ext}`; } function clean_dist() { @@ -688,7 +688,7 @@ function release_win(arch, appDirectory, done) { // Create distribution package (zip) for windows and linux platforms function release_zip(arch, appDirectory) { const src = path.join(appDirectory, metadata.name, arch, '**'); - const output = getReleaseFilename(arch, 'zip'); + const output = getReleaseFilename(arch, 'zip', true); const base = path.join(appDirectory, metadata.name, arch); return compressFiles(src, base, output, 'Betaflight Configurator'); @@ -885,12 +885,18 @@ function listReleaseTasks(isReleaseBuild, appDirectory) { } if (platforms.indexOf('win32') !== -1) { + releaseTasks.push(function release_win32_zip() { + return release_zip('win32', appDirectory); + }); releaseTasks.push(function release_win32(done) { return release_win('win32', appDirectory, done); }); } if (platforms.indexOf('win64') !== -1) { + releaseTasks.push(function release_win64_zip() { + return release_zip('win64', appDirectory); + }); releaseTasks.push(function release_win64(done) { return release_win('win64', appDirectory, done); });