Update travisci config to use new help files (hopefully), fix up some

missing dependencies for linux
This commit is contained in:
Collin Kidder
2019-08-18 18:56:09 -04:00
parent ca9b83ddc9
commit b52ca69363
2 changed files with 6 additions and 5 deletions
+4 -3
View File
@@ -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 *
+2 -2
View File
@@ -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