version info changes

This commit is contained in:
milek7
2018-03-21 20:30:05 +01:00
parent 9b602686a2
commit 6f62297e31
4 changed files with 6 additions and 9 deletions

View File

@@ -259,8 +259,6 @@ int main(int argc, char *argv[])
}
#endif
Global.asVersion = "M7 16.03.2018 (based on tmj c100fcb7)";
for (int i = 1; i < argc; ++i)
{
std::string token(argv[i]);

View File

@@ -16,6 +16,7 @@ http://mozilla.org/MPL/2.0/.
#include "uart.h"
#include "utilities.h"
#include "motiontelemetry.h"
#include "version.h"
struct global_settings {
// members
@@ -164,7 +165,7 @@ struct global_settings {
int iMultiplayer{ 0 }; // blokada działania niektórych eventów na rzecz kominikacji
// other
std::string AppName{ "EU07" };
std::string asVersion{ "UNKNOWN" }; // z opisem
std::string asVersion{ VERSION_INFO }; // z opisem
motiontelemetry::conf_t motiontelemetry_conf;
std::string screenshot_dir;
bool loading_log = true;

View File

@@ -2,7 +2,9 @@ version: '{build}'
image: Visual Studio 2017
clone_depth: 1
build_script:
- cmd: >-
- ps: >-
Write-Output "#define VERSION_INFO `"$(git log -1 --date="format:%F %R" --format="%cd, %h")`"" > version.h
mkdir builds
cd builds

View File

@@ -1,5 +1 @@
#pragma once
#define VERSION_MAJOR 18
#define VERSION_MINOR 318
#define VERSION_REVISION 0
#define VERSION_INFO "git tree build"