From 36720717ccec1b136f958e5352ec4e002887e697 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Thu, 9 Dec 2021 12:24:48 +0100 Subject: Whitespace fix --- CMakeLists.txt | 16 ++++++++-------- tests/CMakeLists.txt | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ddf2049..b98b697 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,12 +82,12 @@ message(STATUS "Unit tests: ${ENABLE_TESTS}") message(STATUS "Build with -Werror: ${ENABLE_WERROR}") if (INTROSPECTION_FOUND) - message(STATUS "Build GObjectIntrospection: YES") - if (VALA_COMPILER) - message(STATUS "Build Vala bindings: YES") - else() - message(STATUS "Build Vala bindings: NO") - endif() + message(STATUS "Build GObjectIntrospection: YES") + if (VALA_COMPILER) + message(STATUS "Build Vala bindings: YES") + else() + message(STATUS "Build Vala bindings: NO") + endif() else() - message(STATUS "Build GObjectIntrospection: NO") -endif() \ No newline at end of file + message(STATUS "Build GObjectIntrospection: NO") +endif() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 002e4db..44ceb0e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -58,11 +58,11 @@ add_custom_command( if (VALA_COMPILER) - add_executable("tst_utils_vala" "${CMAKE_CURRENT_BINARY_DIR}/tst_utils.c") - target_include_directories("tst_utils_vala" PUBLIC "${GLIB_INCLUDE_DIRS};${CMAKE_BINARY_DIR}/src") - target_link_libraries("tst_utils_vala" "${GLIB_LIBRARIES} -layatana-common -L${CMAKE_BINARY_DIR}/src") - target_link_directories("tst_utils_vala" PUBLIC "${CMAKE_BINARY_DIR}/src") - add_dependencies("tst_utils_vala" "src") + add_executable("tst_utils_vala" "${CMAKE_CURRENT_BINARY_DIR}/tst_utils.c") + target_include_directories("tst_utils_vala" PUBLIC "${GLIB_INCLUDE_DIRS};${CMAKE_BINARY_DIR}/src") + target_link_libraries("tst_utils_vala" "${GLIB_LIBRARIES} -layatana-common -L${CMAKE_BINARY_DIR}/src") + target_link_directories("tst_utils_vala" PUBLIC "${CMAKE_BINARY_DIR}/src") + add_dependencies("tst_utils_vala" "src") - add_test(NAME "TstUtilsVala" COMMAND "${CMAKE_CURRENT_BINARY_DIR}/tst_utils_vala" "${CMAKE_CURRENT_BINARY_DIR}") + add_test(NAME "TstUtilsVala" COMMAND "${CMAKE_CURRENT_BINARY_DIR}/tst_utils_vala" "${CMAKE_CURRENT_BINARY_DIR}") endif() -- cgit v1.2.3 From 7ef62fadd1ff0b1c87d5afc98529fcb9fd4743d7 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Thu, 9 Dec 2021 12:40:46 +0100 Subject: src/utils.c: Fix cppcheck warnings --- src/utils.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/src/utils.c b/src/utils.c index d46c604..95aa1ce 100644 --- a/src/utils.c +++ b/src/utils.c @@ -19,7 +19,7 @@ #include -#ifdef HAS_URLDISPATCHER +#ifdef LOMIRI_FEATURES_ENABLED # include #endif @@ -28,13 +28,11 @@ gboolean is_xdg_current_desktop (const gchar* desktop, const gchar* session) { const gchar *xdg_current_desktop; - gchar **desktop_names; - int i; xdg_current_desktop = g_getenv ("XDG_CURRENT_DESKTOP"); if (xdg_current_desktop != NULL) { - desktop_names = g_strsplit (xdg_current_desktop, ":", 0); - for (i = 0; desktop_names[i]; ++i) { + gchar **desktop_names = g_strsplit (xdg_current_desktop, ":", 0); + for (int i = 0; desktop_names[i]; ++i) { if (!g_strcmp0 (desktop_names[i], desktop)) { g_strfreev (desktop_names); return TRUE; @@ -159,17 +157,13 @@ char * find_browser () { static char * browser_path = NULL; - char* tmp_browser_path; - gchar **browser_names; - - int i; if (browser_path == NULL) { - browser_names = g_strsplit ("x-www-browser,google-chrome,firefox,chromium", ",", 0); + gchar **browser_names = g_strsplit ("x-www-browser,google-chrome,firefox,chromium", ",", 0); - for (i = 0; browser_names[i]; ++i) { - tmp_browser_path = g_find_program_in_path (browser_names[i]); + for (int i = 0; browser_names[i]; ++i) { + char* tmp_browser_path = g_find_program_in_path (browser_names[i]); if (tmp_browser_path) { browser_path = g_strdup (tmp_browser_path); @@ -203,11 +197,9 @@ ayatana_common_utils_execute_command (const gchar * cmd) gboolean ayatana_common_utils_open_url (const gchar * url) { - char * browser = NULL; - if (ayatana_common_utils_is_lomiri()) { -#ifdef HAS_URLDISPATCHER +#ifdef LOMIRI_FEATURES_ENABLED lomiri_url_dispatch_send(url, NULL, NULL); return TRUE; #else @@ -215,8 +207,7 @@ ayatana_common_utils_open_url (const gchar * url) #endif } - if (browser == NULL) - browser = find_browser(); + char * browser = find_browser(); if (browser != NULL) return ayatana_common_utils_execute_command(g_strdup_printf("%s '%s'", browser, url)); -- cgit v1.2.3 From a1d1bd53d739bc1b559df880c48da186ccd44800 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Thu, 9 Dec 2021 12:42:35 +0100 Subject: .build.yml: Fix cppcheck warnings --- .build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.build.yml b/.build.yml index 33f2150..a7060fb 100644 --- a/.build.yml +++ b/.build.yml @@ -89,7 +89,7 @@ variables: build_scripts: - if [ ${DISTRO_NAME} == "debian" ];then - export CFLAGS+=" -Wsign-compare -Wunused-parameter" - - cppcheck --enable=warning,style,performance,portability,information,missingInclude . + - cppcheck --enable=warning,style,performance,portability,information --suppress=missingInclude . - fi - - if [ -e ./CMakeLists.txt ]; then -- cgit v1.2.3 From 078be8ba2186cf095a2f4c162665a4a265cab3d6 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Mon, 6 Dec 2021 10:17:08 +0100 Subject: Add ENABLE_LOMIRI_FEATURES switch --- CMakeLists.txt | 22 +++++++++++++++------- src/CMakeLists.txt | 7 +++---- tests/CMakeLists.txt | 7 +++---- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b98b697..dbb9b50 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,7 @@ set(ABI_VERSION 0) option(ENABLE_TESTS "Enable all tests and checks" OFF) option(ENABLE_COVERAGE "Enable coverage reports (includes enabling all tests and checks)" OFF) option(ENABLE_WERROR "Treat all build warnings as errors" OFF) +option(ENABLE_LOMIRI_FEATURES "Build with Lomiri-specific libraries, schemas and media" OFF) if(ENABLE_COVERAGE) set(ENABLE_TESTS ON) @@ -39,17 +40,22 @@ set (CMAKE_INSTALL_FULL_PKGLIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_ find_package (PkgConfig REQUIRED) include (FindPkgConfig) -pkg_check_modules(GLIB REQUIRED +set ( + DEPS glib-2.0>=2.36 gio-2.0>=2.36 ) -include_directories (${GLIB_INCLUDE_DIRS}) -pkg_check_modules( - URLDISPATCHER - lomiri-url-dispatcher>=0 -) -include_directories(${URLDISPATCHER_INCLUDE_DIRS}) +if (ENABLE_LOMIRI_FEATURES) + list ( + APPEND + DEPS + lomiri-url-dispatcher>=0 + ) +endif () + +pkg_check_modules (DEPS REQUIRED ${DEPS}) +include_directories (${DEPS_INCLUDE_DIRS}) # for GIR and Vala bindings find_package (GObjectIntrospection QUIET) @@ -91,3 +97,5 @@ if (INTROSPECTION_FOUND) else() message(STATUS "Build GObjectIntrospection: NO") endif() + +message(STATUS "Build with Lomiri features: ${ENABLE_LOMIRI_FEATURES}") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3e4d529..7ca0f5f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,12 +4,11 @@ add_library(ayatana-common SHARED ) target_link_libraries(ayatana-common - ${GLIB_LIBRARIES} - ${URLDISPATCHER_LIBRARIES} + ${DEPS_LIBRARIES} ) -if(URLDISPATCHER_FOUND) - add_definitions( -DHAS_URLDISPATCHER ) +if(ENABLE_LOMIRI_FEATURES) + add_definitions( -DLOMIRI_FEATURES_ENABLED ) endif() set(PUBLIC_HEADERS diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 44ceb0e..7758e59 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -25,8 +25,7 @@ target_include_directories(tst_utils PUBLIC "${CMAKE_SOURCE_DIR}/src") target_link_libraries(tst_utils ayatana-common - ${GLIB_LIBRARIES} - ${URL_DISPATCHER_LIBRARIES} + ${DEPS_LIBRARIES} ${GTEST_LIBRARIES} ${GTEST_BOTH_LIBRARIES} ${GMOCK_LIBRARIES} @@ -59,8 +58,8 @@ add_custom_command( if (VALA_COMPILER) add_executable("tst_utils_vala" "${CMAKE_CURRENT_BINARY_DIR}/tst_utils.c") - target_include_directories("tst_utils_vala" PUBLIC "${GLIB_INCLUDE_DIRS};${CMAKE_BINARY_DIR}/src") - target_link_libraries("tst_utils_vala" "${GLIB_LIBRARIES} -layatana-common -L${CMAKE_BINARY_DIR}/src") + target_include_directories("tst_utils_vala" PUBLIC "${DEPS_INCLUDE_DIRS};${CMAKE_BINARY_DIR}/src") + target_link_libraries("tst_utils_vala" "${DEPS_LIBRARIES} -layatana-common -L${CMAKE_BINARY_DIR}/src") target_link_directories("tst_utils_vala" PUBLIC "${CMAKE_BINARY_DIR}/src") add_dependencies("tst_utils_vala" "src") -- cgit v1.2.3 From 7c4c023ace4cd1b94c4fb0b6d8a8c060f10df752 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Mon, 6 Dec 2021 10:25:09 +0100 Subject: .build.yml: Add ENABLE_LOMIRI_FEATURES flag and adapt build flow --- .build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.build.yml b/.build.yml index a7060fb..fa6294f 100644 --- a/.build.yml +++ b/.build.yml @@ -93,7 +93,9 @@ build_scripts: - 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_WERROR=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 -DENABLE_WERROR=ON - else - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_WERROR=ON -- cgit v1.2.3