Skip to content

Commit f1722ec

Browse files
authored
Merge pull request #736 from mikeller/improved_release_build
Improved 'release' build script. Changed version to 10.0.0-RC1.
2 parents 02b455b + 5949e07 commit f1722ec

File tree

4 files changed

+15
-5
lines changed

4 files changed

+15
-5
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ cache/
99
apps/
1010
dist/
1111
debug/
12+
release/

gulpfile.js

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ var runSequence = require('run-sequence');
1515
var distDir = './dist/';
1616
var appsDir = './apps/';
1717
var debugDir = './debug/';
18+
var releaseDir = './release/';
1819

1920
function get_task_name(key) {
2021
return 'build-' + key.replace(/([A-Z])/g, function ($1) { return "-" + $1.toLowerCase(); });
@@ -206,7 +207,7 @@ function get_release_filename(platform, ext) {
206207
gulp.task('release-windows', function () {
207208
var pkg = require('./package.json');
208209
var src = path.join(appsDir, pkg.name, 'win32');
209-
var output = fs.createWriteStream(path.join(appsDir, get_release_filename('win32', 'zip')));
210+
var output = fs.createWriteStream(path.join(releaseDir, get_release_filename('win32', 'zip')));
210211
var archive = archiver('zip', {
211212
zlib: { level: 9 }
212213
});
@@ -220,7 +221,7 @@ gulp.task('release-windows', function () {
220221
gulp.task('release-linux', function () {
221222
var pkg = require('./package.json');
222223
var src = path.join(appsDir, pkg.name, 'linux64');
223-
var output = fs.createWriteStream(path.join(appsDir, get_release_filename('linux64', 'zip')));
224+
var output = fs.createWriteStream(path.join(releaseDir, get_release_filename('linux64', 'zip')));
224225
var archive = archiver('zip', {
225226
zlib: { level: 9 }
226227
});
@@ -239,7 +240,7 @@ gulp.task('release-macos', function () {
239240
var sign_cmd = 'codesign --verbose --force --sign "' + process.env.CODESIGN_IDENTITY + '" ' + src;
240241
child_process.execSync(sign_cmd);
241242
}
242-
var output = fs.createWriteStream(path.join(appsDir, get_release_filename('macOS', 'zip')));
243+
var output = fs.createWriteStream(path.join(releaseDir, get_release_filename('macOS', 'zip')));
243244
var archive = archiver('zip', {
244245
zlib: { level: 9 }
245246
});
@@ -253,6 +254,14 @@ gulp.task('release-macos', function () {
253254

254255
// Create distributable .zip files in ./apps
255256
gulp.task('release', ['apps'], function () {
257+
fs.mkdir(releaseDir, "0775", function(err) {
258+
if (err) {
259+
if (err.code !== 'EEXIST') {
260+
throw err;
261+
}
262+
}
263+
});
264+
256265
return runSequence('release-macos', 'release-windows', 'release-linux');
257266
});
258267

manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"manifest_version": 2,
33
"minimum_chrome_version": "38",
4-
"version": "10.0.0",
4+
"version": "10.0.0-RC1",
55
"author": "Betaflight Squad",
66
"name": "Betaflight - Configurator",
77
"short_name": "Betaflight",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "betaflight-configurator",
33
"description": "Crossplatform configuration tool for Betaflight flight control system.",
4-
"version": "10.0.0",
4+
"version": "10.0.0-RC1",
55
"main": "main.html",
66
"default_locale": "en",
77
"scripts": {

0 commit comments

Comments
 (0)