From 254f4d6e92d0d20ed7dbe1ed87dc83aea7d825c5 Mon Sep 17 00:00:00 2001 From: probonopd Date: Sun, 19 Feb 2017 17:56:57 +0100 Subject: [PATCH 01/24] Create .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/.travis.yml @@ -0,0 +1 @@ + From dbd46d44aa33914f0789a89d9791ee5a72735709 Mon Sep 17 00:00:00 2001 From: probonopd Date: Sun, 19 Feb 2017 18:01:29 +0100 Subject: [PATCH 02/24] Update .travis.yml --- .travis.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8b13789..66eaa6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1 +1,26 @@ +sudo: required +dist: trusty +language: c++ +install: + - sudo add-apt-repository -y ppa:beineri/opt-qt58-trusty + - sudo apt-get update + - sudo apt-get -y install build-essential qt58declarative + +script: + - source /opt/qt58/bin/qt58-env.sh + - cd cool-retro-term + - qmake + - make -j2 + - mkdir -p appdir/usr/share/appdata appdir/usr/bin + - cp packaging/appdata/cool-retro-term.appdata.xml appdir/usr/share/appdata/ + - cp cool-retro-term appdir/usr/bin/ + - cp ./cool-retro-term.desktop appdir/ + - cp ./app/icons/128x128/cool-retro-term.png appdir/ + - cp -r ./app/qml appdir/usr/ + - cp -r qmltermwidget/QMLTermWidget/ appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 + - wget -c https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage + - chmod a+x linuxdeployqt-continuous-x86_64.AppImage + - ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/bin/cool-retro-term -qmldir=. + - export VERSION=$(git rev-list --count HEAD).$(git describe --tags | cut -d - -f 3) + - ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/bin/cool-retro-term -qmldir=. -appimage From 297239fb5c124e5b4b1f454aec5c4ae44ad38bc2 Mon Sep 17 00:00:00 2001 From: probonopd Date: Sun, 19 Feb 2017 18:05:37 +0100 Subject: [PATCH 03/24] Install libgl-dev --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 66eaa6c..7dfa5a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ language: c++ install: - sudo add-apt-repository -y ppa:beineri/opt-qt58-trusty - sudo apt-get update - - sudo apt-get -y install build-essential qt58declarative + - sudo apt-get -y install build-essential qt58declarative libgl-dev script: - source /opt/qt58/bin/qt58-env.sh From f42bd3036f9dc77e71cc9c26ba7b153f84077132 Mon Sep 17 00:00:00 2001 From: probonopd Date: Sun, 19 Feb 2017 18:08:53 +0100 Subject: [PATCH 04/24] Install libgl1-mesa-dev --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7dfa5a0..dd34b88 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ language: c++ install: - sudo add-apt-repository -y ppa:beineri/opt-qt58-trusty - sudo apt-get update - - sudo apt-get -y install build-essential qt58declarative libgl-dev + - sudo apt-get -y install build-essential qt58declarative libgl1-mesa-dev script: - source /opt/qt58/bin/qt58-env.sh From 988222b711f6ae9c86a05d1fa73c316b8e771004 Mon Sep 17 00:00:00 2001 From: probonopd Date: Sun, 19 Feb 2017 18:23:31 +0100 Subject: [PATCH 05/24] Upload to transfer.sh --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dd34b88..929f95b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,6 @@ install: script: - source /opt/qt58/bin/qt58-env.sh - - cd cool-retro-term - qmake - make -j2 - mkdir -p appdir/usr/share/appdata appdir/usr/bin @@ -24,3 +23,7 @@ script: - ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/bin/cool-retro-term -qmldir=. - export VERSION=$(git rev-list --count HEAD).$(git describe --tags | cut -d - -f 3) - ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/bin/cool-retro-term -qmldir=. -appimage + +# See https://github.com/probonopd/uploadtool/ for a way to upload to GitHub Releases automatically +after_success: + - curl --upload-file ./Cool_Retro_Term-*.AppImage https://transfer.sh/Cool_Retro_Term-$VERSION-x86_64.AppImage From 9d049bd0415d014aeaf4eb1ef1c38da3939c6c8b Mon Sep 17 00:00:00 2001 From: probonopd Date: Sun, 19 Feb 2017 18:24:35 +0100 Subject: [PATCH 06/24] Use linuxdeployqt-3-x86_64.AppImage --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 929f95b..a3c94b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ script: - chmod a+x linuxdeployqt-continuous-x86_64.AppImage - ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/bin/cool-retro-term -qmldir=. - export VERSION=$(git rev-list --count HEAD).$(git describe --tags | cut -d - -f 3) - - ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/bin/cool-retro-term -qmldir=. -appimage + - ./linuxdeployqt-3-x86_64.AppImage appdir/usr/bin/cool-retro-term -qmldir=. -appimage # See https://github.com/probonopd/uploadtool/ for a way to upload to GitHub Releases automatically after_success: From d58157a450630e426e2530948721cb09fde6ec59 Mon Sep 17 00:00:00 2001 From: probonopd Date: Sun, 19 Feb 2017 18:32:44 +0100 Subject: [PATCH 07/24] -qmldir=./app/qml/ -qmldir=./qmltermwidget/ --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a3c94b0..8baf33d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,9 +20,9 @@ script: - cp -r qmltermwidget/QMLTermWidget/ appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - wget -c https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage - chmod a+x linuxdeployqt-continuous-x86_64.AppImage - - ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/bin/cool-retro-term -qmldir=. + - ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ - export VERSION=$(git rev-list --count HEAD).$(git describe --tags | cut -d - -f 3) - - ./linuxdeployqt-3-x86_64.AppImage appdir/usr/bin/cool-retro-term -qmldir=. -appimage + - ./linuxdeployqt-3-x86_64.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ -appimage # See https://github.com/probonopd/uploadtool/ for a way to upload to GitHub Releases automatically after_success: From 2f25bd30b045fadbc3bb0d695b6aef86a5456a0d Mon Sep 17 00:00:00 2001 From: probonopd Date: Sun, 19 Feb 2017 18:38:16 +0100 Subject: [PATCH 08/24] linuxdeployqt-3-x86_64.AppImage --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8baf33d..78bfa8c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,11 +18,11 @@ script: - cp ./app/icons/128x128/cool-retro-term.png appdir/ - cp -r ./app/qml appdir/usr/ - cp -r qmltermwidget/QMLTermWidget/ appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - - wget -c https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage - - chmod a+x linuxdeployqt-continuous-x86_64.AppImage - - ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ + - wget -c https://github.com/probonopd/linuxdeployqt/releases/download/3/linuxdeployqt-3-x86_64.AppImage + - chmod a+x linuxdeployqt-*.AppImage + - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ - export VERSION=$(git rev-list --count HEAD).$(git describe --tags | cut -d - -f 3) - - ./linuxdeployqt-3-x86_64.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ -appimage + - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ -appimage # See https://github.com/probonopd/uploadtool/ for a way to upload to GitHub Releases automatically after_success: From 650497bff458a5595eb43a4283f42064ed6c763e Mon Sep 17 00:00:00 2001 From: probonopd Date: Sun, 19 Feb 2017 18:45:29 +0100 Subject: [PATCH 09/24] Debug why some qml imports do not get deployed --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 78bfa8c..bfb8d10 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ script: - chmod a+x linuxdeployqt-*.AppImage - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ - export VERSION=$(git rev-list --count HEAD).$(git describe --tags | cut -d - -f 3) - - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ -appimage + - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ -appimage -verbose=3 2>&1 | grep "name or path is empty" -C 3 # See https://github.com/probonopd/uploadtool/ for a way to upload to GitHub Releases automatically after_success: From e787fd0fb50ae4622881f89354aebfea01b3d49d Mon Sep 17 00:00:00 2001 From: probonopd Date: Sun, 19 Feb 2017 20:11:53 +0100 Subject: [PATCH 10/24] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bfb8d10..447ad2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ script: - chmod a+x linuxdeployqt-*.AppImage - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ - export VERSION=$(git rev-list --count HEAD).$(git describe --tags | cut -d - -f 3) - - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ -appimage -verbose=3 2>&1 | grep "name or path is empty" -C 3 + - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ -appimage -verbose=3 2>&1 | grep "path:" -C 3 # See https://github.com/probonopd/uploadtool/ for a way to upload to GitHub Releases automatically after_success: From 0823fe8b3d0d2d88e555e6fc5aa67e2427329d67 Mon Sep 17 00:00:00 2001 From: probonopd Date: Sun, 19 Feb 2017 21:43:34 +0100 Subject: [PATCH 11/24] find /opt/qt58/ | grep QtGraphicalEffects --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 447ad2c..c835b22 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ script: - cp ./app/icons/128x128/cool-retro-term.png appdir/ - cp -r ./app/qml appdir/usr/ - cp -r qmltermwidget/QMLTermWidget/ appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 + - find /opt/qt58/ | grep QtGraphicalEffects # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - wget -c https://github.com/probonopd/linuxdeployqt/releases/download/3/linuxdeployqt-3-x86_64.AppImage - chmod a+x linuxdeployqt-*.AppImage - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ From 7c7b049ba172fbd3b273acf7d18a4a40d7c39a2b Mon Sep 17 00:00:00 2001 From: probonopd Date: Sat, 25 Feb 2017 00:49:16 +0100 Subject: [PATCH 12/24] Update .travis.yml --- .travis.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index c835b22..0c34a87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,14 +17,16 @@ script: - cp ./cool-retro-term.desktop appdir/ - cp ./app/icons/128x128/cool-retro-term.png appdir/ - cp -r ./app/qml appdir/usr/ - - cp -r qmltermwidget/QMLTermWidget/ appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - - find /opt/qt58/ | grep QtGraphicalEffects # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 + - mkdir -p appdir/usr/qml/QtQuick + - cp -r /opt/qt*/qml/QtQuick/2 appdir/usr/qml/QtQuick # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 + - cp -r /opt/qt*/qml/QtQuick.Dialogs appdir/usr/qml/QtQuick # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 + - cp -r ./qmltermwidget/QMLTermWidget appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - wget -c https://github.com/probonopd/linuxdeployqt/releases/download/3/linuxdeployqt-3-x86_64.AppImage - chmod a+x linuxdeployqt-*.AppImage - - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ + - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ -verbose=3 2>&1 | grep "path:" -C 3 - export VERSION=$(git rev-list --count HEAD).$(git describe --tags | cut -d - -f 3) - - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ -appimage -verbose=3 2>&1 | grep "path:" -C 3 - + - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ -appimage + # See https://github.com/probonopd/uploadtool/ for a way to upload to GitHub Releases automatically after_success: - curl --upload-file ./Cool_Retro_Term-*.AppImage https://transfer.sh/Cool_Retro_Term-$VERSION-x86_64.AppImage From 17c5651305298d838e64d5435a0058828b1b7737 Mon Sep 17 00:00:00 2001 From: probonopd Date: Sat, 25 Feb 2017 00:50:41 +0100 Subject: [PATCH 13/24] Update .travis.yml --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0c34a87..89922cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,9 +24,8 @@ script: - wget -c https://github.com/probonopd/linuxdeployqt/releases/download/3/linuxdeployqt-3-x86_64.AppImage - chmod a+x linuxdeployqt-*.AppImage - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ -verbose=3 2>&1 | grep "path:" -C 3 - - export VERSION=$(git rev-list --count HEAD).$(git describe --tags | cut -d - -f 3) - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ -appimage # See https://github.com/probonopd/uploadtool/ for a way to upload to GitHub Releases automatically after_success: - - curl --upload-file ./Cool_Retro_Term-*.AppImage https://transfer.sh/Cool_Retro_Term-$VERSION-x86_64.AppImage + - curl --upload-file ./Cool_Retro_Term-*.AppImage https://transfer.sh/Cool_Retro_Term-git$(git rev-parse --short HEAD)-x86_64.AppImage From ff976e3ec2463d0639bd3980951a0b775700770a Mon Sep 17 00:00:00 2001 From: probonopd Date: Sat, 25 Feb 2017 00:55:46 +0100 Subject: [PATCH 14/24] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 89922cc..e57e0e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,8 +18,8 @@ script: - cp ./app/icons/128x128/cool-retro-term.png appdir/ - cp -r ./app/qml appdir/usr/ - mkdir -p appdir/usr/qml/QtQuick - - cp -r /opt/qt*/qml/QtQuick/2 appdir/usr/qml/QtQuick # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - - cp -r /opt/qt*/qml/QtQuick.Dialogs appdir/usr/qml/QtQuick # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 + - cp -r /opt/qt*/qml/QtQuick.2 appdir/usr/qml/QtQuick/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 + - cp -r /opt/qt*/qml/QtQuick/Dialogs appdir/usr/qml/QtQuick/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - cp -r ./qmltermwidget/QMLTermWidget appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - wget -c https://github.com/probonopd/linuxdeployqt/releases/download/3/linuxdeployqt-3-x86_64.AppImage - chmod a+x linuxdeployqt-*.AppImage From fa162c818b709e6863720d91648a091d11582027 Mon Sep 17 00:00:00 2001 From: probonopd Date: Sat, 25 Feb 2017 00:56:00 +0100 Subject: [PATCH 15/24] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e57e0e5..c722ca9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ script: - cp ./app/icons/128x128/cool-retro-term.png appdir/ - cp -r ./app/qml appdir/usr/ - mkdir -p appdir/usr/qml/QtQuick - - cp -r /opt/qt*/qml/QtQuick.2 appdir/usr/qml/QtQuick/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 + - cp -r /opt/qt*/qml/QtQuick.2 appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - cp -r /opt/qt*/qml/QtQuick/Dialogs appdir/usr/qml/QtQuick/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - cp -r ./qmltermwidget/QMLTermWidget appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - wget -c https://github.com/probonopd/linuxdeployqt/releases/download/3/linuxdeployqt-3-x86_64.AppImage From c9271bfa360bab0cb4204ecee2d6b975e1aae5b6 Mon Sep 17 00:00:00 2001 From: probonopd Date: Sat, 25 Feb 2017 01:01:39 +0100 Subject: [PATCH 16/24] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c722ca9..1ef04e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,9 +17,9 @@ script: - cp ./cool-retro-term.desktop appdir/ - cp ./app/icons/128x128/cool-retro-term.png appdir/ - cp -r ./app/qml appdir/usr/ - - mkdir -p appdir/usr/qml/QtQuick +# - mkdir -p appdir/usr/qml/QtQuick - cp -r /opt/qt*/qml/QtQuick.2 appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - - cp -r /opt/qt*/qml/QtQuick/Dialogs appdir/usr/qml/QtQuick/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 + - cp -r /opt/qt*/qml/QtQuick.Dialogs appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - cp -r ./qmltermwidget/QMLTermWidget appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - wget -c https://github.com/probonopd/linuxdeployqt/releases/download/3/linuxdeployqt-3-x86_64.AppImage - chmod a+x linuxdeployqt-*.AppImage From 918df9098a0ba6a3e6a7cb120d3b380ebfcd248f Mon Sep 17 00:00:00 2001 From: probonopd Date: Sat, 25 Feb 2017 01:06:42 +0100 Subject: [PATCH 17/24] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 1ef04e3..e4d69e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ script: - cp ./app/icons/128x128/cool-retro-term.png appdir/ - cp -r ./app/qml appdir/usr/ # - mkdir -p appdir/usr/qml/QtQuick + - find /opt/qt*/qml/ | grep Dialogs - cp -r /opt/qt*/qml/QtQuick.2 appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - cp -r /opt/qt*/qml/QtQuick.Dialogs appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - cp -r ./qmltermwidget/QMLTermWidget appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 From a192024fef6e3b4556b738ad041d1cb03d90fcf5 Mon Sep 17 00:00:00 2001 From: probonopd Date: Sat, 25 Feb 2017 01:12:13 +0100 Subject: [PATCH 18/24] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e4d69e0..cbd1c10 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,9 +18,9 @@ script: - cp ./app/icons/128x128/cool-retro-term.png appdir/ - cp -r ./app/qml appdir/usr/ # - mkdir -p appdir/usr/qml/QtQuick - - find /opt/qt*/qml/ | grep Dialogs +# - find /opt/qt*/qml/ | grep Dialogs - cp -r /opt/qt*/qml/QtQuick.2 appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - - cp -r /opt/qt*/qml/QtQuick.Dialogs appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 +# - cp -r /opt/qt*/qml/QtQuick.Dialogs appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - cp -r ./qmltermwidget/QMLTermWidget appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - wget -c https://github.com/probonopd/linuxdeployqt/releases/download/3/linuxdeployqt-3-x86_64.AppImage - chmod a+x linuxdeployqt-*.AppImage From c66ca6e44f5e56cd1c8abcb94e6b64b7a5fcc472 Mon Sep 17 00:00:00 2001 From: probonopd Date: Sat, 25 Feb 2017 01:20:00 +0100 Subject: [PATCH 19/24] Update .travis.yml --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index cbd1c10..69edca8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,16 +17,15 @@ script: - cp ./cool-retro-term.desktop appdir/ - cp ./app/icons/128x128/cool-retro-term.png appdir/ - cp -r ./app/qml appdir/usr/ -# - mkdir -p appdir/usr/qml/QtQuick -# - find /opt/qt*/qml/ | grep Dialogs + - cp -r /opt/qt*/qml/QtGraphicalEffects appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - cp -r /opt/qt*/qml/QtQuick.2 appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 -# - cp -r /opt/qt*/qml/QtQuick.Dialogs appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 + - mkdir -p appdir/usr/qml/QtQuick/ ; cp -r /opt/qt*/qml/QtQuick/Controls appdir/usr/qml/QtQuick/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - cp -r ./qmltermwidget/QMLTermWidget appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - wget -c https://github.com/probonopd/linuxdeployqt/releases/download/3/linuxdeployqt-3-x86_64.AppImage - chmod a+x linuxdeployqt-*.AppImage - - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ -verbose=3 2>&1 | grep "path:" -C 3 + - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ # -verbose=3 2>&1 | grep "path:" -C 3 - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ -appimage # See https://github.com/probonopd/uploadtool/ for a way to upload to GitHub Releases automatically after_success: - - curl --upload-file ./Cool_Retro_Term-*.AppImage https://transfer.sh/Cool_Retro_Term-git$(git rev-parse --short HEAD)-x86_64.AppImage + - curl --upload-file ./Cool_Retro_Term-*.AppImage https://transfer.sh/Cool_Retro_Term-git.$(git rev-parse --short HEAD)-x86_64.AppImage From b85aede966482ab02fa9421a3b591f234f91c26f Mon Sep 17 00:00:00 2001 From: probonopd Date: Sat, 25 Feb 2017 01:27:19 +0100 Subject: [PATCH 20/24] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 69edca8..09cfc89 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ language: c++ install: - sudo add-apt-repository -y ppa:beineri/opt-qt58-trusty - sudo apt-get update - - sudo apt-get -y install build-essential qt58declarative libgl1-mesa-dev + - sudo apt-get -y install build-essential qt58declarative qt58graphicaleffects qt58quickcontrols libgl1-mesa-dev script: - source /opt/qt58/bin/qt58-env.sh From 79fbb76524878b54963d281362b9c48b4dd348e1 Mon Sep 17 00:00:00 2001 From: probonopd Date: Fri, 17 Mar 2017 21:02:20 +0100 Subject: [PATCH 21/24] Try to reduce workarounds fpr --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 09cfc89..795effe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,9 +17,9 @@ script: - cp ./cool-retro-term.desktop appdir/ - cp ./app/icons/128x128/cool-retro-term.png appdir/ - cp -r ./app/qml appdir/usr/ - - cp -r /opt/qt*/qml/QtGraphicalEffects appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - - cp -r /opt/qt*/qml/QtQuick.2 appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - - mkdir -p appdir/usr/qml/QtQuick/ ; cp -r /opt/qt*/qml/QtQuick/Controls appdir/usr/qml/QtQuick/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 + - # cp -r /opt/qt*/qml/QtGraphicalEffects appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 + - # cp -r /opt/qt*/qml/QtQuick.2 appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 + - # mkdir -p appdir/usr/qml/QtQuick/ ; cp -r /opt/qt*/qml/QtQuick/Controls appdir/usr/qml/QtQuick/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - cp -r ./qmltermwidget/QMLTermWidget appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - wget -c https://github.com/probonopd/linuxdeployqt/releases/download/3/linuxdeployqt-3-x86_64.AppImage - chmod a+x linuxdeployqt-*.AppImage From 24754edb6a9e1b0ac6e1af431aae4a29cb3152fa Mon Sep 17 00:00:00 2001 From: probonopd Date: Fri, 17 Mar 2017 21:05:44 +0100 Subject: [PATCH 22/24] Use linuxdeployqt-continuous-x86_64.AppImage for now --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 795effe..390c469 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ script: - # cp -r /opt/qt*/qml/QtQuick.2 appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - # mkdir -p appdir/usr/qml/QtQuick/ ; cp -r /opt/qt*/qml/QtQuick/Controls appdir/usr/qml/QtQuick/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - cp -r ./qmltermwidget/QMLTermWidget appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - - wget -c https://github.com/probonopd/linuxdeployqt/releases/download/3/linuxdeployqt-3-x86_64.AppImage + - wget -c https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage - chmod a+x linuxdeployqt-*.AppImage - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ # -verbose=3 2>&1 | grep "path:" -C 3 - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ -appimage From c514dc7a245da3ab3cbc3317efd2d7db4fd5dac6 Mon Sep 17 00:00:00 2001 From: probonopd Date: Mon, 3 Apr 2017 22:55:45 +0200 Subject: [PATCH 23/24] See if we still need 2 runs --- .travis.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 390c469..bfac7ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,14 +17,11 @@ script: - cp ./cool-retro-term.desktop appdir/ - cp ./app/icons/128x128/cool-retro-term.png appdir/ - cp -r ./app/qml appdir/usr/ - - # cp -r /opt/qt*/qml/QtGraphicalEffects appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - - # cp -r /opt/qt*/qml/QtQuick.2 appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - - # mkdir -p appdir/usr/qml/QtQuick/ ; cp -r /opt/qt*/qml/QtQuick/Controls appdir/usr/qml/QtQuick/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - cp -r ./qmltermwidget/QMLTermWidget appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - wget -c https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage - chmod a+x linuxdeployqt-*.AppImage - - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ # -verbose=3 2>&1 | grep "path:" -C 3 - - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ -appimage +# - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ # -verbose=3 2>&1 | grep "path:" -C 3 + - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ -verbose=2 -appimage # See https://github.com/probonopd/uploadtool/ for a way to upload to GitHub Releases automatically after_success: From 4bff6efe978c49b687606b6fc1802ac5d71e3991 Mon Sep 17 00:00:00 2001 From: probonopd Date: Mon, 3 Apr 2017 23:07:30 +0200 Subject: [PATCH 24/24] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bfac7ee..171aead 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ script: - cp -r ./qmltermwidget/QMLTermWidget appdir/usr/qml/ # Workaround for https://github.com/probonopd/linuxdeployqt/issues/78 - wget -c https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage - chmod a+x linuxdeployqt-*.AppImage -# - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ # -verbose=3 2>&1 | grep "path:" -C 3 + - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ # -verbose=3 2>&1 | grep "path:" -C 3 - ./linuxdeployqt-*.AppImage appdir/usr/bin/cool-retro-term -qmldir=./app/qml/ -qmldir=./qmltermwidget/ -verbose=2 -appimage # See https://github.com/probonopd/uploadtool/ for a way to upload to GitHub Releases automatically