From 7e7d87f14359088347514514dd9cca6cf9e346e3 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Wed, 9 Jul 2014 13:49:20 +1000 Subject: [PATCH] Added ReleaseMode Incremental Build Number to versioning --- sleepyhead/SleepLib/common.cpp | 2 -- sleepyhead/SleepLib/common.h | 2 -- .../loader_plugins/intellipap_loader.cpp | 6 ++++-- .../SleepLib/loader_plugins/resmed_loader.cpp | 1 + sleepyhead/SleepLib/profiles.h | 1 + sleepyhead/SleepLib/session.cpp | 1 - sleepyhead/UpdaterWindow.cpp | 17 +++++++++++---- sleepyhead/daily.cpp | 4 ++-- sleepyhead/main.cpp | 3 ++- sleepyhead/mainwindow.cpp | 8 +++++-- sleepyhead/mainwindow.h | 3 +-- sleepyhead/scripts/build_number | 1 + sleepyhead/scripts/inc_build.bat | 5 +++++ sleepyhead/scripts/inc_build.sh | 12 +++++++++++ sleepyhead/sleepyhead.pro | 21 +++++++++++++++++++ sleepyhead/statistics.cpp | 1 - sleepyhead/version.h | 7 ++++--- 17 files changed, 73 insertions(+), 22 deletions(-) create mode 100644 sleepyhead/scripts/build_number create mode 100644 sleepyhead/scripts/inc_build.bat create mode 100755 sleepyhead/scripts/inc_build.sh diff --git a/sleepyhead/SleepLib/common.cpp b/sleepyhead/SleepLib/common.cpp index 04b02df6..e0a31554 100644 --- a/sleepyhead/SleepLib/common.cpp +++ b/sleepyhead/SleepLib/common.cpp @@ -245,7 +245,6 @@ QString STR_TR_PrRelief; // Pressure Relief QString STR_TR_NoData; QString STR_TR_Bookmarks; QString STR_TR_SleepyHead; -QString STR_TR_SleepyHeadVersion; QString STR_TR_Mode; QString STR_TR_Model; @@ -425,7 +424,6 @@ void initializeStrings() STR_TR_NoData = QObject::tr("No Data"); STR_TR_Bookmarks = QObject::tr("Bookmarks"); STR_TR_SleepyHead = QObject::tr("SleepyHead"); - STR_TR_SleepyHeadVersion = STR_TR_SleepyHead + " v" + VersionString; STR_TR_Mode = QObject::tr("Mode"); STR_TR_Model = QObject::tr("Model"); diff --git a/sleepyhead/SleepLib/common.h b/sleepyhead/SleepLib/common.h index 36ce08bd..da45c347 100644 --- a/sleepyhead/SleepLib/common.h +++ b/sleepyhead/SleepLib/common.h @@ -15,7 +15,6 @@ #include #include #include -#include "version.h" #if QT_VERSION >= QT_VERSION_CHECK(4,8,0) @@ -260,7 +259,6 @@ extern QString STR_TR_SensAwake; extern QString STR_TR_NoData; extern QString STR_TR_Bookmarks; extern QString STR_TR_SleepyHead; -extern QString STR_TR_SleepyHeadVersion; extern QString STR_TR_Mode; extern QString STR_TR_Model; diff --git a/sleepyhead/SleepLib/loader_plugins/intellipap_loader.cpp b/sleepyhead/SleepLib/loader_plugins/intellipap_loader.cpp index 1eb7f6ad..92d37d12 100644 --- a/sleepyhead/SleepLib/loader_plugins/intellipap_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/intellipap_loader.cpp @@ -274,8 +274,7 @@ int IntellipapLoader::Open(QString path, Profile *profile) for (int i = 0; i < recs; i++) { // convert timestamp to real epoch - ts1 = ((m_buffer[pos] << 24) | (m_buffer[pos + 1] << 16) | (m_buffer[pos + 2] << 8) | m_buffer[pos - + 3]) + ep; + ts1 = ((m_buffer[pos] << 24) | (m_buffer[pos + 1] << 16) | (m_buffer[pos + 2] << 8) | m_buffer[pos + 3]) + ep; for (int j = 0; j < SessionStart.size(); j++) { sid = SessionStart[j]; @@ -310,6 +309,7 @@ int IntellipapLoader::Open(QString path, Profile *profile) } if (m_buffer[pos + 0x5] > 4) { // This matches Exhale Puff.. not sure why 4 + //MW: Are the lower 2 bits something else? if (!sess->eventlist.contains(CPAP_ExP)) { sess->AddEventList(CPAP_ExP, EVL_Event); } @@ -372,6 +372,8 @@ int IntellipapLoader::Open(QString path, Profile *profile) // delete sess; // continue; //} + + quint64 first = qint64(sid) * 1000L; quint64 last = qint64(SessionEnd[i]) * 1000L; diff --git a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp index 6fd8f0f6..43e0e742 100644 --- a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp @@ -660,6 +660,7 @@ void ResmedImport::run() // Claim this session R.sessionid = sessionid; + // Save maskon time in session setting so we can use it later to avoid doubleups. sess->settings[RMS9_MaskOnTime] = R.maskon; diff --git a/sleepyhead/SleepLib/profiles.h b/sleepyhead/SleepLib/profiles.h index 6eee5ca4..1bc377cb 100644 --- a/sleepyhead/SleepLib/profiles.h +++ b/sleepyhead/SleepLib/profiles.h @@ -16,6 +16,7 @@ #include #include +#include "version.h" #include "machine.h" #include "machine_loader.h" #include "preferences.h" diff --git a/sleepyhead/SleepLib/session.cpp b/sleepyhead/SleepLib/session.cpp index fb0cd556..0b38f36e 100644 --- a/sleepyhead/SleepLib/session.cpp +++ b/sleepyhead/SleepLib/session.cpp @@ -24,7 +24,6 @@ using namespace std; - const quint16 filetype_summary = 0; const quint16 filetype_data = 1; diff --git a/sleepyhead/UpdaterWindow.cpp b/sleepyhead/UpdaterWindow.cpp index 67a0b37f..09d03c8a 100644 --- a/sleepyhead/UpdaterWindow.cpp +++ b/sleepyhead/UpdaterWindow.cpp @@ -222,13 +222,22 @@ int compareVersion(QString version) } QStringList patchver = parts[2].split("-"); - short patch = patchver[0].toInt(&ok); + + short revision = patchver[0].toInt(&ok); if (!ok) return -1; - // Still here.. check patch version - if (patch > patch_number) { + if (revision > revision_number) { return 1; - } else if (patch < patch_number) { + } else if (revision < revision_number) { + return -1; + } + + short build = patchver[1].toInt(&ok); + if (!ok) return -1; + + if (build > build_number) { + return 1; + } else if (build < build_number) { return -1; } diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp index d362b4cd..3f0cd864 100644 --- a/sleepyhead/daily.cpp +++ b/sleepyhead/daily.cpp @@ -502,8 +502,8 @@ void Daily::Link_clicked(const QUrl &url) } else if (code=="cpap") { day=PROFILE.GetDay(previous_date,MT_CPAP); } else if (code=="oxi") { - day=PROFILE.GetDay(previous_date,MT_OXIMETER); - Session *sess=day->machine->sessionlist[sid]; + //day=PROFILE.GetDay(previous_date,MT_OXIMETER); + //Session *sess=day->machine->sessionlist[sid]; return; } else if (code=="event") { QList list=ui->treeWidget->findItems(schema::channel[sid].fullname(),Qt::MatchContains); diff --git a/sleepyhead/main.cpp b/sleepyhead/main.cpp index 3503b629..27f5d8a7 100644 --- a/sleepyhead/main.cpp +++ b/sleepyhead/main.cpp @@ -26,6 +26,7 @@ #include #include +#include "version.h" #include "logger.h" #include "SleepLib/schema.h" #include "mainwindow.h" @@ -60,7 +61,7 @@ void initialize() void release_notes() { QDialog relnotes; - relnotes.setWindowTitle(STR_TR_SleepyHead + " " + QObject::tr("Release Notes")); + relnotes.setWindowTitle(STR_TR_SleepyHead + " " + QObject::tr("Release Notes") +" "+FullVersionString); QVBoxLayout layout(&relnotes); QWebView web(&relnotes); diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp index 4f994a7c..621348fa 100644 --- a/sleepyhead/mainwindow.cpp +++ b/sleepyhead/mainwindow.cpp @@ -35,6 +35,8 @@ #include #include "common_gui.h" +#include "version.h" + #include @@ -148,8 +150,7 @@ MainWindow::MainWindow(QWidget *parent) : this->setWindowTitle(STR_TR_SleepyHead + QString(" v%1 (" + tr("Profile") + ": %2)").arg(version).arg(PREF[STR_GEN_Profile].toString())); - qDebug() << STR_TR_SleepyHeadVersion.toLocal8Bit().data() << "built with Qt" << QT_VERSION_STR << - "on" << __DATE__ << __TIME__; + qDebug() << STR_TR_SleepyHead << VersionString << "built with Qt" << QT_VERSION_STR << "on" << __DATE__ << __TIME__; #ifdef BROKEN_OPENGL_BUILD qDebug() << "This build has been created especially for computers with older graphics hardware.\n"; @@ -345,6 +346,9 @@ MainWindow::~MainWindow() void MainWindow::Notify(QString s, QString title, int ms) { + if (title.isEmpty()) { + title = "SleepyHead v" + VersionString; + } if (systray) { // GNOME3's systray hides the last line of the displayed Qt message. // As a workaround, add an extra line to bump the message back diff --git a/sleepyhead/mainwindow.h b/sleepyhead/mainwindow.h index 257bbe28..9e55d902 100644 --- a/sleepyhead/mainwindow.h +++ b/sleepyhead/mainwindow.h @@ -18,7 +18,6 @@ #include #include -#include "version.h" #include "daily.h" #include "overview.h" #include "preferencesdialog.h" @@ -102,7 +101,7 @@ class MainWindow : public QMainWindow Mac needs Growl notification system for this to work */ - void Notify(QString s, QString title = "SleepyHead v" + VersionString, int ms = 5000); + void Notify(QString s, QString title = "", int ms = 5000); /*! \fn gGraphView *snapshotGraph() \brief Returns the current snapshotGraph object used by the report printing system */ diff --git a/sleepyhead/scripts/build_number b/sleepyhead/scripts/build_number new file mode 100644 index 00000000..abac1ea7 --- /dev/null +++ b/sleepyhead/scripts/build_number @@ -0,0 +1 @@ +47 diff --git a/sleepyhead/scripts/inc_build.bat b/sleepyhead/scripts/inc_build.bat new file mode 100644 index 00000000..43a7f526 --- /dev/null +++ b/sleepyhead/scripts/inc_build.bat @@ -0,0 +1,5 @@ +@echo off +set /p var= build_number +echo const int build_number = %var%; > ../build_number.h diff --git a/sleepyhead/scripts/inc_build.sh b/sleepyhead/scripts/inc_build.sh new file mode 100755 index 00000000..b0d3da14 --- /dev/null +++ b/sleepyhead/scripts/inc_build.sh @@ -0,0 +1,12 @@ +#!/bin/bash +MY_PATH="`dirname \"$0\"`" +if [ ! -f "$MY_PATH/ReleaseMode" ] +then + echo "Skipping build number update" + exit; +fi +echo "Updating build number" +number=`cat $MY_PATH/build_number` +let number++ +echo "$number" > $MY_PATH/build_number +echo "const int build_number = ""$number;" | tee $MY_PATH/../build_number.h diff --git a/sleepyhead/sleepyhead.pro b/sleepyhead/sleepyhead.pro index c8870090..1eb6ae3c 100644 --- a/sleepyhead/sleepyhead.pro +++ b/sleepyhead/sleepyhead.pro @@ -88,6 +88,27 @@ win32 { # MingW needs this LIBS += -lz } + CONFIG(release, debug|release) { + # Update build number + build_nr.commands = $$PWD/scripts/inc_build.bat + build_nr.depends = FORCE + QMAKE_EXTRA_TARGETS += build_nr + PRE_TARGETDEPS += build_nr + + HEADERS += build_number.h + } +} + +unix { + CONFIG(release, debug|release) { + # Update build number + build_nr.commands = $$PWD/scripts/inc_build.sh + build_nr.depends = FORCE + QMAKE_EXTRA_TARGETS += build_nr + PRE_TARGETDEPS += build_nr + + HEADERS += build_number.h + } } #include(..3rdparty/qextserialport/src/qextserialport.pri) diff --git a/sleepyhead/statistics.cpp b/sleepyhead/statistics.cpp index 72b4f565..5a210d38 100644 --- a/sleepyhead/statistics.cpp +++ b/sleepyhead/statistics.cpp @@ -15,7 +15,6 @@ #include "mainwindow.h" #include "statistics.h" - extern MainWindow *mainwin; QString formatTime(float time) diff --git a/sleepyhead/version.h b/sleepyhead/version.h index be712eed..f71a736e 100644 --- a/sleepyhead/version.h +++ b/sleepyhead/version.h @@ -13,10 +13,11 @@ #define VERSION_H #include +#include "build_number.h" const int major_version = 0; // incompatible API changes const int minor_version = 9; // new features that don't break things -const int patch_number = 7; // bugfixes, revisions +const int revision_number = 7; // bugfixes, revisions #ifdef TEST_BUILD const QString ReleaseStatus = "testing"; @@ -24,8 +25,8 @@ const QString ReleaseStatus = "testing"; const QString ReleaseStatus = "beta"; #endif -const QString VersionString = QString().sprintf("%i.%i.%i", major_version, minor_version, patch_number); -const QString FullVersionString = QString().sprintf("%i.%i.%i", major_version, minor_version, patch_number)+"-"+ReleaseStatus; +const QString VersionString = QString().sprintf("%i.%i.%i-%i", major_version, minor_version, revision_number, build_number); +const QString FullVersionString = QString().sprintf("%i.%i.%i-%i", major_version, minor_version, revision_number, build_number)+"-"+ReleaseStatus; #ifdef Q_OS_MAC const QString PlatformString = "MacOSX";