Revert "Add ANT+ product info (#3307)" (#3309)

This reverts commit d7fce1565c.

.travis.yml

@@ -1,20 +1,12 @@
-if: commit_message =~ /\[publish binaries\]/
-
 branches:
   only:
   - master
   - /^[vV]\d+\.\d+(\.\d+)?(-\S*)?$/
-
-language: cpp
-
-cache:
-  directories:
-  - $HOME/Library/Caches/Homebrew
-  - qwt
-  - D2XX
-  - site-packages
-  - VLC
-
+os:
+- osx
+- linux
+dist: xenial
+language: c++
 env:
   global:
   - BRANCH=master
@@ -36,27 +28,33 @@ env:
   - secure: cc0pAJjkmFNw2bO3zVACmtyHTwINAHALrtUxi+nRD+FhOO9KxuxuuwvcKCZKfp9EUOjz5PrYWKV1ZH/zt/jMix8A4Gyue2mWX8WYih7aTmJBcJWsFNTCybnClreKBCh18kHdWWhkmhk8EMINDvlqxzJZGpcNO04gxhL9wuLLrNQ=
   - secure: em0xXIm69rMHsHXYQiizeJB7dEFBkX33PsWDHwBNrX6lFBued23eL96KJC4RVbk6A+AHFtXFATrreZ14D5JH/E/37CXhe3X2R93WqiPUSH0s7NI4fFA1BroKUNAlqO4bMqDBidtNmwMPaLTXjaOnOZyvbAG7z+QV3TKC8tOeZDU=
   - secure: VFaSERlgsjzjiDQhKw8XFvQrjdvFzHHL7V3NQg+RfELHoT6I1pAGFdl/+lRBIVOiVkbQ6XnpBA28nlf0QydPHElRZdqmh0azQV/bkUXD4ffPE8q0iSqeqhAZ+5L05K5K+Gby/y8TZE4FX6e/7trFL7oq+h9x0gq5RQO8rAcTV84=
-
-jobs:
-  include:
-  - os: osx
-    osx_image: xcode11.3
-    compiler: clang
-  - os: linux
-    dist: bionic
-    compiler: gcc
-
+  matrix:
+    include:
+      - os: osx
+        osx_image: xcode10.1
+        compiler: clang
+      - os: linux
+        compiler: gcc
 before_install:
 - travis/$TRAVIS_OS_NAME/before_install.sh
-
 before_script:
 - travis/$TRAVIS_OS_NAME/before_script.sh
-
 script:
 - travis/$TRAVIS_OS_NAME/script.sh
-
-before_cache:
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew cleanup; fi
-
 after_success:
+- if [[ $TRAVIS_OS_NAME == "osx" ]]; then
+    export FINAL_NAME=dev-prerelease-branch-master-build-${TRAVIS_BUILD_NUMBER}.dmg;
+  else
+    export FINAL_NAME=dev-prerelease-branch-master-build-${TRAVIS_BUILD_NUMBER}.AppImage;
+  fi
 - travis/$TRAVIS_OS_NAME/after_success.sh
+deploy:
+  provider: releases
+  api_key:
+    secure: KlfkRM8oGP02y5LhbdxetnhqUG3YzVylvyhT8BTYjdoJtkJr7YXYpdhj9byZ9aiy1gSWI/g7A1X6/P8/McqRtgt4dEYr4Zg8QO7Y7QdTpgNQEwu8ZrkyyG/7b/rSkfFHDjrOAHslLVXuBNwWgi8YW1aTn0rY2AqDbOri7u6tt9Q=
+  file: src/$FINAL_NAME
+  skip_cleanup: true
+  on:
+    tags: true
+    repo: GoldenCheetah/GoldenCheetah
+

INSTALL-LINUX

@@ -4,88 +4,74 @@
 
                                      Mark Liversedge
                                      John Ehrlinger
-                                     Ale Martinez
 
-                                        Mar 2021
-                                      Version 3.6
+                                        Jan 2015
+                                      Version 1.2
 
-A walkthrough of building GoldenCheetah from scratch on Ubuntu linux 18.04
-This walkthrough should be largely the same for any Debian derivative Linux
-distro, and very similar for others using their correspoing package manager.
+A walkthrough of building GoldenCheetah from scratch on Ubuntu linux. This walkthrough
+should be largely the same for any Linux distro.
 
 CONTENTS
 
 1. BASIC INSTALLATION WITH MANDATORY DEPENDENCIES
-   - git
-   - flex
-   - bison
    - QT
-   - OpenGL
-   - gsl
+   - git
 
-2. ADDING OPTIONAL DEPENDENCIES
+2. ADDING OPTIONAL DEPENDENCIES WHEN BUILDING VERSION 2
    - FTDI D2XX
    - SRMIO
    - liboauth
    - libkml
+
+3. ADDING OPTIONAL DEPENDENCIES WHEN BUILDING VERSION 3
+   - checking out the release 3 branch & building with MANDATORY dependencies
+     - flex
+     - bison
+   - libical - Diary window and CalDAV support (google/mobileme calendar integration)
    - libvlc  - Video playback in training mode
-   - libical - Diary window and CalDAV support (external calendar integration)
-   - libusb  - If you want support for using USB2 sticks in Train View
-   - R       - If you want R charts
-   - Python  - If you want Python charts, scripts and data processors
 
 1. BASIC INSTALLATION WITH MANDATORY DEPENDENCIES
 =================================================
 
-Install the Linux distribution of choice on amd64 platform (Ubuntu 18.04 is used
-for this document). You will not need to do this if you already have a Linux
-distribution installed. Left this step in to highlight the Linux distribution
-the commands below were executed on.
+Installed Linux distribution of choice on platforms i386 or amd-64 (currently Debian-based distributions and Arch-based distributions are covered). You will not need to do this if you
+already have a Linux distribution installed. Left this step in to highlight the
+Linux distribution the commands below were executed on.
 
 login and open a terminal to get a shell prompt
 
-Install Qt
-----------
+Download MANDATORY DEPENDENCIES (browser)
+-----------------------------------------
 Download and install the Qt SDK from http://qt-project.org/
-You can use a browser to download and run the interactive installer, be sure to
-select version 5.14.2 or higher including at least the following modules:
-- Desktop gcc 64-bit
-- Qt Charts
-- Qt WebEngine
-Once this step is completed add the bin directory to PATH and test qmake is ok:
-$ qmake --version
+Once that is completed test qmake is ok with: qmake --version (should report 4.9.8 or higher)
 
-Install git
------------
+
+DEBIAN-BASED DISTRIBUTION INSTRUCTIONS
+--------------------------------------
+
+Install git with:
 $ sudo apt-get install git
+Said Y to prompt about all git files installed (git-gui et al)
 
 Install FLEX and BISON
 ----------------------
+
 You will need flex v2.5.9 or later
 $ sudo apt-get install bison
 $ sudo apt-get install flex
-
-Install Mesa OpenGL utility library
 -----------------------------------
-sudo apt-get install libglu1-mesa-dev
 
-Install GSL development libraries
----------------------------------
-sudo apt-get -qq install libgsl-dev
+ARCH-BASED DISTRIBUTION INSTRUCTIONS
+------------------------------------
 
-Get latest GOLDEN CHEETAH source files
---------------------------------------
-$ mkdir -p ~/Projects
-$ cd ~/Projects
-$ git clone git://github.com/GoldenCheetah/GoldenCheetah.git
-$ cd GoldenCheetah
+Install git:
+$ sudo pacman -S git
 
-Configure MANDATORY DEPENDENCIES
---------------------------------
-$ cd qwt
-$ cp qwtconfig.pri.in qwtconfig.pri
-$ cd ../src
-$ cp gcconfig.pri.in gcconfig.pri
+INSTALL FLEX and BISON
+----------------------
+$ sudo pacman -S flex bison
+
+NEXT STEPS
+----------
 $ vi gcconfig.pri
 
 Ensure you have the following lines (which are now also in gcconfig.pri.in which has
@@ -99,17 +85,47 @@ win32 {
   QMAKE_DEL_FILE = rm -f
 }
 
-To compile translation you need the QT tool lrelease
-If it is not found using the defaults in src/src.pro then set the full path and
-filename in gcconfig.pri, s.t.
+Build!
+------
+$ make clean
+$ qmake
+$ make
+
+To compile translation you need QT tool - lrelease
+If it is not found using he defaults in src/src.pro then set the full path and filename in gcconfig.pri
 QMAKE_LRELEASE = /usr/bin/lrelease
 
-If your QT build includes its own local compress libs then you should comment the line below in gcconfig.pri,
-otherwise you will need to have the compress libraries installed separately.
-LIBZ_LIBS    = -lz
+When build first time you get number of error messages on .qm files missing:
+    "RCC: Error in 'Resources/application.qrc': Cannot find file 'translations/gc_fr.qm'"
+You can ignore these messages for your build. The .qm files will be created during the
+build at a later point in time via the "lrelease" command you configured in gcconfig.pri)
 
-compiling with gcc -O3 (tree vectorization can have a significat impact)
-[or -Ofast]
+If your QT build includes its own local compress libs then you should comment the line below in gcconfig.pri,
+otherwise you will need to have the compress libraries installed separately. 
+#LIBZ_INCLUDE =
+#LIBZ_LIBS    = -lz
+
+You will now have a release3 binary but with none of the release3 dependencies compiled in.
+Get latest GOLDEN CHEETAH source files
+--------------------------------------
+$ mkdir -p ~/Projects/Live
+$ cd ~/Projects/Live
+$ git clone git://github.com/GoldenCheetah/GoldenCheetah.git
+$ cd GoldenCheetah
+
+Configure MANDATORY DEPENDENCIES
+--------------------------------
+$ cd qwt
+$ cp qwtconfig.pri.in qwtconfig.pri
+$ cd ../src
+$ cp gcconfig.pri.in gcconfig.pri
+$ vi gcconfig.pri
+
+Comment out the D2XX_INCLUDE and SRMIO_INSTALL lines for now (put # in first character of the line
+to comment out), we will install that in a moment, if we need to.
+
+If you are building for your local host you may find that you get better performance if
+compiling with gcc -O3 (tree vectorization can have a significat impact) [or -Ofast]
 
 If so you might like to uncomment:
 
@@ -120,42 +136,32 @@ Save and exit
 $ cd ..
 
 BUILD WITH BASIC CONFIGURATION
-------------------------------
 $ qmake -recursive
 $ make
 
-When build first time you get number of error messages on .qm files missing:
-"RCC: Error in 'Resources/application.qrc': Cannot find file 'translations/gc_fr.qm'"
-You can ignore these messages for your build. The .qm files will be created
-during the build at a later point in time via the "lrelease" command you
-configured in gcconfig.pri
+Congratulations you have now build a basic GoldenCheetah and can run this safely. See below for
+optional dependencies you can install to support other features.
 
-Congratulations you have now build a basic GoldenCheetah and can run this
-safely. See below for optional dependencies you can install to support
-other features.
-
-
-2. ADDING OPTIONAL DEPENDENCIES
-===============================
+ADDING OPTIONAL DEPENDENCIES WHEN BUILDING VERSION 2
+====================================================
 
 D2XX - For Powertap downloads via USB
 -------------------------------------
 
-Download the FTDI drivers from http://www.ftdichip.com/Drivers/D2XX.htm and
-extract:
+Download the FTDI drivers from http://www.ftdichip.com/Drivers/D2XX.htm (e.g. I used Linux 
+64-bit drivers from http://www.ftdichip.com/Drivers/D2XX/Linux/libftd2xx1.0.4.tar.gz)
 
-$ cd ~/Projects
-$ wget http://www.ftdichip.com/Drivers/D2XX/Linux/libftd2xx-x86_64-1.3.6.tgz
-$ tar xf libftd2xx-x86_64-1.3.6.tgz
+Extract into your home directory (I put mine into ~/Projects/ with archive manager which
+created a sub-directory ~/Projects/libftd2xx1.0.4
 
-$ cd ~/Projects/GoldenCheetah/src
+$ cd src
 $ vi gcconfig.pri
 
 Uncomment the D2XX_INCLUDE entry and make it match (my home is /home/markl)
-D2XX_INCLUDE = /home/markl/Projects/libftd2xx-x86_64-1.3.6
+D2XX_INCLUDE = /home/markl/libftd2xx1.0.4
 
-Make clean is needed if you have previouslt built, since source files examine
-#defines before including this feature. You can skip it if you know why ;)
+Make clean is needed if you have previouslt built, since source files examine #defines before
+including this feature. You can skip it if you know why ;)
 $ make clean
 $ qmake
 $ make
@@ -180,20 +186,20 @@ $ make
 $ sudo make install
 
 Lets go config GC and build with SRMIO
-$ cd ~/Projects/GoldenCheetah/src
+$ cd ~/Projects/Live/GoldenCheetah/src
 $ vi gcconfig.pri
 
 Uncomment the SRMIO_INSTALL and replace with the target used from srmio install:
 SRMIO_INSTALL = /usr/local/
 
-At the bottom of gcconfig.pri you will see the include directory should
-reference from the base install location (/usr/local) make sure it says:
+At the bottom of gcconfig.pri you will see the include directory should reference from
+the base install location (/usr/local) make sure it says:
 
 SRMIO_INCLUDE = $${SRMIO_INSTALL}/include
 SRMIO_LIB = $${SRMIO_INSTALL}/lib/libsrmio.a
 
-Make clean is needed if you have previouslt built, since source files examine
-#defines before including this feature. You can skip it if you know why ;)
+Make clean is needed if you have previouslt built, since source files examine #defines before
+including this feature. You can skip it if you know why ;)
 $ make clean
 $ qmake
 $ make
@@ -203,7 +209,9 @@ You now have SRM support built in.
 LIBKML - For export to Google Earth
 -----------------------------------
 
-You will need Google Earth 5.2 or later and therefore libkml that supports this.
+You will need Google Earth 5.2 or later and therefore libkml that supports this. Unfortunately at the time of writing
+the officially packaged libkml is too old, so you will need to install from source, which means you will need to have
+subversion installed and expat. You may be able to use the currently packaged libkml with
 
 $ sudo apt-get install libkml-dev
 
@@ -212,8 +220,7 @@ if this does not work you will need to build from source:
     $ sudo apt-get install subversion
     $ sudo apt-get install expat libexpat1 libexpat1-dev
 
-    Once svn is installed you can grab the libkml source, configure, build and
-    install:
+    Once svn is installed you can grab the libkml source and configure build etc:
     $ cd ~/Projects
     $ svn checkout http://libkml.googlecode.com/svn/trunk/ libkml
     $ cd libkml
@@ -230,32 +237,55 @@ if this does not work you will need to build from source:
     - examples/{engine,gpx,gx,hellonet,helloworld,regionator,xsd}/Makefile
     - and look for the flag -pedantic and remove it. I got this on Linux 64bit builds ymmv.
 
-Once libkml is installed:
+Once libkml is installed and built:
 
-$ cd ~/Projects/GoldenCheetah/src
+$ cd ~/Projects/Live/GoldenCheetah/src
 $ vi gcconfig.pri
 
 Ensure KML_INSTALL=/usr/local
 
-Make clean is needed if you have previously built, since source files examine
-#defines before including this feature. You can skip it if you know why ;)
+Make clean is needed if you have previously built, since source files examine #defines before
+including this feature. You can skip it if you know why ;)
 $ make clean
 $ qmake
 $ make
 
 You can now export rides to Google Earth kml format.
 
+ADDING OPTIONAL DEPENDENCIES WHEN BUILDING VERSION 3
+====================================================
+
+
+NOTE: When you run version 3 it will refresh ride metrics and CP files -- this only occurs the
+      first time it runs (and will refresh only rides that change after that). I find it is best
+      to import ride files once your build where you want it. i.e. don't import until you have
+      got all your dependencies sorted.
+
+NOTE: To reduce the dependencies on 'dormant' code there are a number of new pieces of source
+      that are included in the release3 tree. Notably; qtsoap from qt-solutions, since they
+      work but are likely to be archived and deprecated. If and when that happens we may well
+      adopt whatever classes Trolltech introduce.
+
+
 LIBICAL - Diary integration with Google or MobileMe calendars
 -------------------------------------------------------------
 
-$ sudo apt-get install libical-dev
+$ cd ~/Projects/Live/GoldenCheetah/src
 
-$ cd ~/Projects/GoldenCheetah/src
+$ sudo apt-get install libical-dev
 $ vi gcconfig.pri
 
-ICAL_INSTALL = /usr
-ICAL_INCLUDE = /usr/include
-ICAL_LIBS    = -lical
+ICAL_INSTALL=/usr/include
+ICAL_LIBS=-lical
+
+Since the src.pro wants ICAL installed in a different place we need to hack it, *** this will
+be fixed shortly ***
+
+$ vi src.pro
+
+Comment out the ICAL_LIBS entry:
+
+#ICAL_LIBS = $${ICAL_INSTALL}/lib/libical.a
 
 $ make clean
 $ qmake
@@ -263,89 +293,21 @@ $ make
 
 You should now have diary functions.
 
-LIBVLC - Video playback in Realtime
------------------------------------
+NOTE: That upload to MobileMe and Google requires a functioning https lib in QT. Depending
+      upon the version installed this might not be the case and will need to be built and
+      configured -- this is beyond the scope of this walkthough. Sorry.
 
-You will need libvlc 3.0.8 or higher for better performance:
+LIBVLC - Video playback in Realtime (Experimental)
+--------------------------------------------------
 
-sudo add-apt-repository ppa:jonathonf/vlc-3
-sudo add-apt-repository ppa:jonathonf/ffmpeg-4
-sudo apt-get update
-sudo apt-get install vlc libvlc-dev libvlccore-dev
+You will need libvlc 1.1.9 or higher (1.1.8 is ok but will segv on exit)
+$ sudo apt-get install libvlc-dev
 
-$ cd ~/Projects/GoldenCheetah/src
 $ vi gcconfig.pri
 
 Comment out VLC_INSTALL and it should read:
 
-VLC_INSTALL = /usr
-
-$ make clean
-$ qmake
-$ make
-
-LIBUSB - for using USB2 sticks in Train View on Linux or Windows
-----------------------------------------------------------------
-$ sudo apt-get install libusb-1.0-0-dev libudev-dev
-
-$ cd ~/Projects/GoldenCheetah/src
-$ vi gcconfig.pri
-
-Uncomment or add the following lines:
-
-LIBUSB_USE_V_1 = true # don't use on Windows
-LIBUSB_INSTALL = /usr/local
-
-$ make clean
-$ qmake
-$ make
-
-R Embedding
------------
-
-Install R 4.0
-sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E298A3A825C0D65DFD57CBB651716619E084DAB9
-sudo add-apt-repository "deb https://cloud.r-project.org/bin/linux/ubuntu bionic-cran40/"
-sudo apt-get update
-sudo apt-get install r-base-dev
-R --version
-
-$ cd ~/Projects/GoldenCheetah/src
-$ vi gcconfig.pri
-
-Uncomment or add the following line:
-DEFINES += GC_WANT_R
-
-$ make clean
-$ qmake
-$ make
-
-Python Embedding
-----------------
-
-Install Python 3.7
-
-sudo add-apt-repository ppa:deadsnakes/ppa
-sudo apt-get update
-sudo apt-get install python3.7-dev
-python3.7 --version
-
-Install SIP 4.19.8:
-cd ~/Projects
-wget https://sourceforge.net/projects/pyqt/files/sip/sip-4.19.8/sip-4.19.8.tar.gz
-tar xf sip-4.19.8.tar.gz
-cd sip-4.19.8
-python3.7 configure.py
-make
-sudo make install
-
-$ cd ~/Projects/GoldenCheetah/src
-$ vi gcconfig.pri
-
-Uncomment or add the following lines:
-DEFINES += GC_WANT_PYTHON
-PYTHONINCLUDES = -I/usr/include/python3.7/
-PYTHONLIBS = -L/usr/lib/python3.7/config-3.7m-x86_64-linux-gnu -lpython3.7m
+VLC_INSTALL = /usr/include/vlc/
 
 $ make clean
 $ qmake

INSTALL-MAC

@@ -1,12 +1,3 @@
-Update Note: to build GoldenCheetah v3.6 we are using the Homebrew Package
-Manager to install dependencies, including Qt and GSL, on Travis-ci
-macOS High Sierra build environment.
-You can check the travis/osx folder for the complete and updated build scripts,
-the minimum Qt version known to work is 5.13 with Qt WebEngine and Qt Charts.
-GSL - GNU Scientific Library is a mandatory dependency starting with v3.6
-
-Ale Martinez - May, 2020
-
                                  +++++++++++++++++++++++
                                 MAC OSX BUILD WALKTHROUGH
                                  +++++++++++++++++++++++

INSTALL-WIN32

@@ -1,11 +1,4 @@
-Update Note: to build GoldenCheetah v3.6 we are using Microsoft Visual C++ 2017,
-included in Microsoft Visual Studio 2019, with pre-installed Qt and GSL
-insalled with vcpkg, on AppVeyor continuous integration platform.
-You can check the appveyor.yml for the complete and updated build script,
-the minimum Qt version known to work is 5.13 with Qt WebEngine and Qt Charts.
-GSL - GNU Scientific Library is a mandatory dependency starting with v3.6
 
-Ale Martinez - May, 2020
                                  +++++++++++++++++++++++
                                  WIN32 BUILD WALKTHROUGH
                                  +++++++++++++++++++++++
@@ -14,7 +7,6 @@ Ale Martinez - May, 2020
 
                                        February 2017
 
-
 This instruction will guide  you through a standard build of GoldenCheetah (without external
 dependencies or API based services included).
 
@@ -207,3 +199,9 @@ to contribute is to provide a pull-request.
 
 Cheers.
 Joern
+ 
+
+
+
+
+

ISSUE_TEMPLATE.md

@@ -1,10 +1 @@
-Issue tracker is **only** for Bugs and Features, please don't open issues for questions or technical support. Before to open a new issue please read the contributing guidelines (link below).
-
-If you have questions, please read the FAQs and User's/Developer's Guide:
-* FAQs - https://github.com/GoldenCheetah/GoldenCheetah/wiki/FAQ
-* User's Guide - https://github.com/GoldenCheetah/GoldenCheetah/wiki/UG_Main-Page_Users-Guide
-* Developer's Guide - https://github.com/GoldenCheetah/GoldenCheetah/wiki/Developers-guide
-
-If you need help or technical support please use the forums:
-* Users - https://groups.google.com/forum/#!forum/golden-cheetah-users
-* Developers - https://groups.google.com/forum/#!forum/golden-cheetah-developers
+Issue tracker is **only** for Bugs and Features, before to open a new issue please read the Contributing document (link at the right) and use the forums if you need help.

README.md

@@ -4,11 +4,18 @@
 
 ## About 
 
-GoldenCheetah is a desktop application for cyclists and triathletes and coaches, providing a rich set of tools and models to analyse, track and predict performance, optimise aerodynamics and train indoors.
+GoldenCheetah is an open-source data analysis tool primarily written in C++
+with Qt for cyclists and triathletes 
+with support for training as well. 
+
+GoldenCheetah can connect with indoor trainers and cycling equipment such 
+as cycling computers and power meters to import data. 
+
+In addition, GoldenCheetah can connect to cloud services. 
+
+It can then manipulate and view the data, as well as analyze it.
 
-GoldenCheetah integrates with most popular cloud services like Strava and Todays Plan, imports data from bike computers, imports downloads from any website like TrainingPeaks and Garmin and will also connect to smart trainers using ANT+ and Bluetooth.
 
-GoldenCheetah is free for everyone to use and modify, released under the GPL v2 open source license with pre-built binaries for Mac, Windows and Linux.
 
 ## Installing 
 
@@ -22,10 +29,12 @@ INSTALL-LINUX   For building on Linux
 INSTALL-MAC     For building on Apple OS X
 
 
-macOS and Linux: [![Build Status](https://travis-ci.com/GoldenCheetah/GoldenCheetah.svg?branch=master)](https://travis-ci.com/GoldenCheetah/GoldenCheetah)
+OSX: [![Build Status](https://travis-ci.org/GoldenCheetah/GoldenCheetah.svg?branch=master)](https://travis-ci.org/GoldenCheetah/GoldenCheetah)
 
 Windows: [![Build status](https://ci.appveyor.com/api/projects/status/i6dwn4m8oyu52ihi?svg=true)](https://ci.appveyor.com/project/Joern-R/goldencheetah-knhd8)
 
 [![Coverity Status](https://scan.coverity.com/projects/7503/badge.svg)](https://scan.coverity.com/projects/goldencheetah-goldencheetah)
 
-Official release builds, snapshots and development builds are all available from http://www.goldencheetah.org
+Alternatively, official builds are available from http://www.goldencheetah.org
+
+whilst the latest developer builds are available from https://github.com/GoldenCheetah/GoldenCheetah/releases

appveyor.yml

@@ -1,213 +1,32 @@
 version: ci.{build}
-image: Visual Studio 2019
+image: Visual Studio 2015
 clone_depth: 1
-
-environment:
-  GC_GOOGLE_CALENDAR_CLIENT_SECRET:
-    secure: hwjHTrSAMEbKd9PA+5x/zI4x5Uk4KQm1hdfZzkwiu8k=
-  GC_GOOGLE_DRIVE_CLIENT_ID:
-    secure: mNqG+pqpMl21ZFVvAMKvhm2rfOdv42fFpnLwfrvX5QqpWVcHEeBuUFeJeUAZfTR0GQGfWfPOEmhb9CG0W1ZJ05TIyb+kTLrWF7iijCiVR6s=
-  GC_GOOGLE_DRIVE_CLIENT_SECRET:
-    secure: T+BaB/L7x4dPPf592e0kfw4sTlAslUXl10irJqiUjpY=
-  GC_GOOGLE_DRIVE_API_KEY:
-    secure: oxTAhK/kiLUsXdYvITAgzSqeB5FRcL+XANFuAYpoW5P/xBb7XaLbNnL2gyrmzQeG
-  GC_CLOUD_OPENDATA_SECRET:
-    secure: 6fPhBiHKvJeOMqXdHGqpkPS+NpUDMczEXjedx8GcjbHr82ISX+gwSuXfOUDLq/S9
-  GC_WITHINGS_CONSUMER_SECRET:
-    secure: 86xAkdoQB8mLXq964/lGCp3ElTSF4k3a27R3UUXt3618guWLyBfsEK5Q0+XSOI3Q38w80CTpmNdwejoISv8Ilg==
-  GC_NOKIA_CLIENT_SECRET:
-    secure: pvPWraDplrKeRNamt5MKga8fzDmI2+zgFx+y3lsQE6gmBadZU2xkTIc/xCaP7UPv2erNCmKivfMOh2NIcRmqvIHynDoifNVy2P61KyG5v3E=
-  GC_DROPBOX_CLIENT_SECRET:
-    secure: 7pCVnVEKKmSU4SZN6IFqUw==
-  GC_STRAVA_CLIENT_SECRET:
-    secure: n3cMS1yy709xhSnTeWABMsoAIkJzy5euh3Pw4ehv0BzszJKoWkypF0cyW8RXSm3M
-  GC_TODAYSPLAN_CLIENT_SECRET:
-    secure: 7PnFB8cfahFT6LyP64eB7N1vkbwVaULpB2ORmEkn+J75zNB1xxGClFNXSHZ7kXhB
-  GC_CYCLINGANALYTICS_CLIENT_SECRET:
-    secure: UY+m3YypNNLUzKyGdrLw8xdCvxuQWRZi9EHS3j1ubLC4qyRL7iEVW6ubumfdh6gT
-  GC_CLOUD_DB_BASIC_AUTH:
-    secure: OEBetrOnXjsY7wN8hYqmMj6482oDORmAmCq8PI7mfnfiWE6Z4jB676JvgdNlP98q
-  GC_CLOUD_DB_APP_NAME:
-    secure: bpkyuw/BsJw0OrpuBqQwZ46CHbhkbmcjcMttVtfJoZU=
-  GC_POLARFLOW_CLIENT_SECRET:
-    secure: h2JdlC1i4QOmwpkz+Xxbrw==
-  GC_SPORTTRACKS_CLIENT_SECRET:
-    secure: n6a8nJgqMyg+VsVeoIIR8TFzxyDFVi2w/ggetQk5agY=
-
 init:
-# Setup QT 5.14 - 64Bit
-- set QTDIR=C:\Qt\5.14\msvc2017_64
+# Setup QT 5.9 - 64Bit
+
+- set QTDIR=C:\Qt\5.9\msvc2015_64
 - set PATH=%QTDIR%\bin;%PATH%
-- qmake --version
 
-# Setup MSVC - VS 2019
-- call c:\"Program Files (x86)"\"Microsoft Visual Studio"\2019\Community\VC\Auxiliary\Build\vcvarsall.bat amd64
+# Setup MSVC - VS 2015
 
-# Setup NSIS
-- set PATH=%PATH%;C:\"Program Files (x86)"\NSIS
+- CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
 
-cache:
-- gc-ci-libs.zip -> appveyor.yml
-- jom_1_1_3.zip
-- sip-4.19.8.zip
-- C:\R
-- C:\Python -> src\Python\requirements.txt
-- c:\tools\vcpkg\installed\
-- qwt
+# Get the libraries
+
+- ps: Start-FileDownload 'https://github.com/Joern-R/gc-ci-libs/releases/download/0.0.2/gc-ci-libs.zip' -Filename 'c:/gc-ci-libs.zip'
+- 7z x c:/gc-ci-libs.zip -oC:\libs
 
 install:
-# Get the libraries
-- if not exist gc-ci-libs.zip appveyor DownloadFile "https://github.com/GoldenCheetah/WindowsSDK/releases/download/v0.1.1/gc-ci-libs.zip"
-- 7z x -y gc-ci-libs.zip -oC:\libs
-# GSL
-- vcpkg install gsl:x64-windows
-
-# Get config
+# choco install winflexbison
 - copy qwt\qwtconfig.pri.in qwt\qwtconfig.pri
 - copy c:\libs\gcconfig64-Release.appveyor.pri src\gcconfig.pri
 
-# Get jom
-- if not exist jom_1_1_3.zip appveyor DownloadFile "https://download.qt.io/official_releases/jom/jom_1_1_3.zip"
-- 7z x -y jom_1_1_3.zip -oc:\jom\
-- set PATH=%PATH%;c:\jom\;
-
-# Get R and add to config
-- ps: >-
-    if (-not (Test-Path 'C:\R')) {
-      $rurl = $(ConvertFrom-JSON $(Invoke-WebRequest https://rversions.r-pkg.org/r-release-win).Content).URL
-      Start-FileDownload $rurl "R-win.exe"
-      Start-Process -FilePath .\R-win.exe -ArgumentList "/VERYSILENT /DIR=C:\R" -NoNewWindow -Wait
-    }
-- set PATH=%PATH%;c:\R\bin\;
-- R --version
-- echo DEFINES+=GC_WANT_R >> src\gcconfig.pri
-
-# Get Python embeddable and install packages
-- ps: >-
-    if (-not (Test-Path 'C:\Python')) {
-      Start-FileDownload "https://www.python.org/ftp/python/3.7.9/python-3.7.9-embed-amd64.zip" Python.zip
-      7z x Python.zip -oC:\Python\
-      echo python37.zip . '' 'import site' | Out-File C:\Python\python37._pth -Encoding ascii
-      mkdir C:\Python\lib\site-packages
-      c:\python37-x64\python -m pip install --upgrade pip
-      c:\python37-x64\python -m pip install -r src\Python\requirements.txt -t C:\Python\lib\site-packages
-    }
-
-# Get SIP and and install on Python
-- c:\python37-x64\python --version
-- if not exist sip-4.19.8.zip appveyor DownloadFile "https://sourceforge.net/projects/pyqt/files/sip/sip-4.19.8/sip-4.19.8.zip"
-- 7z x sip-4.19.8.zip
-- cd sip-4.19.8
-- c:\python37-x64\python configure.py
-- jom -j4
-- nmake install
-- cd ..
-
-# Add Python (avoiding colision between GC Context.h and Python context.h)
-- echo DEFINES+=GC_WANT_PYTHON >> src\gcconfig.pri
-- echo PYTHONINCLUDES=-ICore -I\"c:\python37-x64\include\" >> src\gcconfig.pri
-- echo PYTHONLIBS=-L\"c:\python37-x64\libs\" -lpython37 >> src\gcconfig.pri
-
-# GSL
-- echo GSL_INCLUDES=c:\tools\vcpkg\installed\x64-windows\include >> src\gcconfig.pri
-- echo GSL_LIBS=-Lc:\tools\vcpkg\installed\x64-windows\lib -lgsl -lgslcblas >> src\gcconfig.pri
-
-before_build:
-# Define GC version string, only for tagged builds
-- if %APPVEYOR_REPO_TAG%==true echo DEFINES+=GC_VERSION=VERSION_STRING >> src\gcconfig.pri
-
-# Enable CloudDB
-- echo CloudDB=active >> src\gcconfig.pri
-
-# Add Train Robot
-- echo DEFINES+=GC_WANT_ROBOT >> src\gcconfig.pri
-
-# Add debug console
-#- echo CONFIG+=console >> src\gcconfig.pri
-
-# Patch Secrets.h
-- ps: (Get-Content src\Core\Secrets.h) -replace '__GC_GOOGLE_CALENDAR_CLIENT_SECRET__', $env:GC_GOOGLE_CALENDAR_CLIENT_SECRET | Set-Content src\Core\Secrets.h
-- ps: (Get-Content src\Core\Secrets.h) -replace '__GC_GOOGLE_DRIVE_CLIENT_ID__', $env:GC_GOOGLE_DRIVE_CLIENT_ID | Set-Content src\Core\Secrets.h
-- ps: (Get-Content src\Core\Secrets.h) -replace '__GC_GOOGLE_DRIVE_CLIENT_SECRET__', $env:GC_GOOGLE_DRIVE_CLIENT_SECRET | Set-Content src\Core\Secrets.h
-- ps: (Get-Content src\Core\Secrets.h) -replace '__GC_GOOGLE_DRIVE_API_KEY__', $env:GC_GOOGLE_DRIVE_API_KEY | Set-Content src\Core\Secrets.h
-- ps: (Get-Content src\Core\Secrets.h) -replace 'OPENDATA_DISABLE', 'OPENDATA_ENABLE' | Set-Content src\Core\Secrets.h
-- ps: (Get-Content src\Core\Secrets.h) -replace '__GC_CLOUD_OPENDATA_SECRET__', $env:GC_CLOUD_OPENDATA_SECRET | Set-Content src\Core\Secrets.h
-- ps: (Get-Content src\Core\Secrets.h) -replace '__GC_WITHINGS_CONSUMER_SECRET__', $env:GC_WITHINGS_CONSUMER_SECRET | Set-Content src\Core\Secrets.h
-- ps: (Get-Content src\Core\Secrets.h) -replace '__GC_NOKIA_CLIENT_SECRET__', $env:GC_NOKIA_CLIENT_SECRET | Set-Content src\Core\Secrets.h
-- ps: (Get-Content src\Core\Secrets.h) -replace '__GC_DROPBOX_CLIENT_SECRET__', $env:GC_DROPBOX_CLIENT_SECRET | Set-Content src\Core\Secrets.h
-- ps: (Get-Content src\Core\Secrets.h) -replace '__GC_STRAVA_CLIENT_SECRET__', $env:GC_STRAVA_CLIENT_SECRET | Set-Content src\Core\Secrets.h
-- ps: (Get-Content src\Core\Secrets.h) -replace '__GC_TODAYSPLAN_CLIENT_SECRET__', $env:GC_TODAYSPLAN_CLIENT_SECRET | Set-Content src\Core\Secrets.h
-- ps: (Get-Content src\Core\Secrets.h) -replace '__GC_CYCLINGANALYTICS_CLIENT_SECRET__', $env:GC_CYCLINGANALYTICS_CLIENT_SECRET | Set-Content src\Core\Secrets.h
-- ps: (Get-Content src\Core\Secrets.h) -replace '__GC_CLOUD_DB_BASIC_AUTH__', $env:GC_CLOUD_DB_BASIC_AUTH | Set-Content src\Core\Secrets.h
-- ps: (Get-Content src\Core\Secrets.h) -replace '__GC_CLOUD_DB_APP_NAME__', $env:GC_CLOUD_DB_APP_NAME | Set-Content src\Core\Secrets.h
-- ps: (Get-Content src\Core\Secrets.h) -replace '__GC_POLARFLOW_CLIENT_SECRET__', $env:GC_POLARFLOW_CLIENT_SECRET | Set-Content src\Core\Secrets.h
-- ps: (Get-Content src\Core\Secrets.h) -replace '__GC_SPORTTRACKS_CLIENT_SECRET__', $env:GC_SPORTTRACKS_CLIENT_SECRET | Set-Content src\Core\Secrets.h
-
 build_script:
 - qmake.exe build.pro -r -spec win32-msvc
-- cd qwt\
-- jom -j1
-- cd ..
-- jom -j4
+- nmake
 
-after_build:
-- cd src\release
-
-# copy dependencies
-- windeployqt --release GoldenCheetah.exe
-- copy c:\libs\10_Precompiled_DLL\usbexpress_3.5.1\USBXpress\USBXpress_API\Host\x64\SiUSBXp.dll
-- copy c:\libs\10_Precompiled_DLL\libsamplerate64\lib\libsamplerate-0.dll
-- copy c:\libs\10_Precompiled_DLL\VLC\win64\lib\libvlc*.dll
-- xcopy /s /i /e /q c:\libs\10_Precompiled_DLL\VLC\win64\plugins plugins
-- copy c:\OpenSSL-v111-Win64\bin\lib*.dll
-- copy c:\OpenSSL-v111-Win64\license.txt "OpenSSL License.txt"
-- xcopy /s /i /e /q C:\Python .
-- copy C:\Python\LICENSE.txt "PYTHON LICENSE.txt"
-- copy c:\tools\vcpkg\installed\x64-windows\bin\gsl*.dll
-
-# ReadMe, license and icon files
-- copy ..\Resources\win32\ReadMe.txt
-- echo GoldenCheetah is licensed under the GNU General Public License v2 > license.txt
-- echo. >> license.txt
-- type ..\..\COPYING >> license.txt
-- copy ..\Resources\win32\gc.ico
-
-# Installer script
-- copy ..\Resources\win32\GC3.6-Dev-Master-W64-QT5.14.2.nsi
-
-# Build the installer
-- makensis GC3.6-Dev-Master-W64-QT5.14.2.nsi
-- move GoldenCheetah_v3.6-DEV_64bit_Windows.exe ..\..\GoldenCheetah_v3.6-DEV_x64.exe
-- cd ..\..
-- ps: Set-AppveyorBuildVariable -Name 'PUBLISH_BINARIES' -Value false
-- ps: if ($env:APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED -Match "\[publish binaries\]") { Set-AppveyorBuildVariable -Name 'PUBLISH_BINARIES' -Value true }
-
-test_script:
-# minimum test
-- src\release\GoldenCheetah --version 2>GCversionWindows.txt
-- git log -1 >> GCversionWindows.txt
-- ps: CertUtil -hashfile GoldenCheetah_v3.6-DEV_x64.exe sha256 | Select-Object -First 2 | Add-Content GCversionWindows.txt
-- type GCversionWindows.txt
-
-artifacts:
-- path: GoldenCheetah_v3.6-DEV_x64.exe
-  name: GCinstaller
-- path: GCversionWindows.txt
-  name: GCversionWindows
-
-deploy:
-# deploy continuous builds to s3
-  - provider: S3
-    access_key_id:
-      secure: RoEkfKfOnF7JHOiLZX5qfZM08X+bu4oaDzzSKgdooNM=
-    secret_access_key:
-      secure: GPAArawatirYwgpHJBthdrbvyFU5bBzPOdK7VYYPiG2YHYi/DNJZ5Q5qGK1A440p
-    bucket: goldencheetah-binaries
-    region: us-east-1
-    remove_files: true
-    set_public: true
-    folder: Windows
-    artifact: GCinstaller, GCversionWindows
-    on:
-      PUBLISH_BINARIES: true
-      APPVEYOR_REPO_NAME: "GoldenCheetah/GoldenCheetah"
+#notifications:
+#- provider: GitHubPullRequest
+#  on_build_success: true
+#  on_build_failure: true
+#  on_build_status_changed: true

deprecated/VeloHeroUploader.cpp

@@ -48,7 +48,7 @@
  * - so... hack around this with currentRequest + dispatchRequest TODO: fix
  */
 
-const QString VELOHERO_URL( "https://app.velohero.com" );
+const QString VELOHERO_URL( "http://app.velohero.com" );
 
 class VeloHeroParser : public QXmlDefaultHandler
 {

doc/user/formula-syntax.txt

@@ -60,18 +60,13 @@ isset(p1)
 CONFIGURED PARAMETERS
 config(cranklength)
 config(cp)
-config(aetp)
-config(ftp)
-config(w')
+config(w)
 config(pmax)
 config(cv)
-config(aetv)
-config(sex)
-config(dob)
+config(scv)
 config(height)
 config(weight)
 config(lthr)
-config(aethr)
 config(maxhr)
 config(rhr)
 config(units)

doc/user/measures.ini

@@ -1,18 +0,0 @@
-; Sample measures.ini configuration file
-; It's looked for in GC root folder, parallel to athlete's directories.
-
-; Nutrition data group
-[Nutrition]
-; Name: translated identifier, defaults to the group identifier
-Name=Nutrition
-; Fields: list of identifiers, at least one is mandatory
-Fields=Energy,CHO,PRO,FAT
-; Names: translated identifiers, if present order and number must match Fields
-Names=Calories,CHO,PRO,FAT
-; MetricUnits: optional, if present order and number must match Fields
-MetricUnits=kcal,g,g,g
-; Valid headers for each field to be used in CSV import
-Energy=Energy,Calories
-CHO=CHO,Carbs
-PRO=PRO,Protein
-FAT=FAT,Fats

doc/user/nutrition-data-example.csv

@@ -1,3 +0,0 @@
-Datetime,Calories,CHO,PRO,FAT,comment
-2018-05-21T12:00:00Z,2900,400,100,100,Test Data
-2018-05-22T12:00:00Z,3300,500,100,100,"Here the comment text contain commas itself, so it needs quotes"