From f7d2431e8139c1fec1b57c8e2969dab90aa92062 Mon Sep 17 00:00:00 2001 From: Ale Martinez Date: Tue, 11 Dec 2018 14:10:53 -0300 Subject: [PATCH] Remove references to QwtPlot3d and kQOauth They are not used anymore --- INSTALL-LINUX | 91 --------------------------------------- INSTALL-MAC | 27 ++---------- INSTALL-WIN32 | 9 +--- src/Gui/GcCrashDialog.cpp | 15 ------- 4 files changed, 4 insertions(+), 138 deletions(-) diff --git a/INSTALL-LINUX b/INSTALL-LINUX index df48618a4..ffe82f9e7 100644 --- a/INSTALL-LINUX +++ b/INSTALL-LINUX @@ -21,7 +21,6 @@ CONTENTS - FTDI D2XX - SRMIO - liboauth - - QwtPlot3d - libkml 3. ADDING OPTIONAL DEPENDENCIES WHEN BUILDING VERSION 3 @@ -193,96 +192,6 @@ $ make You now have SRM support built in. -OAUTH/CRYPT - For Tweet my ride (twitter) support -------------------------------------------------- - -You should be able to install liboauth and dependencies -directly with: -$ sudo apt-get install liboauth-dev - -If this does not work then: - - Download the source from: http://sourceforge.net/projects/liboauth/files/liboauth-0.9.4.tar.gz/download and - unpack it into ~/Projects/liboauth-0.9.4 using archive manager - - $ cd ~/Projects/liboauth-0.9.4 - - You may find that libcurl is not installed (which liboauth depends upon) so download it - from http://curl.haxx.se/download/curl-7.21.6.tar.gz and unpack it into ~/Projects/curl-7.21.6 - using archive manager to drag and drop into your Projects folder - - $ cd ~/Projects/curl-7.21.6 - $ ./configure - $ make - $ sudo make install - - You should now have libcurl and friends installed in /usr/local - - You may find that liboauth also requires the openssl libs installed, these are available - pre-packaged thankfully so: - $ sudo apt-get install libssl-dev - - This will also install zlibg which liboauth also desires. - - $ cd ~/Projects/liboauth-0.9.4 - $ ./configure - $ make - $ sudo make install - -Now we have liboauth and libcurl in /usr/local and libssl in /usr/lib, so we can go back to -GoldenCheetah and update the gcconfig.pri to point at the right places: - -$ cd ~/Projects/Live/GoldenCheetah/src -$ vi gcconfig.pri - -Make sure the following are set: -LIBOAUTH_INSTALL = /usr/local -LIBCRYPTO_INSTALL = -lcrypto -LIBCURL_INSTALL=-lcurl - -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 tweet your rides and amaze your friends, or alternatively tweet your rides but -omit to mention average power to hide your weaknesses. - -LIBQWTPLOT3D - For 3D plot --------------------------- - -Download the tarball from http://qwtplot3d.svn.sourceforge.net/viewvc/qwtplot3d/branches/maintain_0_2_x/qwtplot3d/?view=tar -and unarchive it into your Projects directory using archive manager. There is no version number it just creates a -subdirectory called qwtplot3d - -You will need to install libgl and extensions, this can be done with; -$ sudo apt-get install libgl1-mesa-dev -$ sudo apt-get install libglu-dev - -On Ubuntu 12.10 I also ran -$ sudo apt-get install freeglut3 freeglut3-dev - -$ cd ~/Projects/qwtplot3d -Edit the qwtplot3d.pri and add -CONFIG += staticlib - -You will find that on modern Linuxes you also need to fix include/qwt3d_global.h by adding the line: -#include - -then build -$ qmake -$ make - -Then to let gc know where the qwtplot3d libs are you need to edit gcconfig.pri; -$ cd ~/Projects/Live/GoldenCheetah/src -$ vi gcconfig.pri - -And uncomment the following line and set the install directory to where you build -QWT3D_INSTALL = ~/Projects/qwtplot3d - - - LIBKML - For export to Google Earth ----------------------------------- diff --git a/INSTALL-MAC b/INSTALL-MAC index a050a7ff9..ab4e90e00 100644 --- a/INSTALL-MAC +++ b/INSTALL-MAC @@ -20,8 +20,6 @@ CONTENTS 2. ADDING OPTIONAL DEPENDENCIES - FTDI D2XX - SRMIO - - kQOAuth - - QwtPlot3d - libkml - libusb - libical @@ -238,8 +236,6 @@ $ open src/GoldenCheetah.app =============================== - SRMIO - - kQOAuth - - QwtPlot3d - libkml - libusb - libical @@ -255,24 +251,7 @@ should be taken into account. SRMIO (git) ./configure CFLAGS="-isysroot /Developer/SDKs/MacOSX10.7.sdk -arch x86_64" CPPFLAGS=-I/usr/local/D2XX/ --disable-dependency-tracking -2.2 kQOAuth - For OAuth Authentication --------------------------------------- - -kQOauth (0.98) - -qmake - - -2.3 QwtPlot3d - For 3d plot support ------------------------------------ - -qwtplot3d (maintain_0_2_x) - -Add the following to qwtplot3d.pro: -CONFIG += x86_64 static -QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.7.sdk - -2.4 libkml - For export to Google Earth +2.2 libkml - For export to Google Earth --------------------------------------- expat (2.0.1) @@ -284,7 +263,7 @@ libkml (pulled down from the svn repo) note: the added CXXFLAGS helped clear the -Werror flag that stopped compilation. -2.5 libusb - For Garmin USB2 stick support +2.3 libusb - For Garmin USB2 stick support ------------------------------------------ libusb (0.1.12) @@ -301,7 +280,7 @@ make install note: that the sed line updates some commands in libtool. not sure why the arch clags are not getting passed. -2.6 libical +2.4 libical ----------- libical (0.46) diff --git a/INSTALL-WIN32 b/INSTALL-WIN32 index d03694f65..d2c64458e 100644 --- a/INSTALL-WIN32 +++ b/INSTALL-WIN32 @@ -157,12 +157,6 @@ Info: I plan to provide a pre-compiled set of the dependencies for the Windows v The version currently used is: "CDM v2.10.00 WHQL Certified" - while there are more recent version available for download. -- Qt Oauth library - kQoAuth - -- Is part of the official build as a .dll - build is done with Qt - the build uses Release 0.98 - -- Qt 3D plotting - qwtplot3d - -- Is part of the official build as a static lib - build is done with Qt - the build uses Release 0.3.0 - - Google Earth .kml files (export) -- Is part of the official build as a static lib - build is done with MSVC2015 - the build uses Release 1.2 (path of source code has changed to https://github.com/google/libkml) @@ -185,7 +179,7 @@ Info: I plan to provide a pre-compiled set of the dependencies for the Windows v Building with integration to external services (via APIs) -As of today a number of integrations with external services like Twitter, Strava, Cyclinganalytics, +As of today a number of integrations with external services like Strava, Cyclinganalytics, Google Calendar, Dropbox, Today's Plan, Google Drive, CloudDB) exist in the official GoldenCheetah builds. The permission to use API's of such services requires a dedicated registration (in this case for "GoldenCheetah" as the consumer of the services) where in return the GoldenCheetah team get's @@ -211,4 +205,3 @@ Joern - \ No newline at end of file diff --git a/src/Gui/GcCrashDialog.cpp b/src/Gui/GcCrashDialog.cpp index f413d4312..10766bb27 100644 --- a/src/Gui/GcCrashDialog.cpp +++ b/src/Gui/GcCrashDialog.cpp @@ -43,10 +43,6 @@ #include "QtMacVideoWindow.h" #endif -#ifdef GC_HAVE_QWTPLOT3D -#include "qwt3d_global.h" -#endif - #ifdef GC_HAVE_ICAL #include "ICalendar.h" #endif @@ -213,15 +209,6 @@ QString GcCrashDialog::versionHTML() d2xx = "yes"; #endif - // -- QWTPLOT3D ---- - QString qwtplot3d = "none"; - - #ifdef GC_HAVE_QWTPLOT3D - qwtplot3d = QString::number(QWT3D_MAJOR_VERSION) + "." - + QString::number(QWT3D_MINOR_VERSION) + "." - + QString::number(QWT3D_PATCH_VERSION); - #endif - // -- KML ---- QString kml = "none"; @@ -293,7 +280,6 @@ QString GcCrashDialog::versionHTML() "%3%4" "SRMIO%5" "D2XX%6" - "QWTPLOT3D%7" "KML%8" "ICAL%9" "USBXPRESS%10" @@ -315,7 +301,6 @@ QString GcCrashDialog::versionHTML() .arg(COMPILER_VERSION) .arg(srmio) .arg(d2xx) - .arg(qwtplot3d) .arg(kml) .arg(ical) .arg(usbxpress)