Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 16:25:16 +03:00
Code Issues Wiki Activity

The ':' separator is not a so good idea in Windows installer (ADS)

Browse source
This commit is contained in:
Bertrand Songis 2015-07-23 21:17:18 +02:00
parent 8f96f50a84
commit 4ea9e5c11f
3 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
companion/src/CMakeLists.txt
View file

@ -1,17 +1,12 @@
PROJECT( companion )
SET( C9X_VERSION_MAJOR "2" )
SET( C9X_VERSION_MINOR "1" )
SET( C9X_VERSION_REVISION "1" )
if(DEFINED C9X_VERSION_SUFFIX)
set(ENV{OPENTX_VERSION_SUFFIX} ${C9X_VERSION_SUFFIX})
else()
set(C9X_VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX})
endif()
SET(C9X_VERSION_MAJOR "2")
SET(C9X_VERSION_MINOR "1")
SET(C9X_VERSION_REVISION "1")
SET(C9X_VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX})
message(STATUS ${C9X_VERSION_SUFFIX} $ENV{OPENTX_VERSION_SUFFIX})
SET( C9X_VERSION ${C9X_VERSION_MAJOR}.${C9X_VERSION_MINOR}.${C9X_VERSION_REVISION}${C9X_VERSION_SUFFIX} )
SET(C9X_VERSION ${C9X_VERSION_MAJOR}.${C9X_VERSION_MINOR}.${C9X_VERSION_REVISION}${C9X_VERSION_SUFFIX})
MESSAGE(STATUS OpenTX Companion ${C9X_VERSION})
CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )

2
companion/src/firmwares/opentx/simulator/CMakeLists.txt
View file

@ -14,7 +14,7 @@ add_custom_target(about_lbm_taranis
)
add_custom_target(commondeps
OPENTX_VERSION_SUFFIX=${C9X_VERSION_SUFFIX} && make stamp_header tra
make stamp_header tra
WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
)

4
companion/src/helpers.cpp
View file

@ -1020,7 +1020,7 @@ QPixmap makePixMap( QImage image, QString firmwareType )
int version2index(const QString & version)
{
int result = 999;
QStringList parts = version.split(":n");
QStringList parts = version.split("N");
if (parts.size() > 1)
result = parts[1].toInt(); // nightly build
parts = parts[0].split('.');
@ -1044,7 +1044,7 @@ QString index2version(int index)
int major = index / 100;
QString result = QString("%1.%2.%3").arg(major).arg(minor).arg(revision);
if (nightly > 0 && nightly < 999) {
result += QString(":n%1").arg(nightly);
result += QString("N%1").arg(nightly);
}
return result;
}