From c2ce84de5f86ba5b60f4f2212abfe4087907560a Mon Sep 17 00:00:00 2001 From: probonopd <probonopd@users.noreply.github.com> Date: Sun, 2 Apr 2017 14:17:32 +0200 Subject: [PATCH 1/9] Create .travis.yml --- .travis.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..dfbb54a1 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,31 @@ +language: cpp +compiler: gcc +sudo: require +dist: trusty + +before_install: + - sudo add-apt-repository ppa:beineri/opt-qt58-trusty -y + - sudo apt-get update -qq + +install: + - sudo apt-get -y install qt58base + - source /opt/qt58/bin/qt58-env.sh + +script: + - git submodule init ; git submodule update + - cd radare2 + - sys/install.sh + - cd .. + - mkdir build ; cd build + - qmake PREFIX=/usr ../src + - make -j4 + - sudo make INSTALL_ROOT=appdir install ; sudo chown -R $USER appdir ; find appdir/ + +after_success: + - wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" + - chmod a+x linuxdeployqt*.AppImage + - unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH + - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -bundle-non-qt-libs + - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -appimage + - find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq + - curl --upload-file ./iaito*.AppImage https://transfer.sh/iaito-git.$(git rev-parse --short HEAD)-x86_64.AppImage From 0e7debdb133c75d2e68f60da52f044b999100dd2 Mon Sep 17 00:00:00 2001 From: probonopd <probonopd@users.noreply.github.com> Date: Sun, 2 Apr 2017 14:24:06 +0200 Subject: [PATCH 3/9] Update .travis.yml --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index dfbb54a1..26454196 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,12 +4,12 @@ sudo: require dist: trusty before_install: - - sudo add-apt-repository ppa:beineri/opt-qt58-trusty -y + - sudo add-apt-repository ppa:beineri/opt-qt532-trusty -y - sudo apt-get update -qq install: - - sudo apt-get -y install qt58base - - source /opt/qt58/bin/qt58-env.sh + - sudo apt-get -y install qt53base qt53webkit-examples + - source /opt/qt5*/bin/qt5*-env.sh script: - git submodule init ; git submodule update From f133ad11e2ff228b54a30e4daeb16638840ea31f Mon Sep 17 00:00:00 2001 From: probonopd <probonopd@users.noreply.github.com> Date: Sun, 2 Apr 2017 14:31:48 +0200 Subject: [PATCH 4/9] make install does not work, so do it by hand [ci skip] --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 26454196..4a208c41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,12 @@ script: - mkdir build ; cd build - qmake PREFIX=/usr ../src - make -j4 - - sudo make INSTALL_ROOT=appdir install ; sudo chown -R $USER appdir ; find appdir/ + - # make install does not work, so do it by hand + - # sudo make INSTALL_ROOT=appdir install ; sudo chown -R $USER appdir ; find appdir/ + - mkdir -p appdir/usr/bin + - cp iaito appdir/usr/bin + - touch appdir/iaito.png # FIXME + - cp ../src/iaito.desktop appdir/ after_success: - wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" From 395e715303709078de7672dade746f5b91355f99 Mon Sep 17 00:00:00 2001 From: probonopd <probonopd@users.noreply.github.com> Date: Sun, 2 Apr 2017 14:33:33 +0200 Subject: [PATCH 5/9] Create iaito.desktop --- src/iaito.desktop | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/iaito.desktop diff --git a/src/iaito.desktop b/src/iaito.desktop new file mode 100644 index 00000000..9a274973 --- /dev/null +++ b/src/iaito.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Application +Name=Iaito +Exec=iaito +Icon=iaito +Categories=Development; From 436eb6fba44fcf1c23ec40f64bbc09b38e389bdd Mon Sep 17 00:00:00 2001 From: probonopd <probonopd@users.noreply.github.com> Date: Sun, 2 Apr 2017 14:35:20 +0200 Subject: [PATCH 6/9] Use correct icon --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4a208c41..e1fbc35a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ script: - # sudo make INSTALL_ROOT=appdir install ; sudo chown -R $USER appdir ; find appdir/ - mkdir -p appdir/usr/bin - cp iaito appdir/usr/bin - - touch appdir/iaito.png # FIXME + - cp ../src/img/logo-small.png appdir/iaito.png - cp ../src/iaito.desktop appdir/ after_success: From b8de1125f6c65e5b804a553f412cd5ad5831b356 Mon Sep 17 00:00:00 2001 From: probonopd <probonopd@users.noreply.github.com> Date: Sun, 2 Apr 2017 14:36:17 +0200 Subject: [PATCH 7/9] =?UTF-8?q?Iait=C5=8D=20spelling?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/iaito.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/iaito.desktop b/src/iaito.desktop index 9a274973..fdc92149 100644 --- a/src/iaito.desktop +++ b/src/iaito.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Name=Iaito +Name=IaitÅ Exec=iaito Icon=iaito Categories=Development; From d992e8c01388d77b0fa97789e7be96da2ceced3b Mon Sep 17 00:00:00 2001 From: probonopd <probonopd@users.noreply.github.com> Date: Sun, 2 Apr 2017 14:41:17 +0200 Subject: [PATCH 8/9] Update .travis.yml --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e1fbc35a..68c0d9cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,9 +22,11 @@ script: - # make install does not work, so do it by hand - # sudo make INSTALL_ROOT=appdir install ; sudo chown -R $USER appdir ; find appdir/ - mkdir -p appdir/usr/bin + - mkdir -p appdir/usr/share/applications - cp iaito appdir/usr/bin - cp ../src/img/logo-small.png appdir/iaito.png - cp ../src/iaito.desktop appdir/ + - cp ../src/iaito.desktop appdir/usr/share/applications/ after_success: - wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" @@ -33,4 +35,4 @@ after_success: - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -bundle-non-qt-libs - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -appimage - find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq - - curl --upload-file ./iaito*.AppImage https://transfer.sh/iaito-git.$(git rev-parse --short HEAD)-x86_64.AppImage + - curl --upload-file ./Iai*.AppImage https://transfer.sh/Iaito-git.$(git rev-parse --short HEAD)-x86_64.AppImage From 7d312b56cd53ea94282ceb7fac89e9b2c1dd0d43 Mon Sep 17 00:00:00 2001 From: probonopd <probonopd@users.noreply.github.com> Date: Sun, 2 Apr 2017 15:02:45 +0200 Subject: [PATCH 9/9] -verbose=2 --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 68c0d9cd..e5ebdf12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,9 @@ after_success: - wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" - chmod a+x linuxdeployqt*.AppImage - unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH - - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -bundle-non-qt-libs - - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -appimage + - ./linuxdeployqt*.AppImage --appimage-extract + - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -bundle-non-qt-libs -verbose=2 + - ./squashfs-root/usr/bin/patchelf --set-rpath '$ORIGIN/../../lib' ./appdir/usr/plugins/platforms/libqxcb.so # linuxdeployqt bug? + - ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -appimage -verbose=2 - find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq - curl --upload-file ./Iai*.AppImage https://transfer.sh/Iaito-git.$(git rev-parse --short HEAD)-x86_64.AppImage