Skip to content

Commit

Permalink
Update travisci config to use new help files (hopefully), fix up some
Browse files Browse the repository at this point in the history
missing dependencies for linux
  • Loading branch information
collin80 committed Aug 18, 2019
1 parent f070fb3 commit 8948c7b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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 *

Expand Down
4 changes: 2 additions & 2 deletions SavvyCAN.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8948c7b

Please sign in to comment.