flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-26 18:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T203, platform guessing no longer required here (=> CPlatform)

Browse Source 
Timestamp conversion to 4th segment can be used from elsewhere
This commit is contained in:
Klaus Basan
2017-12-09 19:35:03 +01:00
parent 6347c65a2f
commit 340dad19a3
2 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/blackconfig/buildconfig.cpp
View File

@@ -238,6 +238,25 @@ namespace BlackConfig
return 0; // intentionally 0 => 0.7.3.0 <- return 0; // intentionally 0 => 0.7.3.0 <-
} }
int CBuildConfig::buildTimestampAsVersionSegment(const QDateTime &buildTimestamp)
{
if (buildTimestamp.isValid())
{
const QString bts = buildTimestamp.toString("yyyyMMddHHmm");
bool ok;
const long long btsll = bts.toLongLong(&ok); // at least 64bit
if (!ok) { return 0; }
// now we have to converto int
// max 2147483647 (2^31 - 1)
// 1MMddHHmm (years since 2010)
// yyyyMMddHHmm
const long long yearOffset = 201000000000;
const int btsInt = btsll - yearOffset;
return btsInt;
}
return 0; // intentionally 0 => 0.7.3.0 <-
}
const QStringList &CBuildConfig::getBuildAbiParts() const QStringList &CBuildConfig::getBuildAbiParts()
{ {
static const QStringList parts = QSysInfo::buildAbi().split('-'); static const QStringList parts = QSysInfo::buildAbi().split('-');
@@ -258,23 +277,6 @@ namespace BlackConfig
static const int bws = buildWordSizeImpl(); static const int bws = buildWordSizeImpl();
return bws; return bws;
} }
QString CBuildConfig::guessMyPlatformString()
{
// 32/64 only matters on Windows
// 64 is default
QString p;
QString ws = (buildWordSize() == 32) ? "32" : "64";
if (BlackConfig::CBuildConfig::isRunningOnWindowsNtPlatform())
{
p = "win-" + ws;
}
else if (BlackConfig::CBuildConfig::isRunningOnMacOSPlatform()) { p = "macos-64"; }
else if (BlackConfig::CBuildConfig::isRunningOnLinuxPlatform()) { p = "linux-64"; }
if (!p.isEmpty() && BlackConfig::CBuildConfig::isVatsimVersion()) { p += "-vatsim"; }
return p;
}
} // ns } // ns
//! \endcond //! \endcond

7
src/blackconfig/buildconfig.h
View File

@@ -140,14 +140,13 @@ namespace BlackConfig
//! Build ABI parts as in http://doc.qt.io/qt-5/qsysinfo.html#buildAbi //! Build ABI parts as in http://doc.qt.io/qt-5/qsysinfo.html#buildAbi
static const QStringList &getBuildAbiParts(); static const QStringList &getBuildAbiParts();
//! Turn build timestamp into 4th version segment
static int buildTimestampAsVersionSegment(const QDateTime &buildTimestamp);
//! Whether this swift application is build as 32 or 64bit application //! Whether this swift application is build as 32 or 64bit application
//! \returns 32, 64 or -1 (in case no info is possible) //! \returns 32, 64 or -1 (in case no info is possible)
static int buildWordSize(); static int buildWordSize();
//! The platform string used for updates etc.
//! \remark ideally no such guess would be needed, but it is used as default value
static QString guessMyPlatformString();
private: private:
//! Major version //! Major version
static int versionMajor(); // defined in buildconfig_gen.cpp.in static int versionMajor(); // defined in buildconfig_gen.cpp.in