Make custom AppRun files executable

This eliminates the need for users to make the files executable
before running linuxdeploy.

.gitmodules

@@ -76,24 +76,9 @@
 [submodule "lib/googletest"]
 	path = lib/googletest
 	url = https://github.com/google/googletest
-[submodule "lib/boost-lexical_cast"]
-	path = lib/boost-lexical_cast
-	url = https://github.com/boostorg/lexical_cast
-[submodule "lib/boost-concept_check"]
-	path = lib/boost-concept_check
-	url = https://github.com/boostorg/concept_check
-[submodule "lib/boost-numeric_conversion"]
-	path = lib/boost-numeric_conversion
-	url = https://github.com/boostorg/numeric_conversion
-[submodule "lib/boost-array"]
-	path = lib/boost-array
-	url = https://github.com/boostorg/array
 [submodule "lib/boost-container"]
 	path = lib/boost-container
 	url = https://github.com/boostorg/container
-[submodule "lib/boost-move"]
-	path = lib/boost-move
-	url = https://github.com/boostorg/move
-[submodule "lib/boost-math"]
-	path = lib/boost-math
-	url = https://github.com/boostorg/math
+[submodule "lib/linuxdeploy-desktopfile"]
+	path = lib/linuxdeploy-desktopfile
+	url = https://github.com/linuxdeploy/linuxdeploy-desktopfile

.travis.yml

@@ -55,7 +55,14 @@ matrix:
         - sudo pip install gcovr
       script: travis/test-coverage.sh
       after_success: true  # also, we don't intend to upload release binaries
-
+    - env: ARCH=x86_64 BUILD_TYPE=centos6
+      services:
+        - docker
+      script: travis/build-centos6-docker.sh
+      after_success:
+        - if [ "$TRAVIS_BRANCH" != "$TRAVIS_TAG" ] && [ "$TRAVIS_BRANCH" != "master" ]; then export TRAVIS_EVENT_TYPE=pull_request; fi
+        - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
+        - bash upload.sh linuxdeploy-centos6-"$ARCH".AppImage*
 
 install:
   - git clone https://github.com/NixOS/patchelf.git -b 0.8

CMakeLists.txt

@@ -10,6 +10,11 @@ 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")
 
+if (EXISTS "${PROJECT_SOURCE_DIR}/lib/cpp-subprocess/subprocess.hpp")
+else()
+  message (FATAL_ERROR "Missing submodule(s), please 'git submodule update --init --recursive'...")
+endif()
+
 # support for ccache
 # call CMake with -DUSE_CCACHE=ON to make use of it
 set(USE_CCACHE ON CACHE BOOL "")

README.md

@@ -14,58 +14,20 @@ linuxdeploy is designed to be an AppDir maintenance tool. It provides extensive
 linuxdeploy was greatly influenced by [linuxdeployqt](https://github.com/probonopd/linuxdeployqt), and while it employs stricter rules on AppDirs, it's more flexible in use. If you use linuxdeployqt at the moment, consider switching to linuxdeploy today!
 
 
-## Usage
+## User guides and examples
 
-linuxdeploy, being a tool for creating AppDirs and eventually AppImages, is released as an AppImage itself. Please download and use the AppImage for normal use. If you encounter errors, e.g., when building the tool from source, please try with the AppImage first before [creating an issue](https://github.com/TheAssassin/linuxdeploy/issues/new).
+Please see the [linuxdeploy user guide](https://docs.appimage.org/packaging-guide/linuxdeploy-user-guide.html) and the [native binaries packaging guide](https://docs.appimage.org/packaging-guide/native-binaries.html) in the [AppImage documentation](https://docs.appimage.org). There's also an [examples section](https://docs.appimage.org/packaging-guide/native-binaries.html#examples).
 
-There are two main ways to use linuxdeploy: Provide the paths to all files you want to bundle manually, or create an FHS-like directory and run linuxdeploy on it.
 
-Most build systems provide some kind of `make install` functionality that is capable of producing FHS-like directory trees that can be turned into AppDirs:
+## Projects using linuxdeploy
 
-```sh
-# automake
-./configure --prefix=/usr
-make install DESTDIR=AppDir
+This is an incomplete list of projects using linuxdeploy. You might want to read their build scripts to see how they use linuxdeploy.
 
-# cmake
-mkdir build && cd build
-cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
-make install DESTDIR=AppDir
-
-# qmake
-qmake CONFIG+=release PREFIX=/usr .
-make install INSTALL_ROOT=AppDir
-```
-
-Now, simply run linuxdeploy like `./linuxdeploy*.AppImage --appdir AppDir`.
-
-Please use `./linuxdeploy*.AppImage --help` to get a list of options supported by linuxdeploy.
-
-If your build system cannot produce such install trees or you prefer to bundle everything manually, you can also specify the paths to the resources yourself. linuxdeploy provides the following options for this use case:
-
-```
--l[library...],
---lib=[library...],
---library=[library...]            Shared library to deploy
--e[executable...],
---executable=[executable...]      Executable to deploy
--d[desktop file...],
---desktop-file=[desktop file...]  Desktop file to deploy
-                                  enough for some tests
--i[icon file...],
---icon-file=[icon file...]        Icon to deploy
-```
-
-An example run could look like this:
-
-```bash
-./linuxdeploy*.AppImage --appdir AppDir -e myapp -d myapp.desktop -i myapp_64x64.png
-```
-
-Of course both approaches can be combined, e.g., you can bundle additional executables with your main app.
-
-linuxdeploy doesn't mind being run on an AppDir more than once, as it recognize previous runs, and should not break files within the AppDir. This is called an "iterative workflow". In case of errors, you can simply fix them, and re-run linuxdeploy afterwards.
-If you ever encounter issues when running linuxdeploy on an existing AppDir, please let us know by [creating an issue](https://github.com/TheAssassin/linuxdeploy/issues/new).
+- [Pext](https://github.com/Pext/Pext)
+- [AppImageLauncher](https://github.com/TheAssassin/AppImageLauncher)
+- [OpenRCT2](https://github.com/OpenRCT2/OpenRCT2)
+- [AppImageUpdate](https://github.com/AppImage/AppImageUpdate)
+- [appimaged](https://github.com/AppImage/appimaged)
 
 
 ## Plugins
@@ -86,25 +48,11 @@ linuxdeploy currently ships with some plugins. These are likely out of date. In
 
 If you want to use a plugin to bundle additional resources, please add `./linuxdeploy*.AppImage --plugin <name>` to your linuxdeploy command. Output plugins can be activated using `./linuxdeploy*.AppImage --output <name>`.
 
+**A list of official and community plugins can be found in the [awesome-linuxdeploy](http://github.com/linuxdeploy/awesome-linuxdeploy) project.**
+
 **Note:** If you want to suggest a plugin for a specific framework, language etc., please feel free to [create a new issue](https://github.com/linuxdeploy/linuxdeploy/issues/new). Current plugin requests can be found [here](https://github.com/linuxdeploy/linuxdeploy/issues?utf8=%E2%9C%93&q=label%3A%22plugin+request%22).
 
 
-## User guides and examples
-
-Please see the [linuxdeploy user guide](https://docs.appimage.org/packaging-guide/linuxdeploy-user-guide.html) and the [native binaries packaging guide](https://docs.appimage.org/packaging-guide/native-binaries.html) in the [AppImage documentation](https://docs.appimage.org). There's also an [examples section](https://docs.appimage.org/packaging-guide/native-binaries.html#examples).
-
-
-## Projects using linuxdeploy
-
-This is an incomplete list of projects using linuxdeploy. You might want to read their build scripts to see how they use linuxdeploy.
-
-- [Pext](https://github.com/Pext/Pext)
-- [AppImageLauncher](https://github.com/TheAssassin/AppImageLauncher)
-- [OpenRCT2](https://github.com/OpenRCT2/OpenRCT2)
-- [AppImageUpdate](https://github.com/AppImage/AppImageUpdate)
-- [appimaged](https://github.com/AppImage/appimaged)
-
-
 ## Troubleshooting
 
 > I bundled additional resources, but when I try to run them, either the system binary is called or the file is not found.

cmake/Modules/CodeCoverage.cmake

@@ -218,8 +218,11 @@ function(SETUP_TARGET_FOR_COVERAGE_GCOVR_XML)
     endforeach()
 
     add_custom_target(${Coverage_NAME}
+        # Clean old coverage data
+        COMMAND find ${PROJECT_BINARY_DIR} -type f -iname '*.gcno' -delete
+
         # Run tests
-        ${Coverage_EXECUTABLE} ${Coverage_EXECUTABLE_ARGS}
+        COMMAND ${Coverage_EXECUTABLE} ${Coverage_EXECUTABLE_ARGS}
 
         # Running gcovr
         COMMAND ${GCOVR_PATH} --xml
@@ -272,8 +275,11 @@ function(SETUP_TARGET_FOR_COVERAGE_GCOVR_HTML)
     endforeach()
 
     add_custom_target(${Coverage_NAME}
+        # Clean old coverage data
+        COMMAND find ${PROJECT_BINARY_DIR} -type f -iname '*.gcno' -delete
+
         # Run tests
-        ${Coverage_EXECUTABLE} ${Coverage_EXECUTABLE_ARGS}
+        COMMAND ${Coverage_EXECUTABLE} ${Coverage_EXECUTABLE_ARGS}
 
         # Create folder
         COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/${Coverage_NAME}
@@ -329,8 +335,11 @@ function(SETUP_TARGET_FOR_COVERAGE_GCOVR_TEXT)
     endforeach()
 
     add_custom_target(${Coverage_NAME}
+        # Clean old coverage data
+        COMMAND find ${PROJECT_BINARY_DIR} -type f -iname '*.gcno' -delete
+
         # Run tests
-        ${Coverage_EXECUTABLE} ${Coverage_EXECUTABLE_ARGS}
+        COMMAND ${Coverage_EXECUTABLE} ${Coverage_EXECUTABLE_ARGS}
 
         # Create folder
         COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/${Coverage_NAME}

include/linuxdeploy/core/appdir.h

@@ -1,11 +1,12 @@
 // system includes
+#include <memory>
 #include <string>
 
 // library includes
 #include <boost/filesystem.hpp>
 
 // local includes
-#include "linuxdeploy/core/desktopfile/desktopfile.h"
+#include "linuxdeploy/desktopfile/desktopfile.h"
 
 #pragma once
 
@@ -19,7 +20,7 @@ namespace linuxdeploy {
                 private:
                     // private data class pattern
                     class PrivateData;
-                    PrivateData* d;
+                    std::shared_ptr<PrivateData> d;
 
                 public:
                     // default constructor
@@ -27,7 +28,11 @@ namespace linuxdeploy {
                     // the directory will be created if it doesn't exist
                     explicit AppDir(const boost::filesystem::path& path);
 
-                    ~AppDir();
+                    // we don't want any copy/move(-assignment) behavior, therefore we delete those operators/constructors
+                    AppDir(const AppDir&) = delete;
+                    AppDir(AppDir&&) = delete;
+                    void operator=(const AppDir&) = delete;
+                    void operator=(AppDir&&) = delete;
 
                     // alternative constructor
                     // shortcut for using a normal string instead of a path
@@ -59,7 +64,7 @@ namespace linuxdeploy {
                     bool deployIcon(const boost::filesystem::path& path);
 
                     // deploy arbitrary file
-                    void deployFile(const boost::filesystem::path& from, const boost::filesystem::path& to);
+                    boost::filesystem::path deployFile(const boost::filesystem::path& from, const boost::filesystem::path& to);
 
                     // create an <AppDir> relative symlink to <target> at <symlink>.
                     bool createRelativeSymlink(const boost::filesystem::path& target, const boost::filesystem::path& symlink);
@@ -96,7 +101,7 @@ namespace linuxdeploy {
                     bool deployDependenciesForExistingFiles();
 
                     // disable deployment of copyright files for this instance
-                    bool setDisableCopyrightFilesDeployment(bool disable);
+                    void setDisableCopyrightFilesDeployment(bool disable);
             };
         }
     }

include/linuxdeploy/core/desktopfile/desktopfile.h

@@ -1,132 +0,0 @@
-// system includes
-#include <unordered_map>
-
-// library includes
-#include <boost/filesystem.hpp>
-
-// local includes
-#include "desktopfileentry.h"
-
-#pragma once
-
-namespace linuxdeploy {
-    namespace core {
-        namespace desktopfile {
-            /*
-             * Parse and read desktop files.
-             */
-            class DesktopFile {
-            public:
-                // describes a single section
-                typedef std::unordered_map<std::string, DesktopFileEntry> section_t;
-
-                // describes all sections in the desktop file
-                typedef std::unordered_map<std::string, section_t> sections_t;
-
-            private:
-                    // private data class pattern
-                    class PrivateData;
-                    std::shared_ptr<PrivateData> d;
-
-                public:
-                    // default constructor
-                    DesktopFile();
-
-                    // construct from existing desktop file
-                    // if the file exists, it will be read using DesktopFileReader
-                    // if reading fails, exceptions will be thrown (see DesktopFileReader for more information)
-                    explicit DesktopFile(const boost::filesystem::path& path);
-
-                    // construct by reading an existing stream
-                    // file must exist, otherwise std::runtime_error is thrown
-                    explicit DesktopFile(std::istream& is);
-
-                    // copy constructor
-                    DesktopFile(const DesktopFile& other);
-
-                    // copy assignment constructor
-                    DesktopFile& operator=(const DesktopFile& other);
-
-                    // move assignment operator
-                    DesktopFile& operator=(DesktopFile&& other) noexcept;
-
-                    // equality operator
-                    bool operator==(const DesktopFile& other);
-
-                    // inequality operator
-                    bool operator!=(const DesktopFile& other);
-
-            public:
-                    // returns true if a file has been loaded, false otherwise
-                    bool isEmpty() const;
-
-                    // read desktop file
-                    // sets path associated with this file
-                    // throws exceptions in case of issues, see DesktopFileReader for more information
-                    void read(const boost::filesystem::path& path);
-
-                    // read desktop file from existing stream
-                    // throws exceptions in case of issues, see DesktopFileReader for more information
-                    void read(std::istream& is);
-
-                    // get path associated with this file
-                    boost::filesystem::path path() const;
-
-                    // sets the path associated with this desktop file
-                    // used to e.g., save the desktop file
-                    void setPath(const boost::filesystem::path& path);
-
-                    // clear contents of desktop file
-                    void clear();
-
-                    // save desktop file
-                    bool save() const;
-
-                    // save desktop file to path
-                    // does not change path associated with desktop file
-                    // throws exceptions in case of errors, see DesktopFileWriter::save(...) for more information
-                    bool save(const boost::filesystem::path& path) const;
-
-                    // save desktop file to ostream
-                    // does not change path associated with desktop file
-                    // throws exceptions in case of errors, see DesktopFileWriter::save(...) for more information
-                    bool save(std::ostream& os) const;
-
-                    // check if entry exists in given section and key
-                    bool entryExists(const std::string& section, const std::string& key) const;
-
-                    // get key from desktop file
-                    // an std::string passed as value parameter will be populated with the contents
-                    // returns true (and populates value) if the key exists, false otherwise
-                    bool getEntry(const std::string& section, const std::string& key, std::string& value) const;
-
-                    // get key from desktop file
-                    // an std::string passed as value parameter will be populated with the contents
-                    // returns true (and populates value) if the key exists, false otherwise
-                    bool getEntry(const std::string& section, const std::string& key, DesktopFileEntry& value) const;
-
-                    // add key to section in desktop file
-                    // the section will be created if it doesn't exist already
-                    // returns true if an existing key was overwritten, false otherwise
-                    bool setEntry(const std::string& section, const std::string& key, const std::string& value);
-
-                    // add key to section in desktop file
-                    // the section will be created if it doesn't exist already
-                    // returns true if an existing key was overwritten, false otherwise
-                    bool setEntry(const std::string& section, const DesktopFileEntry& entry);
-
-                    // add key to section in desktop file
-                    // the section will be created if it doesn't exist already
-                    // returns true if an existing key was overwritten, false otherwise
-                    bool setEntry(const std::string& section, const DesktopFileEntry&& entry);
-
-                    // create common application entries in desktop file
-                    // returns false if one of the keys exists and was left unmodified
-                    bool addDefaultKeys(const std::string& executableFileName);
-
-                    // validate desktop file
-                    bool validate() const;
-            };
-        }
-    }
-}

include/linuxdeploy/core/desktopfile/desktopfileentry.h

@@ -1,75 +0,0 @@
-#pragma once
-
-// system headers
-#include <memory>
-#include <string>
-
-// library headers
-#include <boost/lexical_cast.hpp>
-
-namespace linuxdeploy {
-    namespace core {
-        namespace desktopfile {
-            class DesktopFileEntry {
-            private:
-                // opaque data class pattern
-                class PrivateData;
-
-                std::shared_ptr<PrivateData> d;
-
-            public:
-                // default constructor
-                DesktopFileEntry();
-
-                // construct from key and value
-                explicit DesktopFileEntry(std::string key, std::string value);
-
-                // copy constructor
-                DesktopFileEntry(const DesktopFileEntry& other);
-
-                // copy assignment constructor
-                DesktopFileEntry& operator=(const DesktopFileEntry& other);
-
-                // move assignment operator
-                DesktopFileEntry& operator=(DesktopFileEntry&& other) noexcept;
-
-                // equality operator
-                bool operator==(const DesktopFileEntry& other) const;
-
-                // inequality operator
-                bool operator!=(const DesktopFileEntry& other) const;
-
-            public:
-                // checks whether a key and value have been set
-                bool isEmpty() const;
-
-                // return entry's key
-                const std::string& key() const;
-
-                // return entry's value
-                const std::string& value() const;
-
-            public:
-                // allow conversion of entry to string
-                // returns value
-                explicit operator std::string() const;
-
-                // convert value to integer
-                // throws boost::bad_lexical_cast in case of type errors
-                int asInt() const;
-
-                // convert value to long
-                // throws boost::bad_lexical_cast in case of type errors
-                long asLong() const;
-
-                // convert value to double
-                // throws boost::bad_lexical_cast in case of type errors
-                double asDouble() const;
-
-                // split CSV list value into vector
-                // the separator used to split the string is a semicolon as per desktop file spec
-                std::vector<std::string> parseStringList() const;
-            };
-        }
-    }
-}

include/linuxdeploy/plugin/base_impl.h

@@ -11,6 +11,7 @@
 
 // local headers
 #include "linuxdeploy/core/log.h"
+#include "linuxdeploy/util/util.h"
 
 #pragma once
 
@@ -48,10 +49,16 @@ namespace linuxdeploy {
                         auto output = subprocess::check_output({pluginPath.c_str(), "--plugin-api-version"});
                         std::string stdoutOutput = output.buf.data();
 
+                        // only interpret last line (fixes issues with --appimage-extract-and-run, where the runtime
+                        // prints all the paths it extracts out to stdout)
+                        const auto& lines = util::splitLines(stdoutOutput);
+                        const auto& lastLine = lines.back();
+
                         try {
-                            auto apiLevel = std::stoi(stdoutOutput);
-                            return apiLevel;
+                            const auto pluginApiLevel = std::stoi(lastLine);
+                            return pluginApiLevel;
                         } catch (const std::invalid_argument&) {
+                            ldLog() << LD_DEBUG << "Failed to understand plugin response:" << lastLine << std::endl;
                             return -1;
                         }
                     }
@@ -87,7 +94,12 @@ namespace linuxdeploy {
 
                 if (d->apiLevel != API_LEVEL) {
                     std::stringstream msg;
-                    msg << "This class only supports API level " << API_LEVEL << ", not " << d->apiLevel;
+                    if (d->apiLevel < 0) {
+                        msg << "Could not read plugin API level";
+                    } else {
+                        msg << "This class only supports API level " << API_LEVEL << ", not " << d->apiLevel;
+                    }
+
                     throw WrongApiLevelError(msg.str());
                 }
             }

lib/CMakeLists.txt

@@ -9,77 +9,31 @@ add_library(args INTERFACE)
 target_sources(args INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/args/args.hxx)
 target_include_directories(args INTERFACE args)
 
+add_subdirectory(linuxdeploy-desktopfile)
+
+function(ld_add_boost_headeronly_lib)
+    set(options "")
+    set(oneValueArgs TARGET_NAME ROOT_DIR)
+    set(multiValueArgs LINK_LIBRARIES)
+    cmake_parse_arguments(A "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+#    message(STATUS "Adding boost header-only library ${A_TARGET_NAME} in directory ${A_ROOT_DIR} with dependencies to ${A_LINK_LIBRARIES}")
+    add_library(${A_TARGET_NAME} INTERFACE)
+    set_property(TARGET ${A_TARGET_NAME} PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${A_ROOT_DIR}/include>")
+    set_property(TARGET ${A_TARGET_NAME} PROPERTY INTERFACE_LINK_LIBRARIES ${A_LINK_LIBRARIES})
+endfunction()
+
+
 if(NOT USE_SYSTEM_BOOST)
-    add_library(boost_config INTERFACE)
-    set_property(TARGET boost_config PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/boost-config/include>")
+    ld_add_boost_headeronly_lib(TARGET_NAME boost_config ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/boost-config)
 
-    add_library(boost_utility INTERFACE)
-    set_property(TARGET boost_utility PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/boost-utility/include>")
-    set_property(TARGET boost_utility PROPERTY INTERFACE_LINK_LIBRARIES "boost_config")
+    ld_add_boost_headeronly_lib(TARGET_NAME boost_throw_exception ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/boost-throw_exception LINK_LIBRARIES boost_throw_exception)
 
-    add_library(boost_predef INTERFACE)
-    set_property(TARGET boost_predef PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/boost-predef/include>")
-    set_property(TARGET boost_predef PROPERTY INTERFACE_LINK_LIBRARIES "boost_config")
+    foreach(boost_lib_name utility predef assert core type_traits iterator mpl preprocessor static_assert detail smart_ptr exception io container_hash range integer)
+        ld_add_boost_headeronly_lib(TARGET_NAME boost_${boost_lib_name} ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/boost-${boost_lib_name} LINK_LIBRARIES boost_config;boost_throw_exception)
+    endforeach()
 
-    add_library(boost_assert INTERFACE)
-    set_property(TARGET boost_assert PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/boost-assert/include>")
-    set_property(TARGET boost_assert PROPERTY INTERFACE_LINK_LIBRARIES "boost_config")
-
-    add_library(boost_core INTERFACE)
-    set_property(TARGET boost_core PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/boost-core/include>")
-    set_property(TARGET boost_core PROPERTY INTERFACE_LINK_LIBRARIES "boost_config")
-
-    add_library(boost_type_traits INTERFACE)
-    set_property(TARGET boost_type_traits PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/boost-type_traits/include>")
-    set_property(TARGET boost_type_traits PROPERTY INTERFACE_LINK_LIBRARIES "boost_config")
-
-    add_library(boost_iterator INTERFACE)
-    set_property(TARGET boost_iterator PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/boost-iterator/include>")
-    set_property(TARGET boost_iterator PROPERTY INTERFACE_LINK_LIBRARIES "boost_config")
-
-    add_library(boost_mpl INTERFACE)
-    set_property(TARGET boost_mpl PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/boost-mpl/include>")
-    set_property(TARGET boost_mpl PROPERTY INTERFACE_LINK_LIBRARIES "boost_config")
-
-    add_library(boost_preprocessor INTERFACE)
-    set_property(TARGET boost_preprocessor PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/boost-preprocessor/include>")
-    set_property(TARGET boost_preprocessor PROPERTY INTERFACE_LINK_LIBRARIES "boost_config")
-
-    add_library(boost_static_assert INTERFACE)
-    set_property(TARGET boost_static_assert PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/boost-static_assert/include>")
-    set_property(TARGET boost_static_assert PROPERTY INTERFACE_LINK_LIBRARIES "boost_config")
-
-    add_library(boost_detail INTERFACE)
-    set_property(TARGET boost_detail PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/boost-detail/include>")
-    set_property(TARGET boost_detail PROPERTY INTERFACE_LINK_LIBRARIES "boost_config")
-
-    add_library(boost_smart_ptr INTERFACE)
-    set_property(TARGET boost_smart_ptr PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/boost-smart_ptr/include>")
-    set_property(TARGET boost_smart_ptr PROPERTY INTERFACE_LINK_LIBRARIES "boost_config")
-
-    add_library(boost_throw_exception INTERFACE)
-    set_property(TARGET boost_throw_exception PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/boost-throw_exception/include>")
-    set_property(TARGET boost_throw_exception PROPERTY INTERFACE_LINK_LIBRARIES "boost_config")
-
-    add_library(boost_io INTERFACE)
-    set_property(TARGET boost_io PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/boost-io/include>")
-    set_property(TARGET boost_io PROPERTY INTERFACE_LINK_LIBRARIES "boost_config")
-
-    add_library(boost_container_hash INTERFACE)
-    set_property(TARGET boost_container_hash PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/boost-container_hash/include>")
-    set_property(TARGET boost_container_hash PROPERTY INTERFACE_LINK_LIBRARIES "boost_config")
-
-    add_library(boost_functional INTERFACE)
-    set_property(TARGET boost_functional PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/boost-functional/include>")
-    set_property(TARGET boost_functional PROPERTY INTERFACE_LINK_LIBRARIES "boost_config;boost_container_hash")
-
-    add_library(boost_range INTERFACE)
-    set_property(TARGET boost_range PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/boost-range/include>")
-    set_property(TARGET boost_range PROPERTY INTERFACE_LINK_LIBRARIES "boost_config")
-
-    add_library(boost_integer INTERFACE)
-    set_property(TARGET boost_integer PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/boost-integer/include>")
-    set_property(TARGET boost_integer PROPERTY INTERFACE_LINK_LIBRARIES "boost_config")
+    ld_add_boost_headeronly_lib(TARGET_NAME boost_functional ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/boost-utility LINK_LIBRARIES boost_config;boost_container_hash)
 
     file(GLOB boost_system_srcs ${CMAKE_CURRENT_SOURCE_DIR}/boost-system/src/*.cpp)
     add_library(boost_system STATIC ${boost_system_srcs})
@@ -92,7 +46,7 @@ if(NOT USE_SYSTEM_BOOST)
     file(GLOB boost_filesystem_srcs ${CMAKE_CURRENT_SOURCE_DIR}/boost-filesystem/src/*.cpp)
     add_library(boost_filesystem STATIC ${boost_filesystem_srcs})
     target_include_directories(boost_filesystem PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/boost-filesystem/include)
-    target_link_libraries(boost_filesystem PUBLIC boost_config boost_utility boost_system)
+    target_link_libraries(boost_filesystem PUBLIC boost_config boost_utility boost_system boost_throw_exception)
 
     file(GLOB boost_regex_srcs ${CMAKE_CURRENT_SOURCE_DIR}/boost-regex/src/*.cpp)
     add_library(boost_regex STATIC ${boost_regex_srcs})
@@ -101,38 +55,8 @@ if(NOT USE_SYSTEM_BOOST)
         boost_config boost_predef boost_assert boost_throw_exception boost_smart_ptr boost_core boost_mpl
         boost_type_traits boost_static_assert boost_integer boost_preprocessor boost_functional boost_detail
     )
-
-    add_library(boost_numeric_conversion INTERFACE)
-    set_property(TARGET boost_numeric_conversion PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/boost-numeric_conversion/include>")
-    set_property(TARGET boost_numeric_conversion PROPERTY INTERFACE_LINK_LIBRARIES "boost_config")
-
-    add_library(boost_concept_check INTERFACE)
-    set_property(TARGET boost_concept_check PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/boost-concept_check/include>")
-    set_property(TARGET boost_concept_check PROPERTY INTERFACE_LINK_LIBRARIES "boost_config")
-    target_link_libraries(boost_concept_check INTERFACE boost_numeric_conversion)
-
-    add_library(boost_array INTERFACE)
-    set_property(TARGET boost_array PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/boost-array/include>")
-    set_property(TARGET boost_array PROPERTY INTERFACE_LINK_LIBRARIES "boost_config")
-
-    add_library(boost_move INTERFACE)
-    set_property(TARGET boost_move PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/boost-move/include>")
-    set_property(TARGET boost_move PROPERTY INTERFACE_LINK_LIBRARIES "boost_config")
-
-    add_library(boost_container INTERFACE)
-    set_property(TARGET boost_container PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/boost-container/include>")
-    set_property(TARGET boost_container PROPERTY INTERFACE_LINK_LIBRARIES boost_config boost_move)
-
-    add_library(boost_math INTERFACE)
-    set_property(TARGET boost_math PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/boost-math/include>")
-    set_property(TARGET boost_math PROPERTY INTERFACE_LINK_LIBRARIES boost_config boost_move)
-
-    add_library(boost_lexical_cast INTERFACE)
-    set_property(TARGET boost_lexical_cast PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/boost-lexical_cast/include>")
-    set_property(TARGET boost_lexical_cast PROPERTY INTERFACE_LINK_LIBRARIES "boost_config")
-    target_link_libraries(boost_lexical_cast INTERFACE boost_concept_check boost_numeric_conversion boost_array boost_container boost_math)
 endif()
 
-if(BUILD_TESTING)
+if(BUILD_TESTING AND NOT TARGET gtest)
     add_subdirectory(googletest)
 endif()

resources/linuxdeploy.desktop

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=linuxdeploy
+Type=Application
+Terminal=true
+NoDisplay=true
+Exec=linuxdeploy
+Icon=linuxdeploy
+Categories=Development;

src/CMakeLists.txt

@@ -10,7 +10,7 @@ if(USE_SYSTEM_BOOST)
     set(BOOST_LIBS Boost::filesystem Boost::regex)
 else()
     # use custom built libs
-    set(BOOST_LIBS boost_system boost_filesystem boost_regex boost_lexical_cast)
+    set(BOOST_LIBS boost_system boost_filesystem boost_regex)
 endif()
 
 

src/core.cpp

@@ -8,6 +8,7 @@
 
 using namespace linuxdeploy::core;
 using namespace linuxdeploy::core::log;
+using namespace linuxdeploy::desktopfile;
 namespace bf = boost::filesystem;
 
 namespace linuxdeploy {
@@ -32,14 +33,13 @@ namespace linuxdeploy {
             return deployedDesktopFiles[0];
         }
 
-        auto firstDeployedDesktopFileName = boost::filesystem::path(
-            desktopFilePaths.front()).filename().string();
+        auto firstDeployedDesktopFileName = boost::filesystem::path(desktopFilePaths.front()).filename().string();
 
         auto desktopFileMatchingName = find_if(
             deployedDesktopFiles.begin(),
             deployedDesktopFiles.end(),
             [&firstDeployedDesktopFileName](const desktopfile::DesktopFile& desktopFile) {
-                auto fileName = desktopFile.path().filename().string();
+                auto fileName = bf::path(desktopFile.path()).filename().string();
                 return fileName == firstDeployedDesktopFileName;
             }
         );
@@ -85,4 +85,34 @@ namespace linuxdeploy {
             return false;
         }
     }
+
+    bool addDefaultKeys(DesktopFile& desktopFile, const std::string& executableFileName) {
+        ldLog() << "Adding default values to desktop file:" << desktopFile.path() << std::endl;
+
+        auto rv = true;
+
+        auto setDefault = [&rv, &desktopFile](const std::string& section, const std::string& key, const std::string& value) {
+            if (desktopFile.entryExists(section, key)) {
+                DesktopFileEntry entry;
+
+                // this should never return false
+                auto entryExists = desktopFile.getEntry(section, key, entry);
+                assert(entryExists);
+
+                ldLog() << LD_WARNING << "Key exists, not modified:" << key << "(current value:" << entry.value() << LD_NO_SPACE << ")" << std::endl;
+                rv = false;
+            } else {
+                auto entryOverwritten = desktopFile.setEntry(section, DesktopFileEntry(key, value));
+                assert(!entryOverwritten);
+            }
+        };
+
+        setDefault("Desktop Entry", "Name", executableFileName);
+        setDefault("Desktop Entry", "Exec", executableFileName);
+        setDefault("Desktop Entry", "Icon", executableFileName);
+        setDefault("Desktop Entry", "Type", "Application");
+        setDefault("Desktop Entry", "Categories", "Utility;");
+
+        return rv;
+    }
 }