Merge branch 'develop'

Author: plfiorini

.travis.yml

@@ -1,4 +1,4 @@
-language: c
+language: cpp
 
 compiler:
   - clang
@@ -26,13 +26,13 @@ script:
 
 deploy:
   - provider: script
-    script: .travis/deploy.sh build/default/qtudev-artifacts.tar.gz
+    script: .travis/deploy.sh build/artifacts/qtudev-artifacts.tar.gz
     skip_cleanup: true
     on:
       branch: master
       condition: "$CC = gcc) && ($TRAVIS_PULL_REQUEST = false"
   - provider: script
-    script: .travis/deploy.sh build/default/qtudev-artifacts.tar.gz
+    script: .travis/deploy.sh build/artifacts/qtudev-artifacts.tar.gz
     skip_cleanup: true
     on:
       branch: develop

.travis/build.sh

@@ -7,33 +7,52 @@ source /usr/local/share/liri-travis/functions
 # Install dependencies
 travis_start "install_packages"
 msg "Install packages..."
-sudo apt-get install -y \
-     libumockdev-dev
+dnf install -y \
+    systemd-devel \
+    umockdev-devel
 travis_end "install_packages"
 
 # Install artifacts
 travis_start "artifacts"
 msg "Install artifacts..."
-/usr/local/bin/liri-download-artifacts $TRAVIS_BRANCH qbs-shared-artifacts.tar.gz
+/usr/local/bin/liri-download-artifacts $TRAVIS_BRANCH cmakeshared-artifacts.tar.gz
 travis_end "artifacts"
 
-# Configure qbs
-travis_start "qbs_setup"
-msg "Setup qbs..."
-qbs setup-toolchains --detect
-qbs setup-qt $(which qmake) travis-qt5
-qbs config profiles.travis-qt5.baseProfile $CC
-travis_end "qbs_setup"
+# Configure
+travis_start "configure"
+msg "Setup CMake..."
+mkdir build
+cd build
+cmake .. \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DINSTALL_LIBDIR=/usr/lib64 \
+    -DINSTALL_QMLDIR=/usr/lib64/qt5/qml \
+    -DINSTALL_PLUGINSDIR=/usr/lib64/qt5/plugins
+travis_end "configure"
 
 # Build
 travis_start "build"
 msg "Build..."
-dbus-run-session -- \
-xvfb-run -a -s "-screen 0 800x600x24" \
-qbs -d build -j $(nproc) --all-products profile:travis-qt5 \
-    modules.lirideployment.prefix:/usr \
-    modules.lirideployment.libDir:/usr/lib/x86_64-linux-gnu \
-    modules.lirideployment.qmlDir:/usr/lib/x86_64-linux-gnu/qt5/qml \
-    modules.lirideployment.pluginsDir:/usr/lib/x86_64-linux-gnu/qt5/plugins \
-    project.autotestEnabled:false
+make -j $(nproc)
 travis_end "build"
+
+# Install
+travis_start "install"
+msg "Install..."
+make install
+travis_end "install"
+
+# Test
+#travis_start "test"
+#msg "Test..."
+#dbus-run-session -- \
+#    xvfb-run -a -s "-screen 0 800x600x24" \
+#    ctest -V
+#travis_end "test"
+
+# Package
+travis_start "package"
+msg "Package..."
+mkdir -p artifacts
+tar czf artifacts/qtudev-artifacts.tar.gz -T install_manifest.txt
+travis_end "package"

CMakeLists.txt

@@ -0,0 +1,37 @@
+cmake_minimum_required(VERSION 3.10.0)
+
+project("QtUdev"
+    VERSION "1.1.0"
+    DESCRIPTION "Qt style API to use udev"
+    LANGUAGES CXX C
+)
+
+## Shared macros and functions:
+if(NOT LIRI_LOCAL_ECM)
+    find_package(LiriCMakeShared "1.0.0" REQUIRED NO_MODULE)
+    list(APPEND CMAKE_MODULE_PATH "${LCS_MODULE_PATH}")
+endif()
+
+## Set minimum versions required:
+set(QT_MIN_VERSION "5.8.0")
+
+## Add some paths to check for CMake modules:
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+
+## Liri specific setup common for all modules:
+include(LiriSetup)
+
+## Find Qt 5:
+find_package(Qt5 "${QT_MIN_VERSION}"
+    CONFIG REQUIRED
+    COMPONENTS
+        Core
+)
+
+## Add subdirectories:
+add_subdirectory(src/udev)
+if(BUILD_TESTING)
+    if(TARGET Qt5Udev)
+        add_subdirectory(tests/auto/udev)
+    endif()
+endif()

README.md

@@ -5,7 +5,6 @@ Qt Udev
 [![GitHub release](https://img.shields.io/github/release/lirios/qtudev.svg)](https://github.com/lirios/qtudev)
 [![Build Status](https://travis-ci.org/lirios/qtudev.svg?branch=master)](https://travis-ci.org/lirios/qtudev)
 [![GitHub issues](https://img.shields.io/github/issues/lirios/qtudev.svg)](https://github.com/lirios/qtudev/issues)
-[![Maintained](https://img.shields.io/maintenance/yes/2018.svg)](https://github.com/lirios/qtudev/commits/master)
 
 Qt-style API to use udev.
 
@@ -17,8 +16,8 @@ Qt >= 5.8.0 with at least the following modules is required:
 
 And the following modules:
 
- * [qbs](http://code.qt.io/cgit/qbs/qbs.git) >= 1.9.0
- * [qbs-shared](https://github.com/lirios/qbs-shared.git) >= 1.2.0
+ * [cmake](https://gitlab.kitware.com/cmake/cmake) >= 3.10.0
+ * [cmake-shared](https://github.com/lirios/cmake-shared.git) >= 1.0.0
 
 The following modules and their dependencies are required:
 
@@ -30,42 +29,16 @@ For autotests you need:
 
 ## Installation
 
-Qbs is a new build system that is much easier to use compared to qmake or CMake.
-
-If you want to learn more, please read the [Qbs manual](http://doc.qt.io/qbs/index.html),
-especially the [setup guide](http://doc.qt.io/qbs/configuring.html) and how to install artifacts
-from the [installation guide](http://doc.qt.io/qbs/installing-files.html).
-
-From the root of the repository, run:
-
 ```sh
-qbs setup-toolchains --type gcc /usr/bin/g++ gcc
-qbs setup-qt /usr/bin/qmake-qt5 qt5
-qbs config profiles.qt5.baseProfile gcc
+mkdir build
+cd build
+cmake -DCMAKE_INSTALL_PREFIX=/path/to/prefix ..
+make
+make install # use sudo if necessary
 ```
 
-Then, from the root of the repository, run:
-
-```sh
-qbs -d build -j $(nproc) profile:qt5 # use sudo if necessary
-```
-
-To the `qbs` call above you can append additional configuration parameters:
-
- * `modules.lirideployment.prefix:/path/to/prefix` where most files are installed (default: `/usr/local`)
- * `modules.lirideployment.dataDir:path/to/lib` where data files are installed (default: `/usr/local/share`)
- * `modules.lirideployment.libDir:path/to/lib` where libraries are installed (default: `/usr/local/lib`)
- * `modules.lirideployment.qmlDir:path/to/qml` where QML plugins are installed (default: `/usr/local/lib/qml`)
- * `modules.lirideployment.pluginsDir:path/to/plugins` where Qt plugins are installed (default: `/usr/local/lib/plugins`)
- * `modules.lirideployment.qbsModulesDir:path/to/qbs` where Qbs modules are installed (default: `/usr/local/share/qbs/modules`)
-
-See [lirideployment.qbs](https://github.com/lirios/qbs-shared/blob/develop/modules/lirideployment/lirideployment.qbs)
-for more deployment-related parameters.
-
-You can also specify the following options:
-
- * `projects.QtUDev.useStaticAnalyzer:true` to enable the Clang static analyzer
- * `projects.QtUDev.autotestEnabled:true` to build and run unit tests
+Replace `/path/to/prefix` to your installation prefix.
+Default is `/usr/local`.
 
 ### Logging categories
 

cmake/FindLibudev.cmake

@@ -0,0 +1,3 @@
+find_package(PkgConfig)
+
+pkg_check_modules(Libudev libudev REQUIRED IMPORTED_TARGET)

cmake/FindUmockdev.cmake

@@ -0,0 +1,3 @@
+find_package(PkgConfig)
+
+pkg_check_modules(Umockdev umockdev-1.0 REQUIRED IMPORTED_TARGET)

src/udev/CMakeLists.txt

@@ -0,0 +1,43 @@
+find_package(Libudev REQUIRED)
+
+liri_add_module(Qt5Udev
+    DESCRIPTION
+        "Qt style API for udev"
+    MODULE_NAME
+        Qt5Udev
+    VERSIONED_MODULE_NAME
+        Qt5Udev
+    SOURCES
+        udev.cpp
+        udevdevice.cpp
+        udevdevice.h
+        udevdevice_p.h
+        udevenumerate.cpp
+        udevenumerate.h
+        udevenumerate_p.h
+        udev.h
+        udevmonitor.cpp
+        udevmonitor.h
+        udevmonitor_p.h
+        udev_p.h
+    FORWARDING_HEADERS
+        Udev
+        UdevDevice
+        UdevEnumerate
+        UdevMonitor
+    PRIVATE_HEADERS
+        udevdevice_p.h
+        udevenumerate_p.h
+        udevmonitor_p.h
+        udev_p.h
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_FOREACH
+    PUBLIC_LIBRARIES
+        Qt5::Core
+    LIBRARIES
+        PkgConfig::Libudev
+    PKGCONFIG_DEPENDENCIES
+        Qt5Core
+        libudev
+)

src/udev/udev.h

@@ -26,14 +26,14 @@
 
 #include <QtCore/QString>
 
-#include <Qt5Udev/qtudevglobal.h>
+#include <Qt5Udev/qt5udevglobal.h>
 
 namespace QtUdev {
 
 class UdevDevice;
 class UdevPrivate;
 
-class QTUDEV_EXPORT Udev
+class QT5UDEV_EXPORT Udev
 {
     Q_DECLARE_PRIVATE(Udev)
 public:

src/udev/udev_p.h

@@ -37,7 +37,7 @@
 
 #include <QLoggingCategory>
 
-#include <Qt5Udev/qtudevglobal.h>
+#include <Qt5Udev/qt5udevglobal.h>
 
 extern "C" {
 #include <libudev.h>
@@ -49,7 +49,7 @@ namespace QtUdev {
 
 class Udev;
 
-class QTUDEV_EXPORT UdevPrivate
+class QT5UDEV_EXPORT UdevPrivate
 {
 public:
     UdevPrivate();

src/udev/udevdevice.h

@@ -26,7 +26,7 @@
 
 #include <QtCore/QObject>
 
-#include <Qt5Udev/qtudevglobal.h>
+#include <Qt5Udev/qt5udevglobal.h>
 
 struct udev_device;
 
@@ -37,7 +37,7 @@ class UdevEnumerate;
 class UdevDevicePrivate;
 class UdevMonitorPrivate;
 
-class QTUDEV_EXPORT UdevDevice
+class QT5UDEV_EXPORT UdevDevice
 {
     Q_DECLARE_PRIVATE(UdevDevice)
 public:

src/udev/udevenumerate.h

@@ -30,7 +30,7 @@ namespace QtUdev {
 
 class UdevEnumeratePrivate;
 
-class QTUDEV_EXPORT UdevEnumerate
+class QT5UDEV_EXPORT UdevEnumerate
 {
     Q_DECLARE_PRIVATE(UdevEnumerate)
 public:

src/udev/udevmonitor.h

@@ -26,15 +26,15 @@
 
 #include <QtCore/QObject>
 
-#include <Qt5Udev/qtudevglobal.h>
+#include <Qt5Udev/qt5udevglobal.h>
 
 namespace QtUdev {
 
 class Udev;
 class UdevDevice;
 class UdevMonitorPrivate;
 
-class QTUDEV_EXPORT UdevMonitor : public QObject
+class QT5UDEV_EXPORT UdevMonitor : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(UdevMonitor)

tests/auto/udev/CMakeLists.txt

@@ -0,0 +1,11 @@
+find_package(Umockdev REQUIRED)
+
+liri_add_test(tst_qtudev
+    SOURCES
+        tst_udev.cpp
+    DEFINES
+        QT_NO_KEYWORDS
+    LIBRARIES
+        Liri::Qt5Udev
+        PkgConfig::Umockdev
+)