Build improvements (external libs, enable more options).

- Enable build options by default if they don't require external libraries. - Add as many external libraries to Docker and Travis builds as possible.
brndnmtthws · May 13, 2018 · 069b5d4 · 069b5d4
1 parent 8dbb623
commit 069b5d4
Show file tree

Hide file tree

Showing 9 changed files with 210 additions and 69 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,6 +22,22 @@ matrix:
             - libcairo2-dev
             - libimlib2-dev
             - libxinerama-dev
+            - libmysqlclient-dev
+            - libical-dev
+            - libircclient-dev
+            - libcairo2-dev
+            - libmicrohttpd-dev
+            - ncurses-dev
+            - liblua5.1-dev
+            - librsvg2-dev
+            - libaudclient-dev
+            - libxmmsclient-dev
+            - libpulse-dev
+            - libcurl4-gnutls-dev
+            - audacious-dev
+            - libsystemd-journal-dev
+            - libxml2-dev
+            - tolua++
             - gawk
       env:
         - MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
@@ -46,6 +62,22 @@ matrix:
             - libcairo2-dev
             - libimlib2-dev
             - libxinerama-dev
+            - libmysqlclient-dev
+            - libical-dev
+            - libircclient-dev
+            - libcairo2-dev
+            - libmicrohttpd-dev
+            - ncurses-dev
+            - liblua5.1-dev
+            - librsvg2-dev
+            - libaudclient-dev
+            - libxmmsclient-dev
+            - libpulse-dev
+            - libcurl4-gnutls-dev
+            - audacious-dev
+            - libsystemd-journal-dev
+            - libxml2-dev
+            - tolua++
             - gawk
         sonarcloud:
           organization: "brndnmtthws-github"
@@ -57,11 +89,44 @@ before_install:
   - eval "${MATRIX_EVAL}"
 before_script:
   - mkdir build && cd build
-  - cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ..
+  - >
+      cmake
+      -DBUILD_MYSQL=ON
+      -DBUILD_LUA_CAIRO=ON
+      -DBUILD_LUA_IMLIB2=ON
+      -DBUILD_LUA_RSVG=ON
+      -DBUILD_LUA_CAIRO=ON
+      -DBUILD_AUDACIOUS=ON
+      -DBUILD_XMMS2=ON
+      -DBUILD_ICAL=ON
+      -DBUILD_IRC=ON
+      -DBUILD_HTTP=ON
+      -DBUILD_ICONV=ON
+      -DBUILD_PULSEAUDIO=ON
+      -DBUILD_JOURNAL=ON
+      -DBUILD_RSS=ON
+      ..
   - cd ..
   - mkdir build-no-x11
   - cd build-no-x11
-  - cmake -DBUILD_X11=OFF ..
+  - >
+      cmake
+      -DBUILD_X11=OFF
+      -DBUILD_MYSQL=ON
+      -DBUILD_LUA_CAIRO=ON
+      -DBUILD_LUA_IMLIB2=ON
+      -DBUILD_LUA_RSVG=ON
+      -DBUILD_LUA_CAIRO=ON
+      -DBUILD_AUDACIOUS=ON
+      -DBUILD_XMMS2=ON
+      -DBUILD_ICAL=ON
+      -DBUILD_IRC=ON
+      -DBUILD_HTTP=ON
+      -DBUILD_ICONV=ON
+      -DBUILD_PULSEAUDIO=ON
+      -DBUILD_JOURNAL=ON
+      -DBUILD_RSS=ON
+      ..
   - cd ..
 script:
   - cd build

diff --git a/Dockerfile b/Dockerfile
@@ -1,35 +1,98 @@
 FROM ubuntu:latest
 RUN apt-get update \
-  && apt-get install -y \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -qy \
        cmake \
        git \
        g++ \
        libimlib2-dev \
-       liblua5.3-dev \
        libxext-dev \
        libxft-dev \
        libxdamage-dev \
        libxinerama-dev \
-       ncurses-dev
+       libmysqlclient-dev \
+       libical-dev \
+       libircclient-dev \
+       libcairo2-dev \
+       libmicrohttpd-dev \
+       ncurses-dev \
+       liblua5.1-dev \
+       librsvg2-dev \
+       libaudclient-dev \
+       libxmmsclient-dev \
+       libpulse-dev \
+       libcurl4-gnutls-dev \
+       audacious-dev \
+       libsystemd-dev \
+       libxml2-dev \
+       tolua++
 
 COPY . /conky
 WORKDIR /conky/build
 ARG X11=yes
 
-RUN sh -c 'if [ "$X11" = "yes" ] ; then cmake ../ ; else cmake -DBUILD_X11=OFF ../ ; fi' \
+RUN sh -c 'if [ "$X11" = "yes" ] ; then \
+    cmake \
+        -DBUILD_MYSQL=ON \
+        -DBUILD_LUA_CAIRO=ON \
+        -DBUILD_LUA_IMLIB2=ON \
+        -DBUILD_LUA_RSVG=ON \
+        -DBUILD_LUA_CAIRO=ON \
+        -DBUILD_AUDACIOUS=ON \
+        -DBUILD_XMMS2=ON \
+        -DBUILD_ICAL=ON \
+        -DBUILD_IRC=ON \
+        -DBUILD_HTTP=ON \
+        -DBUILD_ICONV=ON \
+        -DBUILD_PULSEAUDIO=ON \
+        -DBUILD_JOURNAL=ON \
+        -DBUILD_RSS=ON \
+        ../ \
+      ; else \
+    cmake \
+        -DBUILD_X11=OFF \
+        -DBUILD_MYSQL=ON \
+        -DBUILD_LUA_CAIRO=ON \
+        -DBUILD_LUA_IMLIB2=ON \
+        -DBUILD_LUA_RSVG=ON \
+        -DBUILD_LUA_CAIRO=ON \
+        -DBUILD_AUDACIOUS=ON \
+        -DBUILD_XMMS2=ON \
+        -DBUILD_ICAL=ON \
+        -DBUILD_IRC=ON \
+        -DBUILD_HTTP=ON \
+        -DBUILD_ICONV=ON \
+        -DBUILD_PULSEAUDIO=ON \
+        -DBUILD_JOURNAL=ON \
+        -DBUILD_RSS=ON \
+        ../ \
+      ; fi' \
   && make -j5 all \
   && make -j5 install \
   && apt-get remove -y \
        cmake \
        git \
        g++ \
        libimlib2-dev \
-       liblua5.3-dev \
        libxext-dev \
        libxft-dev \
        libxdamage-dev \
        libxinerama-dev \
+       libmysqlclient-dev \
+       libical-dev \
+       libircclient-dev \
+       libcairo2-dev \
+       libmicrohttpd-dev \
        ncurses-dev \
+       liblua5.1-dev \
+       librsvg2-dev \
+       audacious-dev \
+       libaudclient-dev \
+       libxmmsclient-dev \
+       libpulse-dev \
+       libcurl4-gnutls-dev \
+       libsystemd-dev \
+       libxml2-dev \
+       tolua++ \
   && rm -rf /var/lib/apt/lists/* \
   && rm -rf /conky \
 

diff --git a/cmake/ConkyBuildOptions.cmake b/cmake/ConkyBuildOptions.cmake
@@ -43,6 +43,8 @@ if(MAINTAINER_MODE)
 	set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -Wall -W -Wextra -Wunused -pedantic -Werror -Wno-format ${CMAKE_CXX_FLAGS_DEBUG}" CACHE STRING "Flags used by the compiler during debug builds." FORCE)
 endif(MAINTAINER_MODE)
 
+option(CHECK_CODE_QUALITY "Check code formatting/quality with clang" false)
+
 option(RELEASE "Build release package" false)
 mark_as_advanced(RELEASE)
 
@@ -146,14 +148,14 @@ option(BUILD_MOC "Enable if you want MOC (music player) support" true)
 
 option(BUILD_XMMS2 "Enable if you want XMMS2 (music player) support" false)
 
-option(BUILD_EVE "Enable if you want Eve-Online skill monitoring support" false)
+option(BUILD_EVE "Enable if you want Eve-Online skill monitoring support" true)
 
 option(BUILD_CURL "Enable if you want Curl support" false)
 
 option(BUILD_RSS "Enable if you want RSS support" false)
 
-option(BUILD_WEATHER_METAR "Enable METAR weather support" false)
-option(BUILD_WEATHER_XOAP "Enable XOAP weather support" false)
+option(BUILD_WEATHER_METAR "Enable METAR weather support" true)
+option(BUILD_WEATHER_XOAP "Enable XOAP weather support" true)
 if(BUILD_WEATHER_METAR OR BUILD_WEATHER_XOAP OR BUILD_RSS)
 	set(BUILD_CURL true)
 endif(BUILD_WEATHER_METAR OR BUILD_WEATHER_XOAP OR BUILD_RSS)
@@ -174,10 +176,8 @@ endif(BUILD_HTTP)
 
 option(BUILD_ICONV "Enable iconv support" false)
 
-option(BUILD_CMUS "Enable support for cmus music player" false)
+option(BUILD_CMUS "Enable support for cmus music player" true)
 
 option(BUILD_JOURNAL "Enable support for reading from the systemd journal" false)
 
 option(BUILD_PULSEAUDIO "Enable support for Pulseaudio's default sink and source" false)
-
-option(CHECK_CODE_QUALITY "Check code formatting/quality with clang" false)
diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake
@@ -422,7 +422,7 @@ if(BUILD_IMLIB2)
 endif(BUILD_IMLIB2)
 
 if(BUILD_JOURNAL)
-  pkg_search_module(SYSTEMD REQUIRED libsystemd)
+  pkg_search_module(SYSTEMD REQUIRED libsystemd libsystemd-journal)
   set(conky_libs ${conky_libs} ${SYSTEMD_LIB} ${SYSTEMD_LDFLAGS})
   set(conky_includes ${conky_includes} ${SYSTEMD_INCLUDE_PATH})
 endif(BUILD_JOURNAL)

diff --git a/src/ccurl_thread.h b/src/ccurl_thread.h
@@ -27,11 +27,13 @@
 
 #include <curl/curl.h>
 
+#include "logging.h"
 #include "update-cb.hh"
 
 namespace priv {
 // factored out stuff that does not depend on the template parameters
-struct curl_internal {
+class curl_internal {
+ public:
   std::string last_modified;
   std::string etag;
   std::string data;
@@ -47,7 +49,7 @@ struct curl_internal {
   // it should populate the result variable
   virtual void process_data() = 0;
 
-  curl_internal(const std::string &url);
+  explicit curl_internal(const std::string &url);
   virtual ~curl_internal() {
     if (curl) curl_easy_cleanup(curl);
   }
@@ -60,7 +62,7 @@ struct curl_internal {
  */
 template <typename Result, typename... Keys>
 class curl_callback : public conky::callback<Result, std::string, Keys...>,
-                      protected priv::curl_internal {
+                      public priv::curl_internal {
   typedef conky::callback<Result, std::string, Keys...> Base1;
   typedef priv::curl_internal Base2;