VERSION 3.5 RELEASE CANDIDATE 2X

.. fix save ridecache
.. regenerate on first run to fix

src/Core/GcUpgrade.h

@@ -96,6 +96,7 @@
 // 3970 - V3.5 DEVELOPMENT 1903
 // 3980 - V3.5 RC1
 // 3981 - V3.5 RC2
+// 3982 - V3.5 RC2X
 
 
 #define VERSION3_BUILD    3010 // released
@@ -106,14 +107,14 @@
 #define VERSION32_BUILD   3200 // released
 #define VERSION33_BUILD   3933 // development release
 #define VERSION34_BUILD   3955 // released
-#define VERSION35_BUILD   3981 // rc2
+#define VERSION35_BUILD   3982 // rc2x
 
 // will keep changing during testing and before final release
 #define VERSION31_BUILD VERSION31_UPG
 
 // the next two will with each build/release
-#define VERSION_LATEST 3981
-#define VERSION_STRING "V3.5 RC2"
+#define VERSION_LATEST 3982
+#define VERSION_STRING "V3.5 RC2X"
 
 // default config for this release cycle
 #define VERSION_CONFIG_PREFIX "http://www.goldencheetah.org/defaults/4.0"

src/Core/RideDB.y

@@ -824,10 +824,10 @@ void RideCache::save(bool opendata, QString filename)
                                 // if count is 0 don't write it
                                 } else if (interval->counts()[index] == 0) {
                                     stream << ConstructNameNumberString(QString("\t\t\t\""), name,
-                                        QString("\":\""), item->metrics()[index], QString("\""));
+                                        QString("\":\""), interval->metrics()[index], QString("\""));
                                 } else {
                                     stream << ConstructNameNumberNumberString(QString("\t\t\t\""), name,
-                                        QString("\":[\""), item->metrics()[index], QString("\",\""), item->counts()[index], QString("\"]"));
+                                        QString("\":[\""), interval->metrics()[index], QString("\",\""), interval->counts()[index], QString("\"]"));
                                 }
                             }
                         }

src/Metrics/RideMetric.cpp

@@ -160,7 +160,8 @@
 // 150 28  Mar 2019 Ale Martinez       Additional Running Dynamics metrics
 // 151 14  May 2019 Ale Martinez       Added Time Recording and use it in Time in Zone Percentage
 // 152 20  May 2019 Ale Martinez       Fixed Time in Zone Percentages to aggregate properly
-int DBSchemaVersion = 152;
+// 153  8  Dec 2019 Mark Liversedge    Regenerate after v3.5 RC2/RC2X re-issue
+int DBSchemaVersion = 153;
 
 RideMetricFactory *RideMetricFactory::_instance;
 QVector<QString> RideMetricFactory::noDeps;

travis/linux/before_install.sh

@@ -10,9 +10,7 @@ sudo apt-get install -qq libglu1-mesa-dev libgstreamer0.10-0 libgstreamer-plugin
 sudo apt-get install -qq libssl-dev libsamplerate0-dev libpulse-dev
 sudo apt-get install -qq libical-dev libkml-dev libboost-all-dev
 
-# Add VLC 2.2.8
-sudo add-apt-repository -y ppa:jonathonf/vlc
-sudo apt-get update -qq
+# Add VLC 2.2.2
 sudo apt-get install -qq vlc libvlc-dev libvlccore-dev
 
 # R 3.6

travis/linux/before_script.sh

@@ -4,6 +4,8 @@ export PATH=/opt/qt59/bin:$PATH
 
 cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
 cp src/gcconfig.pri.in src/gcconfig.pri
+# Define GC version string, only for tagged builds
+if [ -n "$TRAVIS_TAG" ]; then echo DEFINES += GC_VERSION=VERSION_STRING >> src/gcconfig.pri; fi
 # user WEBENGINE
 echo DEFINES += NOWEBKIT >> src/gcconfig.pri
 # Trusty needs C99 mode to enable declarations in for loops

travis/osx/before_script.sh

@@ -21,7 +21,8 @@ cd ..
 
 cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
 cp src/gcconfig.pri.in src/gcconfig.pri
-/usr/local/opt/qt5/bin/lupdate src/src.pro
+# Define GC version string, only for tagged builds
+if [ -n "$TRAVIS_TAG" ]; then echo DEFINES += GC_VERSION=VERSION_STRING >> src/gcconfig.pri; fi
 echo DEFINES += NOWEBKIT >> src/gcconfig.pri
 sed -i "" "s|#\(CONFIG += release.*\)|\1 static |" src/gcconfig.pri
 sed -i "" "s|#\(QMAKE_LRELEASE\).*|\1 += /usr/local/opt/qt5/bin/lrelease|" src/gcconfig.pri