Capability to deploy itself added

Author: omergoktas

.gitignore

@@ -72,3 +72,78 @@ Thumbs.db
 # Build folder
 # --------
 build/*
+
+
+# .gitattributes snippet to force users to use same line endings for project.
+# 
+# Handle line endings automatically for files detected as text
+# and leave all files detected as binary untouched.
+* text=auto eol=lf
+
+# The above will handle all files NOT found below
+# https://help.github.com/articles/dealing-with-line-endings/
+# https://github.com/Danimoth/gitattributes/blob/master/Web.gitattributes
+
+# These files are text and should be normalized (Convert crlf => lf)
+*.md text
+*.txt text
+*.cmake text
+*.pro text
+*.pri text
+*.c text
+*.m text
+*.mm text
+*.cpp text
+*.cxx text
+*.h text
+*.hpp text
+*.qml text
+*.java text
+*.desktop text
+*.conf text
+*.applescript text
+*.plist text
+*.properties text
+*.gradle text
+*.php text
+*.cs text
+*.css text
+*.js text
+*.json text
+*.htm text
+*.html text
+*.xml text
+*.svg text
+*.ini text
+*.inc text
+*.pl text
+*.rb text
+*.py text
+*.scm text
+*.sql text
+*.sh text
+.htaccess text
+.clang-format text
+
+# These files are binary and should be left untouched
+# (binary is a macro for -text -diff)
+*.jar binary
+*.png binary
+*.jpg binary
+*.jpeg binary
+*.gif binary
+*.ico binary
+*.mov binary
+*.mp4 binary
+*.mp3 binary
+*.flv binary
+*.fla binary
+*.swf binary
+*.gz binary
+*.tar binary
+*.zip binary
+*.7z binary
+*.ttf binary
+*.pyc binary
+
+*.bat text eol=crlf

CMakeLists.txt

@@ -9,7 +9,7 @@ include(Options)
 
 project(linuxdeployqt
     LANGUAGES CXX
-    VERSION 2.5.0
+    VERSION 2.5.1
     HOMEPAGE_URL omergoktas.com
     DESCRIPTION "Qt dependency deployment tool for Linux."
 )
@@ -25,6 +25,13 @@ qt_add_executable(linuxdeployqt
     shared.cpp
 )
 
+qt_add_resources(
+    linuxdeployqt
+    linuxdeployqt_assets
+    FILES
+        assets/AppRun
+)
+
 install(TARGETS linuxdeployqt DESTINATION bin)
 
 deploy(linuxdeployqt)

assets/AppRun

@@ -0,0 +1,19 @@
+#!/bin/sh
+SELF=$(readlink -f "$0")
+HERE=${SELF%/*}
+export SYS_PATH="$PATH"
+export SYS_LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
+export SYS_PYTHONPATH="$PYTHONPATH"
+export SYS_XDG_DATA_DIRS="$XDG_DATA_DIRS"
+export SYS_PERLLIB="$PERLLIB"
+export SYS_GSETTINGS_SCHEMA_DIR="$GSETTINGS_SCHEMA_DIR"
+export SYS_QT_PLUGIN_PATH="$QT_PLUGIN_PATH"
+export PATH="${HERE}/usr/bin/:${HERE}/usr/sbin/:${HERE}/usr/games/:${HERE}/bin/:${HERE}/sbin/${PATH:+:$PATH}"
+export LD_LIBRARY_PATH="${HERE}/usr/lib/:${HERE}/usr/lib/i386-linux-gnu/:${HERE}/usr/lib/x86_64-linux-gnu/:${HERE}/usr/lib32/:${HERE}/usr/lib64/:${HERE}/lib/:${HERE}/lib/i386-linux-gnu/:${HERE}/lib/x86_64-linux-gnu/:${HERE}/lib32/:${HERE}/lib64/${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+export PYTHONPATH="${HERE}/usr/share/pyshared/${PYTHONPATH:+:$PYTHONPATH}"
+export XDG_DATA_DIRS="${HERE}/usr/share/${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}"
+export PERLLIB="${HERE}/usr/share/perl5/:${HERE}/usr/lib/perl5/${PERLLIB:+:$PERLLIB}"
+export GSETTINGS_SCHEMA_DIR="${HERE}/usr/share/glib-2.0/schemas/${GSETTINGS_SCHEMA_DIR:+:$GSETTINGS_SCHEMA_DIR}"
+export QT_PLUGIN_PATH="${HERE}/usr/lib/qt4/plugins/:${HERE}/usr/lib/i386-linux-gnu/qt4/plugins/:${HERE}/usr/lib/x86_64-linux-gnu/qt4/plugins/:${HERE}/usr/lib32/qt4/plugins/:${HERE}/usr/lib64/qt4/plugins/:${HERE}/usr/lib/qt5/plugins/:${HERE}/usr/lib/i386-linux-gnu/qt5/plugins/:${HERE}/usr/lib/x86_64-linux-gnu/qt5/plugins/:${HERE}/usr/lib32/qt5/plugins/:${HERE}/usr/lib64/qt5/plugins/${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH}"
+EXEC=$(grep -e '^Exec=.*' "${HERE}"/*.desktop | head -n 1 | cut -d "=" -f 2 | cut -d " " -f 1)
+exec "${EXEC}" "$@"

cmake/Deploy.cmake

@@ -22,9 +22,14 @@ function(deploy TARGET)
         file(CHMOD ${APPIMAGETOOL_EXECUTABLE} PERMISSIONS OWNER_READ OWNER_EXECUTE)
     endif()
 
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/icon.desktop
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/deploy/icon.desktop
         ${DEPLOY_PREFIX_PATH}/${TARGET}.desktop @ONLY)
 
+    add_custom_command(TARGET deploy VERBATIM
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+        ${CMAKE_CURRENT_SOURCE_DIR}/deploy/icon.svg ${DEPLOY_PREFIX_PATH}/${TARGET}.svg
+    )
+
     add_custom_command(TARGET deploy VERBATIM
         COMMAND ${CMAKE_COMMAND} -E make_directory
         ${DEPLOY_PREFIX_PATH}/usr/bin
@@ -55,12 +60,6 @@ function(deploy TARGET)
         ${PATCHELF_EXECUTABLE} $<TARGET_FILE:${TARGET}> ${DEPLOY_PREFIX_PATH}/usr/bin
     )
 
-    add_custom_command(TARGET deploy VERBATIM
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different
-        icon.svg ${DEPLOY_PREFIX_PATH}/${TARGET}.svg
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    )
-
     add_custom_command(TARGET deploy VERBATIM
         COMMAND ARCH=${CMAKE_SYSTEM_PROCESSOR} $<TARGET_FILE:${TARGET}>
         ${DEPLOY_PREFIX_PATH}/usr/bin/$<TARGET_FILE_NAME:${TARGET}>

icon.desktop renamed to deploy/icon.desktop

@@ -398,8 +398,7 @@ int main(int argc, char* argv[])
     if (appRun.exists()) {
         qDebug() << "Keeping existing AppRun";
     } else {
-        if (!QFile::copy(QCoreApplication::applicationDirPath() + "/../../AppRun",
-                         appDirPath + "/AppRun")) {
+        if (!QFile::copy(":/assets/AppRun", appDirPath + "/AppRun")) {
             LogError() << "Could not copy AppRun";
         }
     }