diff options
author | Michael Keller <github@ike.ch> | 2017-11-22 13:02:20 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-22 13:02:20 +0300 |
commit | f1722ec2eb225875b6f983b07e8aa750915a9aa9 (patch) | |
tree | d6cd0388cbc468eb8a196d2a61266a22c6d2f493 | |
parent | 02b455bef7f88c3f12f964e8a063b4ccc399f1a2 (diff) | |
parent | 5949e07c7ae35ddb0ce191d3153a30e6920c9eea (diff) |
Merge pull request #736 from mikeller/improved_release_build10.0.0-RC1
Improved 'release' build script. Changed version to 10.0.0-RC1.
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | gulpfile.js | 15 | ||||
-rwxr-xr-x | manifest.json | 2 | ||||
-rw-r--r-- | package.json | 2 |
4 files changed, 15 insertions, 5 deletions
@@ -9,3 +9,4 @@ cache/ apps/ dist/ debug/ +release/ diff --git a/gulpfile.js b/gulpfile.js index f8ea2310..2a6f97fa 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -15,6 +15,7 @@ var runSequence = require('run-sequence'); var distDir = './dist/'; var appsDir = './apps/'; var debugDir = './debug/'; +var releaseDir = './release/'; function get_task_name(key) { return 'build-' + key.replace(/([A-Z])/g, function ($1) { return "-" + $1.toLowerCase(); }); @@ -206,7 +207,7 @@ function get_release_filename(platform, ext) { gulp.task('release-windows', function () { var pkg = require('./package.json'); var src = path.join(appsDir, pkg.name, 'win32'); - var output = fs.createWriteStream(path.join(appsDir, get_release_filename('win32', 'zip'))); + var output = fs.createWriteStream(path.join(releaseDir, get_release_filename('win32', 'zip'))); var archive = archiver('zip', { zlib: { level: 9 } }); @@ -220,7 +221,7 @@ gulp.task('release-windows', function () { gulp.task('release-linux', function () { var pkg = require('./package.json'); var src = path.join(appsDir, pkg.name, 'linux64'); - var output = fs.createWriteStream(path.join(appsDir, get_release_filename('linux64', 'zip'))); + var output = fs.createWriteStream(path.join(releaseDir, get_release_filename('linux64', 'zip'))); var archive = archiver('zip', { zlib: { level: 9 } }); @@ -239,7 +240,7 @@ gulp.task('release-macos', function () { var sign_cmd = 'codesign --verbose --force --sign "' + process.env.CODESIGN_IDENTITY + '" ' + src; child_process.execSync(sign_cmd); } - var output = fs.createWriteStream(path.join(appsDir, get_release_filename('macOS', 'zip'))); + var output = fs.createWriteStream(path.join(releaseDir, get_release_filename('macOS', 'zip'))); var archive = archiver('zip', { zlib: { level: 9 } }); @@ -253,6 +254,14 @@ gulp.task('release-macos', function () { // Create distributable .zip files in ./apps gulp.task('release', ['apps'], function () { + fs.mkdir(releaseDir, "0775", function(err) { + if (err) { + if (err.code !== 'EEXIST') { + throw err; + } + } + }); + return runSequence('release-macos', 'release-windows', 'release-linux'); }); diff --git a/manifest.json b/manifest.json index d1ee5725..87db55ea 100755 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "minimum_chrome_version": "38", - "version": "10.0.0", + "version": "10.0.0-RC1", "author": "Betaflight Squad", "name": "Betaflight - Configurator", "short_name": "Betaflight", diff --git a/package.json b/package.json index df2cfb46..4ad642db 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "betaflight-configurator", "description": "Crossplatform configuration tool for Betaflight flight control system.", - "version": "10.0.0", + "version": "10.0.0-RC1", "main": "main.html", "default_locale": "en", "scripts": { |