Code cleanup; Using QCommandLineParser; Exclude list as resource

.gitignore

@@ -30,9 +30,14 @@ Makefile*
 *.autosave
 
 # QtCtreator Qml
+
 *.qmlproject.user
 *.qmlproject.user.*
 
 # QtCtreator CMake
+
 CMakeLists.txt.user
 
+# Project Files
+
+linuxdeployqt

.travis.yml

@@ -1,25 +1,39 @@
 language: cpp
 sudo: required
 dist: trusty
-
+addons:
+  apt:
+    packages:
+      - gdb
+      - apport
 os: linux
 
 env:
   global:
     - DISPLAY=:99
 
+compiler:
+  - gcc
+
 before_install:
+  # Enable core dumps
+  # https://github.com/springmeyer/travis-coredump/blob/master/.travis.yml
+  - ulimit -a -S
+  - ulimit -a -H
+  - ulimit -c unlimited -S
   - ./tests/tests-environment.sh
 
 script:
- - ./tests/tests-ci.sh
+  - ./tests/tests-ci.sh
 
 after_success:
   - wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
   - bash ./upload.sh ./linuxdeployqt-*.AppImage
 
 after_script:
   - "xpra stop :99"
+  - find ./ -maxdepth 1 -name 'core*'
+  - for i in $(find ./ -maxdepth 1 -name 'core*' -print); do gdb $(pwd)/test core* -ex "thread apply all bt" -ex "set pagination 0" -batch; done;
 
 branches:
   except:

README.md

@@ -20,7 +20,7 @@ Please download __linuxdeployqt-x86_64.AppImage__ from the [Releases](https://gi
 
 Open in Qt Creator and build your application. Run it from the command line and inspect it with `ldd` to make sure the correct libraries from the correct locations are getting loaded, as `linuxdeployqt` will use `ldd` internally to determine from where to copy libraries into the bundle.
 
-__Important:__ `linuxdeployqt` deploys the Qt instance that qmake on the $PATH points to, so make sure that it is the correct one. Verify that qmake finds the correct Qt instance like this before running the `linuxdeployqt` tool:
+__Important:__ By default, `linuxdeployqt` deploys the Qt instance that qmake on the $PATH points to, so make sure that it is the correct one. Verify that qmake finds the correct Qt instance like this before running the `linuxdeployqt` tool:
 
 ```
 qmake -v
@@ -29,6 +29,7 @@ QMake version 3.0
 Using Qt version 5.7.0 in /tmp/.mount_QtCreator-5.7.0-x86_64/5.7/gcc_64/lib
 ```
 If this does not show the correct path to your Qt instance that you want to be bundled, then adjust your `$PATH` to find the correct `qmake`.
+Alternatively, use the `-qmake` command line option to point the tool directly to the qmake executable to be used.
 
 Before running linuxdeployqt it may be wise to delete unneeded files that you do not wish to distribute from the build directory. These may be autogenerated during the build. You can delete them like so:
 

commons.pri

@@ -0,0 +1,38 @@
+COMMONS_TARGET = "linuxdeployqt"
+DEFAULT_PREFIX = /usr
+
+isEmpty(PREFIX): PREFIX = $${DEFAULT_PREFIX}
+isEmpty(EXECPREFIX): EXECPREFIX = $${PREFIX}
+isEmpty(BINDIR): BINDIR = $${EXECPREFIX}/bin
+isEmpty(SBINDIR): SBINDIR = $${EXECPREFIX}/sbin
+isEmpty(LIBEXECDIR): LIBEXECDIR = $${EXECPREFIX}/libexec
+isEmpty(DATAROOTDIR): DATAROOTDIR = $${PREFIX}/share
+isEmpty(DATDIR): DATDIR = $${DATAROOTDIR}/$${COMMONS_TARGET}
+isEmpty(SYSCONFDIR): SYSCONFDIR = $${PREFIX}/etc
+isEmpty(SHAREDSTATEDIR): SHAREDSTATEDIR = $${PREFIX}/com
+isEmpty(LOCALSTATEDIR): LOCALSTATEDIR = $${PREFIX}/var
+isEmpty(INCLUDEDIR): INCLUDEDIR = $${PREFIX}/include
+isEmpty(DOCDIR): DOCDIR = $${DATAROOTDIR}/doc/$${COMMONS_TARGET}
+isEmpty(INFODIR): INFODIR = $${DATAROOTDIR}/info
+isEmpty(HTMLDIR): HTMLDIR = $${DOCDIR}/html
+isEmpty(DVIDIR): DVIDIR = $${DOCDIR}/dvi
+isEmpty(PDFDIR): PDFDIR = $${DOCDIR}/pdf
+isEmpty(PSDIR): PSDIR = $${DOCDIR}/ps
+isEmpty(LIBDIR): LIBDIR = $${EXECPREFIX}/lib
+isEmpty(LOCALEDIR): LOCALEDIR = $${DATAROOTDIR}/locale
+isEmpty(MANDIR): MANDIR = $${DATAROOTDIR}/man
+isEmpty(LICENSEDIR): LICENSEDIR = $${DATAROOTDIR}/licenses/$${COMMONS_TARGET}
+isEmpty(LOCALDIR): LOCALDIR = $${PREFIX}/local
+isEmpty(LOCALLIBDIR): LOCALLIBDIR = $${LOCALDIR}/lib
+
+CONFIG(debug, debug|release) {
+    COMMONS_BUILD_PATH = build/Qt$${QT_VERSION}/$${QMAKE_CC}/debug
+    DEFINES += QT_DEBUG
+} else {
+    COMMONS_BUILD_PATH = build/Qt$${QT_VERSION}/$${QMAKE_CC}/release
+}
+
+MOC_DIR = $${COMMONS_BUILD_PATH}/moc
+OBJECTS_DIR = $${COMMONS_BUILD_PATH}/obj
+RCC_DIR = $${COMMONS_BUILD_PATH}/rcc
+UI_DIR = $${COMMONS_BUILD_PATH}/ui

excludelist

@@ -0,0 +1,145 @@
+# This file lists libraries that we will assume to be present on the host system and hence
+# should NOT be bundled inside AppImages. This is a working document; expect it to change
+# over time. File format: one filename per line. Each entry should have a justification comment.
+
+ld-linux.so.2
+ld-linux-x86-64.so.2
+libanl.so.1
+libBrokenLocale.so.1
+libcidn.so.1
+libcrypt.so.1
+libc.so.6
+libdl.so.2
+libm.so.6
+libmvec.so.1
+libnsl.so.1
+libnss_compat.so.2
+libnss_db.so.2
+libnss_dns.so.2
+libnss_files.so.2
+libnss_hesiod.so.2
+libnss_nisplus.so.2
+libnss_nis.so.2
+libpthread.so.0
+libresolv.so.2
+librt.so.1
+libthread_db.so.1
+libutil.so.1
+# These files are all part of the GNU C Library which should never be bundled.
+# List was generated from a fresh build of glibc 2.25.
+
+libstdc++.so.6
+# Workaround for:
+# usr/lib/libstdc++.so.6: version `GLIBCXX_3.4.21' not found
+
+libGL.so.1
+# Part of the video driver (OpenGL); present on any regular
+# desktop system, may also be provided by proprietary drivers.
+# Known to cause issues if it's bundled.
+
+libdrm.so.2
+# Workaround for:
+# Antergos Linux release 2015.11 (ISO-Rolling)
+# /usr/lib/libdrm_amdgpu.so.1: error: symbol lookup error: undefined symbol: drmGetNodeTypeFromFd (fatal)
+# libGL error: unable to load driver: swrast_dri.so
+# libGL error: failed to load driver: swrast
+# Unrecognized OpenGL version
+
+libxcb.so.1
+# Workaround for:
+# Fedora 23
+# symbol lookup error: /lib64/libxcb-dri3.so.0: undefined symbol: xcb_send_fd
+# Uncertain if this is required to be bundled for some distributions - if so we need to write a version check script and use LD_PRELOAD to load the system version if it is newer
+# Fedora 25:
+# undefined symbol: xcb_send_request_with_fds
+# https://github.com/probonopd/AppImages/issues/128
+
+libX11.so.6
+# Workaround for:
+# Fedora 23
+# symbol lookup error: ./lib/libX11.so.6: undefined symbol: xcb_wait_for_reply64
+# Uncertain if this is required to be bundled for some distributions - if so we need to write a version check script and use LD_PRELOAD to load the system version if it is newer
+
+libgio-2.0.so.0
+# Workaround for:
+# On Ubuntu, "symbol lookup error: /usr/lib/x86_64-linux-gnu/gtk-2.0/modules/liboverlay-scrollbar.so: undefined symbol: g_settings_new"
+
+libgdk-x11-2.0.so.0
+libgtk-x11-2.0.so.0
+# Simply to reduce size - not known to cause issues
+
+libasound.so.2
+# Workaround for:
+# No sound, e.g., in VLC.AppImage (does not find sound cards)
+
+libgdk_pixbuf-2.0.so.0
+# Workaround for:
+# On Ubuntu, get (inkscape:25621): GdkPixbuf-WARNING **: Error loading XPM image loader: Image type 'xpm' is not supported
+
+libfontconfig.so.1
+# Workaround for:
+# Application stalls when loading fonts during application launch; e.g., KiCad on ubuntu-mate
+
+libselinux.so.1
+# Workaround for:
+# sed: error while loading shared libraries: libpcre.so.3: cannot open shared object file: No such file or directory
+
+# The following are assumed to be part of the base system
+# Removing these has worked e.g., for Krita. Feel free to report if
+# you think that some of these should go into AppImages and why.
+libcom_err.so.2
+libcrypt.so.1
+libexpat.so.1
+libgcc_s.so.1
+libglib-2.0.so.0
+libgpg-error.so.0
+libgssapi_krb5.so.2 # Disputed, seemingly needed by Arch Linux since Kerberos is named differently there
+# libgssapi.so.3 # Seemingly needed when running Ubuntu 14.04 binaries on Fedora 23
+libhcrypto.so.4
+# libheimbase.so.1 # Seemingly needed when running Ubuntu 14.04 binaries on Fedora 23
+# libheimntlm.so.0 # Seemingly needed when running Ubuntu 14.04 binaries on Fedora 23
+libhx509.so.5
+libICE.so.6
+libidn.so.11
+libk5crypto.so.3
+libkeyutils.so.1
+libkrb5.so.26 # Disputed, seemingly needed by Arch Linux since Kerberos is named differently there
+libkrb5.so.3 # Disputed, seemingly needed by Arch Linux since Kerberos is named differently there
+libkrb5support.so.0 # Disputed, seemingly needed by Arch Linux since Kerberos is named differently there
+libp11-kit.so.0
+# libpcre.so.3 # Missing on Fedora 24 and on SLED 12 SP1
+libroken.so.18
+# libsasl2.so.2 # Seemingly needed when running Ubuntu 14.04 binaries on Fedora 23
+libSM.so.6
+libusb-1.0.so.0
+libuuid.so.1
+libwind.so.0
+libz.so.1
+
+# Potentially dangerous libraries
+libgobject-2.0.so.0
+
+# Workaround for:
+# e.g., Spotify
+# relocation error: /lib/x86_64-linux-gnu/libgcrypt.so.20: 
+# symbol gpgrt_lock_lock, version GPG_ERROR_1.0 not defined
+# in file libgpg-error.so.0 with link time reference
+libgpg-error.so.0
+
+# Unsolved issue:
+# https://github.com/probonopd/linuxdeployqt/issues/35
+# Error initializing NSS with a persistent database (sql:/home/me/.pki/nssdb): libsoftokn3.so: cannot open shared object file: No such file or directory
+# Error initializing NSS without a persistent database: NSS error code: -5925
+# nss_error=-5925, os_error=0
+# libnss3.so should not be removed from the bundles, as this causes other issues, e.g.,
+# https://github.com/probonopd/linuxdeployqt/issues/35#issuecomment-256213517
+# and https://github.com/probonopd/AppImages/pull/114
+# libnss3.so
+
+# The following cannot be excluded, see
+# https://github.com/probonopd/AppImages/commit/6c7473d8cdaaa2572248dcc53d7f617a577ade6b
+# http://stackoverflow.com/questions/32644157/forcing-a-binary-to-use-a-specific-newer-version-of-a-shared-library-so
+# libssl.so.1
+# libssl.so.1.0.0
+# libcrypto.so.1
+# libcrypto.so.1.0.0

linuxdeployqt.pro

@@ -1,2 +1,27 @@
-TEMPLATE = subdirs
-SUBDIRS = linuxdeployqt
+include(commons.pri)
+
+QT += core
+QT -= gui
+
+CONFIG += c++11
+
+CONFIG += console
+CONFIG -= app_bundle
+
+TEMPLATE = app
+
+HEADERS = \
+    src/shared.h
+
+SOURCES = \
+    src/main.cpp \
+    src/shared.cpp
+
+DESTDIR = $${OUT_PWD}
+TARGET = $${COMMONS_TARGET}
+
+INSTALLS += target
+target.path = $${BINDIR}
+
+RESOURCES += \
+    linuxdeployqt.qrc

linuxdeployqt.qrc

@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/">
+        <file>excludelist</file>
+    </qresource>
+</RCC>