Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-26 01:35:28 +03:00
Code Issues Wiki Activity

Merge pull request #1177 from mikeller/support_build_outside_of_repo

Browse source 
Added support for building outside of a git repository.
This commit is contained in:
Michael Keller 2018-08-31 09:34:30 +12:00 • committed by GitHub
commit 58945359e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

21
gulpfile.js
View file

@ -437,18 +437,21 @@ function buildNWApps(platforms, flavor, dir, done) {
} }
function getChangesetId(done) { function getChangesetId(done) {
git.exec({args : 'log -1 --format="%h"'}, function (err, stdout) { git.exec({args : 'log -1 --format="%h"'}, function (err, stdout) {
if (err) { var version;
throw err; if (err) {
} version = 'unsupported';
} else {
version = stdout.trim();
}
var versionData = { gitChangesetId: stdout.trim() } var versionData = { gitChangesetId: version }
var destFile = path.join(DIST_DIR, 'version.json'); var destFile = path.join(DIST_DIR, 'version.json');
fs.writeFile(destFile, JSON.stringify(versionData) , function () { fs.writeFile(destFile, JSON.stringify(versionData) , function () {
done(); done();
});
}); });
});
} }
function start_debug(done) { function start_debug(done) {

3
src/js/data_storage.js
View file

@ -10,5 +10,6 @@ var CONFIGURATOR = {
'connectionValid': false, 'connectionValid': false,
'connectionValidCliOnly': false, 'connectionValidCliOnly': false,
'cliActive': false, 'cliActive': false,
'cliValid': false 'cliValid': false,
'gitChangesetId': 'unknown'
}; };

28
src/js/main.js
View file

@ -6,9 +6,13 @@ var analytics = undefined;
openNewWindowsInExternalBrowser(); openNewWindowsInExternalBrowser();
$(document).ready(function () { $(document).ready(function () {
i18n.init(function() { $.getJSON('version.json', function(data) {
startProcess(); CONFIGURATOR.gitChangesetId = data.gitChangesetId;
initializeSerialBackend();
i18n.init(function() {
startProcess();
initializeSerialBackend();
});
}); });
}); });
@ -16,15 +20,11 @@ function checkSetupAnalytics(callback) {
if (!analytics) { if (!analytics) {
setTimeout(function () { setTimeout(function () {
chrome.storage.local.get(['userId', 'analyticsOptOut', 'checkForConfiguratorUnstableVersions', ], function (result) { chrome.storage.local.get(['userId', 'analyticsOptOut', 'checkForConfiguratorUnstableVersions', ], function (result) {
$.getJSON('version.json', function(data) { if (!analytics) {
var gitChangesetId = data.gitChangesetId; setupAnalytics(result);
}
if (!analytics) { callback(analytics);
setupAnalytics(result, gitChangesetId);
}
callback(analytics);
});
}); });
}); });
} else if (callback) { } else if (callback) {
@ -32,7 +32,7 @@ function checkSetupAnalytics(callback) {
} }
}; };
function setupAnalytics(result, gitChangesetId) { function setupAnalytics(result) {
var userId; var userId;
if (result.userId) { if (result.userId) {
userId = result.userId; userId = result.userId;
@ -48,7 +48,7 @@ function setupAnalytics(result, gitChangesetId) {
var debugMode = typeof process === "object" && process.versions['nw-flavor'] === 'sdk'; var debugMode = typeof process === "object" && process.versions['nw-flavor'] === 'sdk';
analytics = new Analytics('UA-123002063-1', userId, 'Betaflight Configurator', getManifestVersion(), gitChangesetId, GUI.operating_system, checkForDebugVersions, optOut, debugMode); analytics = new Analytics('UA-123002063-1', userId, 'Betaflight Configurator', getManifestVersion(), CONFIGURATOR.gitChangesetId, GUI.operating_system, checkForDebugVersions, optOut, debugMode);
function logException(exception) { function logException(exception) {
analytics.sendException(exception.stack); analytics.sendException(exception.stack);
@ -720,7 +720,7 @@ function updateStatusBarVersion(firmwareVersion, firmwareId, hardwareId) {
versionText = versionText + ', '; versionText = versionText + ', ';
} }
versionText = versionText + getConfiguratorVersion(); versionText = versionText + getConfiguratorVersion() + ' (' + CONFIGURATOR.gitChangesetId + ')';
$('#status-bar .version').text(versionText); $('#status-bar .version').text(versionText);
} }