aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Tari <robert@tari.in>2021-11-26 09:24:50 +0100
committerRobert Tari <robert@tari.in>2021-12-03 12:26:20 +0100
commit22268331b662758c85847826fe7e94d9a000aa70 (patch)
treefd81509cf38cea799e8f45da4a93f519b1fdf8c8
parent5544dd0e3ad817cbe8f433068ee4da32319b10cb (diff)
downloadayatana-indicator-datetime-22268331b662758c85847826fe7e94d9a000aa70.tar.gz
ayatana-indicator-datetime-22268331b662758c85847826fe7e94d9a000aa70.tar.bz2
ayatana-indicator-datetime-22268331b662758c85847826fe7e94d9a000aa70.zip
.build.yml: Add ENABLE_LOMIRI_FEATURES flag and adapt build flow
-rw-r--r--.build.yml48
-rw-r--r--CMakeLists.txt2
2 files changed, 34 insertions, 16 deletions
diff --git a/.build.yml b/.build.yml
index 6f85e29..73a0815 100644
--- a/.build.yml
+++ b/.build.yml
@@ -28,6 +28,7 @@ requires:
- gtk-doc-tools
- libaccountsservice
# - lomiri-schemas
+# - lomiri-sounds
debian:
# Useful URL: https://salsa.debian.org/debian-ayatana-team/ayatana-ido
@@ -56,6 +57,8 @@ requires:
- gtk-doc-tools
- libaccountsservice-dev
- liblomiri-url-dispatcher-dev
+# - lomiri-schemas
+# - lomiri-sounds
# for the test harness:
- libgtest-dev
- libdbustest1-dev
@@ -69,7 +72,6 @@ requires:
- systemd
- lcov
- gcovr
-# - lomiri-schemas
ubuntu:
- clang
@@ -85,6 +87,8 @@ requires:
- gobject-introspection
- libgirepository1.0-dev
- liblomiri-url-dispatcher-dev
+# - lomiri-schemas
+# - lomiri-sounds
- valac
- libglib2.0-dev
- libnotify-dev
@@ -109,7 +113,6 @@ requires:
- systemd
- lcov
- gcovr
-# - lomiri-schemas
ubuntu:focal:
- clang
@@ -125,6 +128,8 @@ requires:
- gobject-introspection
- libgirepository1.0-dev
# - liblomiri-url-dispatcher-dev
+# - lomiri-schemas
+# - lomiri-sounds
- valac
- libglib2.0-dev
- libnotify-dev
@@ -149,7 +154,6 @@ requires:
- systemd
- lcov
- gcovr
-# - lomiri-schemas
variables:
- 'CHECKERS="
@@ -192,25 +196,41 @@ before_scripts:
- cd -
- rm -Rf ayatana-indicator-messages-build/
-
- - cd ${START_DIR}
- - if [ ! -d lomiri-schemas-build ]; then
- - git clone --depth 1 https://gitlab.com/ubports/core/lomiri-schemas.git lomiri-schemas-build
+ - if [ ${DISTRO_NAME} == "debian" ];then
+ - cd ${START_DIR}
+ - if [ ! -d lomiri-schemas-build ]; then
+ - git clone --depth 1 https://gitlab.com/ubports/core/lomiri-schemas.git lomiri-schemas-build
+ - fi
+ - cd lomiri-schemas-build
+ - cmake . -DCMAKE_INSTALL_PREFIX=/usr
+ - make
+ - make install
+ - cd -
+ - rm -Rf lomiri-schemas-build/
+ -
+ - cd ${START_DIR}
+ - if [ ! -d lomiri-sounds-build ]; then
+ - git clone --depth 1 https://gitlab.com/ubports/core/lomiri-sounds.git lomiri-sounds-build
+ - fi
+ - cd lomiri-sounds-build
+ - cmake . -DCMAKE_INSTALL_PREFIX=/usr
+ - make
+ - make install
+ - cd -
+ - rm -Rf lomiri-sounds-build/
- fi
- - cd lomiri-schemas-build
- - cmake . -DCMAKE_INSTALL_PREFIX=/usr
- - make
- - make install
- - cd -
- - rm -Rf lomiri-schemas-build/
build_scripts:
- if [ ${DISTRO_NAME} == "debian" ];then
- export CFLAGS+=" -Wsign-compare -Wunused-parameter"
- - cppcheck --enable=warning,style,performance,portability,information,missingInclude .
+# FIXME: uninitMemberVar can perhaps be fixed in the source and dropped here
+ - cppcheck --enable=warning,style,performance,portability,information --suppress=uninitMemberVar --suppress=missingInclude .
- fi
-
- if [ -e ./CMakeLists.txt ]; then
- - if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ]; then
+ - if [ ${DISTRO_NAME} == "debian" ]; then
+ - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON -DENABLE_LOMIRI_FEATURES=ON
+ - elif [ ${DISTRO_NAME} == "ubuntu" ]; then
- scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON
- else
- scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b2bff3..8bb9042 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,8 +73,6 @@ if (ENABLE_LOMIRI_FEATURES)
APPEND
SERVICE_DEPS
lomiri-url-dispatcher>=0
- lomiri-sounds
- lomiri-schemas
)
add_definitions (