From b52ca69363440a39a88c8c50ba1fa997bb345f93 Mon Sep 17 00:00:00 2001 From: Collin Kidder Date: Sun, 18 Aug 2019 18:56:09 -0400 Subject: [PATCH] Update travisci config to use new help files (hopefully), fix up some missing dependencies for linux --- .travis.yml | 7 ++++--- SavvyCAN.pro | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index aefff13..42d8a13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ matrix: - wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" - chmod a+x linuxdeployqt-continuous-x86_64.AppImage # export VERSION=... # linuxdeployqt uses this for naming the file - - ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/local/share/applications/SavvyCAN.desktop -appimage -extra-plugins=iconengines,platformthemes.libqgtk3.so + - ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/local/share/applications/SavvyCAN.desktop -appimage -extra-plugins=iconengines,platformthemes/libqgtk3.so,canbus after_success: # find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq # for debugging @@ -50,7 +50,7 @@ matrix: script: - qmake CONFIG+=release -spec macx-xcode SavvyCAN.pro - xcodebuild - - cp *.q* Release/SavvyCAN.app/Contents/MacOS/ + - cp -R help/*.* Release/SavvyCAN.app/Contents/MacOS/help - cd Release - ls SavvyCAN.app/Contents/MacOS - macdeployqt SavvyCAN.app -dmg @@ -78,7 +78,8 @@ matrix: - rm *.cpp - rm *.h - rm *.obj - - cp ../*.q* . + - mkdir help + - cp -R ../help/*.* ./help - cp -r ../examples . - 7z a -tzip SavvyCAN32.zip -r * diff --git a/SavvyCAN.pro b/SavvyCAN.pro index c67f63c..605b90b 100644 --- a/SavvyCAN.pro +++ b/SavvyCAN.pro @@ -188,8 +188,8 @@ iconfiles.files=icons iconfiles.path = $$PREFIX/share/icons INSTALLS += iconfiles -helpfiles.files=SavvyCAN.q* -helpfiles.path = $$PREFIX/bin +helpfiles.files=help/* +helpfiles.path = $$PREFIX/bin/help INSTALLS += helpfiles INSTALLS += target