Merge e98b0ce3bb into 3e8699ab24

.travis.yml

@@ -0,0 +1,12 @@
+language: cpp
+compiler:
+ - gcc
+ - clang
+env:
+  - CONFIG=minimal
+  - CONFIG=full    ; SSL=openssl
+  - CONFIG=full    ; SSL=gnutls
+install:
+  - autotest/travis/install-build-depends.sh
+script:
+  - autotest/travis/build-and-test.sh

CMakeLists.txt

@@ -75,7 +75,7 @@ set (adcclient_SOURCES
 add_library(adc       STATIC ${adc_SOURCES})
 add_library(network   STATIC ${network_SOURCES})
 add_library(utils     STATIC ${utils_SOURCES})
-if(CMAKE_COMPILER_IS_GNUCC)
+if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
 	set_target_properties(utils PROPERTIES COMPILE_FLAGS -fPIC)
 	set_target_properties(network PROPERTIES COMPILE_FLAGS -fPIC)
 endif()

autotest/travis/build-and-test.sh

@@ -0,0 +1,45 @@
+#!/bin/sh
+
+set -x
+
+export CFLAGS="$(dpkg-buildflags --get CFLAGS) $(dpkg-buildflags --get CPPFLAGS)"
+export LDFLAGS="$(dpkg-buildflags --get LDFLAGS) -Wl,--as-needed"
+
+mkdir -p builddir
+cd builddir
+
+CMAKEOPTS="..
+           -DCMAKE_INSTALL_PREFIX=/usr"
+
+if [ "${CONFIG}" = "full" ]; then
+    CMAKEOPTS="${CMAKEOPTS}
+               -DRELEASE=OFF
+               -DLOWLEVEL_DEBUG=ON
+               -DSSL_SUPPORT=ON
+               -DADC_STRESS=ON"
+else
+    CMAKEOPTS="${CMAKEOPTS}
+               -DRELEASE=ON
+               -DLOWLEVEL_DEBUG=OFF
+               -DSSL_SUPPORT=OFF
+               -DADC_STRESS=OFF"
+fi
+
+if [ "${SSL}" = "openssl" ]; then
+    CMAKEOPTS="${CMAKEOPTS}
+               -DUSE_OPENSSL=ON"
+elif [ "${SSL}" = "gnutls" ]; then
+    CMAKEOPTS="${CMAKEOPTS}
+               -DUSE_OPENSSL=OFF"
+fi
+
+
+cmake ${CMAKEOPTS} \
+      -DCMAKE_C_FLAGS="${CFLAGS}" \
+      -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}"
+make VERBOSE=1
+
+
+sudo make install
+du -shc /etc/uhub/ /usr/bin/uhub* /usr/lib/uhub/
+

autotest/travis/install-build-depends.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+sudo apt-get update -qq
+
+sudo apt-get install -qq cmake
+
+if [ "${CONFIG}" = "full" ]; then
+    sudo apt-get install -qq libsqlite3-dev
+fi
+
+if [ "${SSL}" = "openssl" ]; then
+    sudo apt-get install -qq libssl-dev
+elif [ "${SSL}" = "gnutls" ]; then
+    sudo apt-get install -qq libgnutls-dev
+fi