mirror of
https://github.com/GoldenCheetah/GoldenCheetah.git
synced 2026-04-13 12:42:20 +00:00
Deprecate export to KML files
Related to #3983, see discussion there for the rationale.
This commit is contained in:
@@ -27,7 +27,6 @@ CONTENTS
|
|||||||
- FTDI D2XX
|
- FTDI D2XX
|
||||||
- SRMIO
|
- SRMIO
|
||||||
- liboauth
|
- liboauth
|
||||||
- libkml
|
|
||||||
- libvlc - Video playback in training mode
|
- libvlc - Video playback in training mode
|
||||||
- libical - Diary window and CalDAV support (external calendar integration)
|
- libical - Diary window and CalDAV support (external calendar integration)
|
||||||
- libusb - If you want support for using USB2 sticks in Train View
|
- libusb - If you want support for using USB2 sticks in Train View
|
||||||
@@ -205,51 +204,6 @@ $ make
|
|||||||
|
|
||||||
You now have SRM support built in.
|
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.
|
|
||||||
|
|
||||||
$ sudo apt-get install libkml-dev
|
|
||||||
|
|
||||||
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:
|
|
||||||
$ cd ~/Projects
|
|
||||||
$ svn checkout http://libkml.googlecode.com/svn/trunk/ libkml
|
|
||||||
$ cd libkml
|
|
||||||
|
|
||||||
You will need automake and friends (see SRMIO above)
|
|
||||||
$ sh autogen.sh
|
|
||||||
$ ./configure
|
|
||||||
$ make
|
|
||||||
$ make install
|
|
||||||
$ sudo make install
|
|
||||||
|
|
||||||
If you get errors about use of 'long long' then edit:
|
|
||||||
- src/kml/{convenience,dom,engine,regionator,xsd}/Makefile
|
|
||||||
- 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:
|
|
||||||
|
|
||||||
$ cd ~/Projects/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
|
|
||||||
$ qmake
|
|
||||||
$ make
|
|
||||||
|
|
||||||
You can now export rides to Google Earth kml format.
|
|
||||||
|
|
||||||
LIBICAL - Diary integration with Google or MobileMe calendars
|
LIBICAL - Diary integration with Google or MobileMe calendars
|
||||||
-------------------------------------------------------------
|
-------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
18
INSTALL-MAC
18
INSTALL-MAC
@@ -30,7 +30,6 @@ CONTENTS
|
|||||||
2. ADDING OPTIONAL DEPENDENCIES
|
2. ADDING OPTIONAL DEPENDENCIES
|
||||||
- FTDI D2XX
|
- FTDI D2XX
|
||||||
- SRMIO
|
- SRMIO
|
||||||
- libkml
|
|
||||||
- libusb
|
- libusb
|
||||||
- libical
|
- libical
|
||||||
|
|
||||||
@@ -251,7 +250,6 @@ $ open src/GoldenCheetah.app
|
|||||||
===============================
|
===============================
|
||||||
|
|
||||||
- SRMIO
|
- SRMIO
|
||||||
- libkml
|
|
||||||
- libusb
|
- libusb
|
||||||
- libical
|
- libical
|
||||||
|
|
||||||
@@ -266,19 +264,7 @@ should be taken into account.
|
|||||||
SRMIO (git)
|
SRMIO (git)
|
||||||
./configure CFLAGS="-isysroot /Developer/SDKs/MacOSX10.7.sdk -arch x86_64" CPPFLAGS=-I/usr/local/D2XX/ --disable-dependency-tracking
|
./configure CFLAGS="-isysroot /Developer/SDKs/MacOSX10.7.sdk -arch x86_64" CPPFLAGS=-I/usr/local/D2XX/ --disable-dependency-tracking
|
||||||
|
|
||||||
2.2 libkml - For export to Google Earth
|
2.2 libusb - For Garmin USB2 stick support
|
||||||
---------------------------------------
|
|
||||||
|
|
||||||
expat (2.0.1)
|
|
||||||
./configure CFLAGS="-isysroot /Developer/SDKs/MacOSX10.7.sdk -arch x86_64" --disable-dependency-tracking
|
|
||||||
|
|
||||||
libkml (pulled down from the svn repo)
|
|
||||||
|
|
||||||
./configure CFLAGS="-isysroot /Developer/SDKs/MacOSX10.7.sdk -arch x86_64" --disable-dependency-tracking --with-expat-include-dir=/usr/local/include --with-expat-lib-dir=/usr/local/lib --disable-swig CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.7.sdk -arch x86_64"
|
|
||||||
|
|
||||||
note: the added CXXFLAGS helped clear the -Werror flag that stopped compilation.
|
|
||||||
|
|
||||||
2.3 libusb - For Garmin USB2 stick support
|
|
||||||
------------------------------------------
|
------------------------------------------
|
||||||
|
|
||||||
libusb (0.1.12)
|
libusb (0.1.12)
|
||||||
@@ -295,7 +281,7 @@ make install
|
|||||||
|
|
||||||
note: that the sed line updates some commands in libtool. not sure why the arch clags are not getting passed.
|
note: that the sed line updates some commands in libtool. not sure why the arch clags are not getting passed.
|
||||||
|
|
||||||
2.4 libical
|
2.3 libical
|
||||||
-----------
|
-----------
|
||||||
|
|
||||||
libical (0.46)
|
libical (0.46)
|
||||||
|
|||||||
@@ -165,10 +165,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
|
The version currently used is: "CDM v2.10.00 WHQL Certified" - while there are more recent
|
||||||
version available for download.
|
version available for download.
|
||||||
|
|
||||||
- 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)
|
|
||||||
|
|
||||||
- iCal Calendar support (prerequisite for the "Diary" view)
|
- iCal Calendar support (prerequisite for the "Diary" view)
|
||||||
-- Is part of the official build as a static lib - the build uses Release 1.0.1
|
-- Is part of the official build as a static lib - the build uses Release 1.0.1
|
||||||
|
|
||||||
|
|||||||
@@ -184,13 +184,6 @@ QString GcCrashDialog::versionHTML()
|
|||||||
d2xx = "yes";
|
d2xx = "yes";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// -- KML ----
|
|
||||||
QString kml = "none";
|
|
||||||
|
|
||||||
#ifdef GC_HAVE_KML
|
|
||||||
kml = "yes";
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// -- ICAL ----
|
// -- ICAL ----
|
||||||
QString ical = "none";
|
QString ical = "none";
|
||||||
|
|
||||||
@@ -268,7 +261,6 @@ QString GcCrashDialog::versionHTML()
|
|||||||
"<tr><td colspan=\"2\">%3</td><td>%4</td></tr>"
|
"<tr><td colspan=\"2\">%3</td><td>%4</td></tr>"
|
||||||
"<tr><td colspan=\"2\">SRMIO</td><td>%5</td></tr>"
|
"<tr><td colspan=\"2\">SRMIO</td><td>%5</td></tr>"
|
||||||
"<tr><td colspan=\"2\">D2XX</td><td>%6</td></tr>"
|
"<tr><td colspan=\"2\">D2XX</td><td>%6</td></tr>"
|
||||||
"<tr><td colspan=\"2\">KML</td><td>%8</td></tr>"
|
|
||||||
"<tr><td colspan=\"2\">ICAL</td><td>%9</td></tr>"
|
"<tr><td colspan=\"2\">ICAL</td><td>%9</td></tr>"
|
||||||
"<tr><td colspan=\"2\">USBXPRESS</td><td>%10</td></tr>"
|
"<tr><td colspan=\"2\">USBXPRESS</td><td>%10</td></tr>"
|
||||||
"<tr><td colspan=\"2\">LIBUSB</td><td>%11</td></tr>"
|
"<tr><td colspan=\"2\">LIBUSB</td><td>%11</td></tr>"
|
||||||
@@ -289,7 +281,6 @@ QString GcCrashDialog::versionHTML()
|
|||||||
.arg(COMPILER_VERSION)
|
.arg(COMPILER_VERSION)
|
||||||
.arg(srmio)
|
.arg(srmio)
|
||||||
.arg(d2xx)
|
.arg(d2xx)
|
||||||
.arg(kml)
|
|
||||||
.arg(ical)
|
.arg(ical)
|
||||||
.arg(usbxpress)
|
.arg(usbxpress)
|
||||||
.arg(libusb)
|
.arg(libusb)
|
||||||
|
|||||||
@@ -112,26 +112,6 @@
|
|||||||
#D2XX_INCLUDE =
|
#D2XX_INCLUDE =
|
||||||
#D2XX_LIBS =
|
#D2XX_LIBS =
|
||||||
|
|
||||||
# If you want support for Google Earth .kml files then you need
|
|
||||||
# to install the Google libkml library
|
|
||||||
#
|
|
||||||
# http://code.google.com/p/libkml/
|
|
||||||
# or on Linux sudo apt-get install libkml-dev
|
|
||||||
#
|
|
||||||
# then set the following variable appropriately
|
|
||||||
# to the root of the libs/include path
|
|
||||||
#KML_INSTALL = /usr/local
|
|
||||||
#KML_INCLUDE =
|
|
||||||
#KML_LIBS =
|
|
||||||
# Since KML also requires BOOST you will need to install
|
|
||||||
# that too and then set BOOST_INCLUDE to that location
|
|
||||||
# If the files are in /usr/include/boost then set
|
|
||||||
#BOOST_INCLUDE = /usr/include
|
|
||||||
#Additionally, on MAC the latest libs also need the following
|
|
||||||
#QMAKE_CFLAGS_X86_64 += -mmacosx-version-min=10.7
|
|
||||||
#QMAKE_CXXFLAGS_X86_64 = $$QMAKE_CFLAGS_X86_64
|
|
||||||
#LIBS += -lexpat -luriparser -lminizip
|
|
||||||
|
|
||||||
# If you want support for downloading from iCal calendars you will need libical
|
# If you want support for downloading from iCal calendars you will need libical
|
||||||
# http://sourceforge.net/projects/freeassociation/
|
# http://sourceforge.net/projects/freeassociation/
|
||||||
# Set path to the root of the libical installation
|
# Set path to the root of the libical installation
|
||||||
|
|||||||
26
src/src.pro
26
src/src.pro
@@ -351,32 +351,6 @@ contains(DEFINES, "GC_WANT_R") {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
###=====================================
|
|
||||||
### OPTIONAL => GOOGLE KML IMPORT EXPORT
|
|
||||||
###=====================================
|
|
||||||
|
|
||||||
!isEmpty(KML_INSTALL) {
|
|
||||||
|
|
||||||
# we will work out the rest if you tell use where it is installed
|
|
||||||
isEmpty(KML_INCLUDE) { KML_INCLUDE = $${KML_INSTALL}/include }
|
|
||||||
isEmpty(KML_LIBS) { KML_LIBS = -L$${KML_INSTALL}/lib/ \
|
|
||||||
-lkmldom -lkmlconvenience -lkmlengine -lkmlbase
|
|
||||||
}
|
|
||||||
|
|
||||||
# on MS VS the linker wants /LTCG for libkmldom due to
|
|
||||||
# "MSIL .netmodule or module compiled with /GL found"
|
|
||||||
win32-msvc* { QMAKE_LFLAGS += /LTCG }
|
|
||||||
|
|
||||||
DEFINES += GC_HAVE_KML
|
|
||||||
INCLUDEPATH += $${KML_INCLUDE} $${BOOST_INCLUDE}
|
|
||||||
LIBS += $${KML_LIBS}
|
|
||||||
|
|
||||||
# add kml file i/o
|
|
||||||
SOURCES += FileIO/KmlRideFile.cpp
|
|
||||||
HEADERS += FileIO/KmlRideFile.h
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
###=================
|
###=================
|
||||||
### OPTIONAL => ICAL
|
### OPTIONAL => ICAL
|
||||||
###=================
|
###=================
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ sudo apt-get install -qq qt5-default qt515base qt515tools qt515serialport\
|
|||||||
|
|
||||||
sudo apt-get install -qq libglu1-mesa-dev
|
sudo apt-get install -qq libglu1-mesa-dev
|
||||||
sudo apt-get install -qq libsamplerate0-dev
|
sudo apt-get install -qq libsamplerate0-dev
|
||||||
sudo apt-get install -qq libkml-dev
|
|
||||||
sudo apt-get install -qq libical-dev
|
sudo apt-get install -qq libical-dev
|
||||||
|
|
||||||
# Add VLC 3
|
# Add VLC 3
|
||||||
|
|||||||
@@ -27,8 +27,6 @@ sed -i "s|#\(DEFINES += GC_VIDEO_VLC.*\)|\1|" src/gcconfig.pri
|
|||||||
sed -i "s|#\(DEFINES += GC_WANT_R.*\)|\1|" src/gcconfig.pri
|
sed -i "s|#\(DEFINES += GC_WANT_R.*\)|\1|" src/gcconfig.pri
|
||||||
# Enable CloudDB
|
# Enable CloudDB
|
||||||
sed -i "s|^#CloudDB|CloudDB|" src/gcconfig.pri
|
sed -i "s|^#CloudDB|CloudDB|" src/gcconfig.pri
|
||||||
# LIBKML
|
|
||||||
sed -i "s|#\(KML_INSTALL =\).*|\1 /usr|" src/gcconfig.pri
|
|
||||||
# D2XX
|
# D2XX
|
||||||
sed -i "s|#\(D2XX_INCLUDE =.*\)|\1 ../D2XX/release|" src/gcconfig.pri
|
sed -i "s|#\(D2XX_INCLUDE =.*\)|\1 ../D2XX/release|" src/gcconfig.pri
|
||||||
# SAMPLERATE
|
# SAMPLERATE
|
||||||
|
|||||||
@@ -13,8 +13,6 @@ brew install libical
|
|||||||
brew upgrade libusb
|
brew upgrade libusb
|
||||||
brew install libsamplerate
|
brew install libsamplerate
|
||||||
rm -rf '/usr/local/include/c++'
|
rm -rf '/usr/local/include/c++'
|
||||||
## Disable KML for now
|
|
||||||
## brew install --HEAD travis/libkml.rb
|
|
||||||
sudo chmod -R +w /usr/local
|
sudo chmod -R +w /usr/local
|
||||||
|
|
||||||
# R 4.1.1
|
# R 4.1.1
|
||||||
|
|||||||
@@ -37,9 +37,6 @@ sed -i "" "s|#\(SRMIO_INSTALL =.*\)|\1 /usr/local|" src/gcconfig.pri
|
|||||||
sed -i "" "s|libftd2xx.dylib|@executable_path/../Frameworks/libftd2xx.1.4.24.dylib|" src/FileIO/D2XX.cpp
|
sed -i "" "s|libftd2xx.dylib|@executable_path/../Frameworks/libftd2xx.1.4.24.dylib|" src/FileIO/D2XX.cpp
|
||||||
sed -i "" "s|#\(D2XX_INCLUDE =.*\)|\1 ../D2XX|" src/gcconfig.pri
|
sed -i "" "s|#\(D2XX_INCLUDE =.*\)|\1 ../D2XX|" src/gcconfig.pri
|
||||||
sed -i "" "s|#\(D2XX_LIBS =.*\)|\1 -L../D2XX -lftd2xx|" src/gcconfig.pri
|
sed -i "" "s|#\(D2XX_LIBS =.*\)|\1 -L../D2XX -lftd2xx|" src/gcconfig.pri
|
||||||
## Disable KML for now
|
|
||||||
#sed -i "" "s|#\(KML_INSTALL =\).*|\1 /usr/local|" src/gcconfig.pri
|
|
||||||
#sed -i "" "s|#\(KML_LIBS =.*\)|\1 -L/usr/local/lib -lkmlxsd -lkmlregionator -lkmldom -lkmlconvenience -lkmlengine -lkmlbase -lexpect|" src/gcconfig.pri
|
|
||||||
sed -i "" "s|#\(ICAL_INSTALL =.*\)|\1 /usr/local|" src/gcconfig.pri
|
sed -i "" "s|#\(ICAL_INSTALL =.*\)|\1 /usr/local|" src/gcconfig.pri
|
||||||
sed -i "" "s|#\(ICAL_LIBS =.*\)|\1 -L/usr/local/lib -lical|" src/gcconfig.pri
|
sed -i "" "s|#\(ICAL_LIBS =.*\)|\1 -L/usr/local/lib -lical|" src/gcconfig.pri
|
||||||
sed -i "" "s|#\(LIBUSB_INSTALL =\).*|\1 /usr/local|" src/gcconfig.pri
|
sed -i "" "s|#\(LIBUSB_INSTALL =\).*|\1 /usr/local|" src/gcconfig.pri
|
||||||
|
|||||||
Reference in New Issue
Block a user