Merge branch 'master' into fix-app-icon-lookup

# Conflicts:
#	src/core/appdir.cpp
#	tests/core/CMakeLists.txt
#	tests/core/test_appdir.cpp
#	tests/core/test_linuxdeploy.cpp

Author: KitsuneRal

.github/workflows/main.yml

@@ -1,6 +1,12 @@
 name: CI
 
-on: [push, pull_request]
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+  schedule:
+    # build at least once a month
+    - cron: '0 0 1 * *'
 
 jobs:
   build-and-test:
@@ -26,17 +32,22 @@ jobs:
         if: matrix.ARCH == 'x86_64'
         run: |
           sudo apt-get update
-          sudo apt-get install -y libmagic-dev libjpeg-dev libpng-dev cimg-dev
+          sudo apt-get install -y gcovr libmagic-dev libjpeg-dev libpng-dev cimg-dev
 
       - name: Install dependencies (i386)
         if: matrix.ARCH == 'i386'
         run: |
           sudo dpkg --add-architecture i386
           sudo apt-get update
-          sudo apt-get install -y libmagic-dev:i386 libjpeg-dev:i386 libpng-dev:i386 cimg-dev gcc-multilib g++-multilib libfuse2:i386
+          sudo apt-get install -y gcovr libmagic-dev:i386 libjpeg-dev:i386 libpng-dev:i386 cimg-dev gcc-multilib g++-multilib libfuse2:i386
 
-      - name: Build and test
+      - name: Test coverage
+        run: bash -ex ci/test-coverage.sh
+        if: matrix.BUILD_TYPE == 'coverage'
+
+      - name: Build, test and build AppImage
         run: bash -ex ci/build.sh
+        if: matrix.BUILD_TYPE != 'coverage'
 
       - name: Archive artifacts
         uses: actions/upload-artifact@v2

.gitmodules

@@ -1,81 +1,12 @@
 [submodule "lib/args"]
 	path = lib/args
 	url = https://github.com/Taywee/args.git
-[submodule "lib/boost-filesystem"]
-	path = lib/boost-filesystem
-	url = https://github.com/boostorg/filesystem.git
-[submodule "lib/boost-regex"]
-	path = lib/boost-regex
-	url = https://github.com/boostorg/regex.git
-[submodule "lib/boost-system"]
-	path = lib/boost-system
-	url = https://github.com/boostorg/system.git
-[submodule "lib/boost-config"]
-	path = lib/boost-config
-	url = https://github.com/boostorg/config.git
-[submodule "lib/boost-utility"]
-	path = lib/boost-utility
-	url = https://github.com/boostorg/utility.git
-[submodule "lib/boost-predef"]
-	path = lib/boost-predef
-	url = https://github.com/boostorg/predef.git
-[submodule "lib/boost-assert"]
-	path = lib/boost-assert
-	url = https://github.com/boostorg/assert.git
-[submodule "lib/boost-core"]
-	path = lib/boost-core
-	url = https://github.com/boostorg/core.git
-[submodule "lib/boost-type_traits"]
-	path = lib/boost-type_traits
-	url = https://github.com/boostorg/type_traits.git
-[submodule "lib/boost-iterator"]
-	path = lib/boost-iterator
-	url = https://github.com/boostorg/iterator.git
-[submodule "lib/boost-mpl"]
-	path = lib/boost-mpl
-	url = https://github.com/boostorg/mpl.git
-[submodule "lib/boost-preprocessor"]
-	path = lib/boost-preprocessor
-	url = https://github.com/boostorg/preprocessor.git
-[submodule "lib/boost-static_assert"]
-	path = lib/boost-static_assert
-	url = https://github.com/boostorg/static_assert.git
-[submodule "lib/boost-detail"]
-	path = lib/boost-detail
-	url = https://github.com/boostorg/detail.git
-[submodule "lib/boost-smart_ptr"]
-	path = lib/boost-smart_ptr
-	url = https://github.com/boostorg/smart_ptr.git
 [submodule "lib/boost-exception"]
 	path = lib/boost-exception
 	url = https://github.com/boostorg/exception.git
-[submodule "lib/boost-throw_exception"]
-	path = lib/boost-throw_exception
-	url = https://github.com/boostorg/throw_exception.git
-[submodule "lib/boost-io"]
-	path = lib/boost-io
-	url = https://github.com/boostorg/io.git
-[submodule "lib/boost-functional"]
-	path = lib/boost-functional
-	url = https://github.com/boostorg/functional.git
-[submodule "lib/boost-container_hash"]
-	path = lib/boost-container_hash
-	url = https://github.com/boostorg/container_hash.git
-[submodule "lib/boost-range"]
-	path = lib/boost-range
-	url = https://github.com/boostorg/range.git
-[submodule "lib/boost-integer"]
-	path = lib/boost-integer
-	url = https://github.com/boostorg/integer.git
-[submodule "lib/CImg"]
-	path = lib/CImg
-	url = https://github.com/dtschump/CImg.git
-[submodule "lib/googletest"]
-	path = lib/googletest
-	url = https://github.com/google/googletest
-[submodule "lib/boost-container"]
-	path = lib/boost-container
-	url = https://github.com/boostorg/container
 [submodule "lib/linuxdeploy-desktopfile"]
 	path = lib/linuxdeploy-desktopfile
 	url = https://github.com/linuxdeploy/linuxdeploy-desktopfile
+[submodule "lib/cmake-scripts"]
+	path = lib/cmake-scripts
+	url = https://github.com/linuxdeploy/cmake-scripts.git

CMakeLists.txt

@@ -1,14 +1,15 @@
+include(FetchContent)
+
 cmake_minimum_required(VERSION 3.2)
 
 project(linuxdeploy C CXX)
 
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/Modules/")
 
-set(USE_SYSTEM_BOOST OFF CACHE BOOL "Set to ON to use system boost libraries instead of building up to date boost libraries from source")
-set(USE_SYSTEM_CIMG ON CACHE BOOL "Set to OFF to use CImg library bundled in lib directory")
+find_program(PATCHELF patchelf REQUIRED)
 
 # support for ccache
 # call CMake with -DUSE_CCACHE=ON to make use of it
@@ -43,11 +44,17 @@ if(ENABLE_COVERAGE)
     setup_target_for_coverage_gcovr_text(NAME coverage_text EXECUTABLE "${command}")
 endif()
 
+include(CTest)
+
+if(BUILD_TESTING)
+    # including this before including lib/ makes sure that the top level project's gtest is used everywhere
+    include(${PROJECT_SOURCE_DIR}/lib/cmake-scripts/include-or-build-gtest.cmake)
+endif()
+
 add_subdirectory(lib)
 
 add_subdirectory(src)
 
-include(CTest)
 if(BUILD_TESTING)
     enable_testing()
     add_subdirectory(tests)

README.md

@@ -64,8 +64,8 @@ linuxdeploy does not change any environment variables such as `$PATH`. Your appl
 
 ## Contact
 
-The easiest way to get in touch with the developers is to join the IRC chatroom [#AppImage](https://webchat.freenode.net/?channels=appimage) on FreeNode. This is the preferred way for general feedback or questions how to use this application.
+The easiest way to get in touch with the developers is to join the IRC chatroom [#AppImage](https://web.libera.chat/#appimage) on [https://libera.chat](Libera.Chat). This is the preferred way for general feedback or questions how to use this application.
 
-To report problems, please [create an issue](https://github.com/TheAssassin/linuxdeploy/issues/new) on GitHub.
+To report problems, please [create an issue](https://github.com/linuxdeploy/linuxdeploy/issues/new) on GitHub.
 
 Contributions welcome! Please feel free to fork this repository and send us a pull request. Even small changes, e.g., in this README, are highly appreciated!

ci/build-static-patchelf.sh

@@ -47,7 +47,7 @@ pushd "$BUILD_DIR"
 git clone https://github.com/NixOS/patchelf.git .
 
 # cannot use -b since it's not supported in really old versions of git
-git checkout 0.8
+git checkout 0.15.0
 
 # prepare configure script
 ./bootstrap.sh

ci/build.sh

@@ -46,9 +46,6 @@ cmake "$REPO_ROOT" -DSTATIC_BUILD=On -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_T
 
 make -j"$(nproc)"
 
-## Run Unit Tests
-ctest -V
-
 # build patchelf
 "$REPO_ROOT"/ci/build-static-patchelf.sh "$(readlink -f out/)"
 patchelf_path="$(readlink -f out/usr/bin/patchelf)"
@@ -57,9 +54,12 @@ patchelf_path="$(readlink -f out/usr/bin/patchelf)"
 "$REPO_ROOT"/ci/build-static-binutils.sh "$(readlink -f out/)"
 strip_path="$(readlink -f out/usr/bin/strip)"
 
-# use tools we just built for linuxdeploy run
+# use tools we just built for linuxdeploy test run
 export PATH="$(readlink -f out/usr/bin):$PATH"
 
+## Run Unit Tests
+ctest -V
+
 # args are used more than once
 LINUXDEPLOY_ARGS=("--appdir" "AppDir" "-e" "bin/linuxdeploy" "-i" "$REPO_ROOT/resources/linuxdeploy.png" "-d" "$REPO_ROOT/resources/linuxdeploy.desktop" "-e" "$patchelf_path" "-e" "$strip_path")
 
@@ -69,7 +69,7 @@ bin/linuxdeploy "${LINUXDEPLOY_ARGS[@]}"
 # bundle AppImage plugin
 mkdir -p AppDir/plugins
 
-wget https://github.com/TheAssassin/linuxdeploy-plugin-appimage/releases/download/continuous/linuxdeploy-plugin-appimage-"$ARCH".AppImage
+wget https://github.com/linuxdeploy/linuxdeploy-plugin-appimage/releases/download/continuous/linuxdeploy-plugin-appimage-"$ARCH".AppImage
 chmod +x linuxdeploy-plugin-appimage-"$ARCH".AppImage
 ./linuxdeploy-plugin-appimage-"$ARCH".AppImage --appimage-extract
 mv squashfs-root/ AppDir/plugins/linuxdeploy-plugin-appimage

cmake/Modules/FindCImg.cmake

@@ -1,64 +1,97 @@
-# required for PNG imported target
-cmake_minimum_required(VERSION 3.6)
+#[=======================================================================[.rst:
+FindCImg
+-------
 
-find_package(PkgConfig)
-pkg_check_modules(libpng REQUIRED IMPORTED_TARGET libpng)
+Finds the CImg library.
 
-# build custom static version of libjpeg for static builds
-if(STATIC_BUILD)
-    include(ExternalProject)
+Imported Targets
+^^^^^^^^^^^^^^^^
 
-    if($ENV{ARCH} MATCHES "i[356]86")
-        set(configure_command_prefix env CFLAGS=-m32 CXXFLAGS=-m32)
-    endif()
+This module provides the following imported targets, if found:
 
-    ExternalProject_Add(libjpeg_static_extproj
-        URL https://www.ijg.org/files/jpegsrc.v9d.tar.gz
-        URL_HASH SHA256=6c434a3be59f8f62425b2e3c077e785c9ce30ee5874ea1c270e843f273ba71ee
-        BUILD_IN_SOURCE ON
-        EXCLUDE_FROM_ALL ON
-        CONFIGURE_COMMAND ${configure_command_prefix} ./configure --prefix=/usr
-        INSTALL_COMMAND ""
-    )
-
-    ExternalProject_Get_property(libjpeg_static_extproj SOURCE_DIR)
-    add_library(libjpeg_static INTERFACE IMPORTED)
-    set_property(TARGET libjpeg_static PROPERTY INTERFACE_LINK_LIBRARIES ${SOURCE_DIR}/.libs/libjpeg.a)
-    add_dependencies(libjpeg_static libjpeg_static_extproj)
-
-    set(JPEG_LIBRARIES libjpeg_static)
-else()
-    find_package(JPEG REQUIRED)
-endif()
+``CImg``
+  The CImg library
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This will define the following variables:
+
+``CImg_FOUND``
+  True if the system has the CImg library.
+``CImg_VERSION``
+  The version of the CImg library which was found.
+``CImg_INCLUDE_DIRS``
+  Include directories needed to use CImg.
+``CImg_LIBRARIES``
+  Libraries needed to link to CImg.
+
+Cache Variables
+^^^^^^^^^^^^^^^
+
+The following cache variables may also be set:
+
+``CImg_INCLUDE_DIR``
+  The directory containing ``CImg.h``.
+
+#]=======================================================================]
 
-if(NOT USE_SYSTEM_CIMG)
-    message(STATUS "Using bundled CImg library")
+# 3.6 required for PNG imported target
+# 3.9 required for CMAKE_MATCH_<n>
+cmake_minimum_required(VERSION 3.9)
 
-    set(CIMG_H_DIR "${PROJECT_SOURCE_DIR}/lib/CImg/")
+find_path(CIMG_H_DIR
+    NAMES CImg.h
+    HINTS ${CMAKE_INSTALL_PREFIX} ${CIMG_DIR}
+    PATH_SUFFIXES include include/linux
+)
+
+if(NOT CIMG_H_DIR)
+    set(CImg_FOUND FALSE)
 else()
-    message(STATUS "Searching for CImg")
+    set(CImg_FOUND TRUE)
+
+    find_package(PkgConfig)
+
+    pkg_check_modules(libpng REQUIRED libpng)
+    pkg_check_modules(libjpeg REQUIRED libjpeg)
 
-    find_path(CIMG_H_DIR
-        NAMES CImg.h
-        HINTS ${CMAKE_INSTALL_PREFIX}
-        PATH_SUFFIXES include include/linux
-    )
+    set(PNG_INCLUDE_DIR ${libpng_INCLUDE_DIRS})
+    set(JPEG_INCLUDE_DIR ${libjpeg_INCLUDE_DIRS})
 
-    if(NOT CIMG_H_DIR)
-        message(FATAL_ERROR "CImg.h not found")
+    if(STATIC_BUILD)
+        set(PNG_LIBRARY ${libpng_STATIC_LIBRARIES})
+        set(JPEG_LIBRARIES ${libjpeg_STATIC_LIBRARIES})
+    else()
+        set(PNG_LIBRARY ${libpng_LIBRARIES})
+        set(JPEG_LIBRARIES ${libjpeg_LIBRARIES})
     endif()
-endif()
 
-set(PNG_INCLUDE_DIR ${libpng_INCLUDE_DIRS})
-if(NOT STATIC_BUILD)
-    set(PNG_LIBRARY ${libpng_LIBRARIES})
-else()
-    set(PNG_LIBRARY ${libpng_STATIC_LIBRARIES})
-endif()
+    set(CImg_INCLUDE_DIR ${CIMG_H_DIR} CACHE STRING "")
+    set(CImg_INCLUDE_DIRS ${CImg_INCLUDE_DIR})
+    set(CImg_LIBRARIES "${PNG_LIBRARY};${JPEG_LIBRARIES}")
+    set(CImg_DEFINITIONS "cimg_display=0;cimg_use_png=1;cimg_use_jpeg=1")
+
+    file(READ "${CIMG_H_DIR}/CImg.h" header)
+    string(REGEX MATCH "#define cimg_version ([0-9a-zA-Z\.]+)" _ "${header}")
+    set(CImg_VERSION "${CMAKE_MATCH_1}")
+
+    # CImg_VERSION
 
-#message(FATAL_ERROR "${PNG_LIBRARY}")
+    if(NOT TARGET CImg)
+        add_library(CImg INTERFACE)
+        set_property(TARGET CImg PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CIMG_H_DIR};${PNG_INCLUDE_DIR};${JPEG_INCLUDE_DIR}")
+        set_property(TARGET CImg PROPERTY INTERFACE_LINK_LIBRARIES "${CImg_LIBRARIES}")
+        set_property(TARGET CImg PROPERTY INTERFACE_COMPILE_DEFINITIONS "${CImg_DEFINITIONS}")
+    endif()
+endif()
 
-add_library(CImg INTERFACE)
-set_property(TARGET CImg PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CIMG_H_DIR};${PNG_INCLUDE_DIR};${JPEG_INCLUDE_DIR}")
-set_property(TARGET CImg PROPERTY INTERFACE_LINK_LIBRARIES "${PNG_LIBRARY};${JPEG_LIBRARIES}")
-set_property(TARGET CImg PROPERTY INTERFACE_COMPILE_DEFINITIONS "cimg_display=0;cimg_use_png=1;cimg_use_jpeg=1")
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(CImg
+  FOUND_VAR CImg_FOUND
+  REQUIRED_VARS
+    CImg_INCLUDE_DIRS
+    CImg_LIBRARIES
+    CImg_DEFINITIONS
+  VERSION_VAR CImg_VERSION
+)