Refactorization and ui remake

.gitignore

@@ -8,3 +8,4 @@ cmake/GIT_COMMIT
 squashfs-root/
 *.qm
 resources/l10n/*
+CMakeLists.txt.user

.gitmodules

@@ -1,6 +1,12 @@
 [submodule "lib/AppImageKit"]
 	path = lib/AppImageKit
 	url = https://github.com/AppImage/AppImageKit.git
+	branch = appimagetool/master
 [submodule "lib/AppImageUpdate"]
 	path = lib/AppImageUpdate
 	url = https://github.com/AppImage/AppImageUpdate.git
+	branch = master
+[submodule "lib/AppImageInfo"]
+	path = lib/AppImageInfo
+	url = https://github.com/azubieta/AppImageInfo.git
+	branch = master

.travis.yml

@@ -36,8 +36,22 @@ matrix:
             - desktop-file-utils
             - ccache
             - rpm
-            - libcurl3
-            - libbsd-dev
+            - libcurl3:i386
+            - libbsd-dev:i386
+            - libglib2.0-dev
+            - liblzma-dev
+            - libgtest-dev
+            - libcairo-dev
+            - libgl1-mesa-dev
+            - libglu1-mesa-dev
+            - libpng-dev
+            - libfontconfig1-dev
+            - libfreetype6-dev
+            - libarchive-dev
+            - libxml2-dev
+            - libboost-filesystem-dev
+            - libboost-program-options-dev
+            - libboost-dev
     - env: BIONIC= ARCH=i386
       addons:
         apt:
@@ -71,6 +85,10 @@ matrix:
             - libfontconfig1-dev:i386
             - libfreetype6-dev:i386
             - libarchive-dev:i386
+            - libxml2-dev:i386
+            - libboost-filesystem-dev:i386
+            - libboost-program-options-dev:i386
+            - libboost-dev:i386
 
 install:
   - ccache -M 5G

cmake/install.cmake

@@ -3,9 +3,18 @@
 # for some reason, using TARGETS ... doesn't work here, therefore using the absolute file path
 install(
     FILES
-    ${PROJECT_BINARY_DIR}/lib/AppImageKit/lib/libappimage/src/libappimage/libappimage.so
-    ${PROJECT_BINARY_DIR}/lib/AppImageUpdate/src/libappimageupdate.so
-    ${PROJECT_BINARY_DIR}/lib/AppImageUpdate/src/qt-ui/libappimageupdate-qt.so
+    $<TARGET_FILE:libappimage>
+    $<TARGET_LINKER_FILE:libappimage>
+    $<TARGET_SONAME_FILE:libappimage>
+    $<TARGET_FILE:libappimageinfo>
+    $<TARGET_LINKER_FILE:libappimageinfo>
+    $<TARGET_SONAME_FILE:libappimageinfo>
+    $<TARGET_FILE:libappimageupdate>
+    $<TARGET_LINKER_FILE:libappimageupdate>
+    $<TARGET_SONAME_FILE:libappimageupdate>
+    $<TARGET_FILE:libappimageupdate-qt>
+    $<TARGET_LINKER_FILE:libappimageupdate-qt>
+    $<TARGET_SONAME_FILE:libappimageupdate-qt>
     DESTINATION lib/appimagelauncher COMPONENT APPIMAGELAUNCHER
 )
 

lib/CMakeLists.txt

@@ -7,6 +7,9 @@ set(APPIMAGEKIT_RUNTIME_ENABLE_SETPROCTITLE ON CACHE BOOL "" FORCE)
 # needed to build libappimage and AppImage runtime
 add_subdirectory(AppImageKit EXCLUDE_FROM_ALL)
 
+# needed to extract AppImage information
+add_subdirectory(AppImageInfo EXCLUDE_FROM_ALL)
+
 # used by the update helper
 add_subdirectory(AppImageUpdate EXCLUDE_FROM_ALL)
 
@@ -21,4 +24,6 @@ if(TRAVIS_BUILD)
     set_property(TARGET libappimageupdate PROPERTY BUILD_WITH_INSTALL_RPATH ON)
     set_property(TARGET libappimageupdate-qt PROPERTY INSTALL_RPATH ${DEPS_RPATH})
     set_property(TARGET libappimageupdate-qt PROPERTY BUILD_WITH_INSTALL_RPATH ON)
+    set_property(TARGET libappimageinfo PROPERTY INSTALL_RPATH ${DEPS_RPATH})
+    set_property(TARGET libappimageinfo PROPERTY BUILD_WITH_INSTALL_RPATH ON)
 endif()