diff --git a/resources/scripts/.travis-install-linux.sh b/resources/scripts/.travis-install-linux.sh index 1a6fe3e2a..ae51359e3 100755 --- a/resources/scripts/.travis-install-linux.sh +++ b/resources/scripts/.travis-install-linux.sh @@ -28,16 +28,16 @@ set -- R*.AppImage imagename="$1" if [ "$USE_WEBENGINE" = true ]; then -imagenamenospace="rssguard-$(git rev-parse --short HEAD)-linux.AppImage" + imagenamenospace="rssguard-$(git rev-parse --short HEAD)-linux.AppImage" else -imagenamenospace="rssguard-$(git rev-parse --short HEAD)-nowebengine-linux.AppImage" + imagenamenospace="rssguard-$(git rev-parse --short HEAD)-nowebengine-linux.AppImage" fi echo "File to upload: $imagename" echo "URL ending: $imagenamenospace" curl --upload-file "./$imagename" "https://transfer.sh/$imagenamenospace" --silent >> ./build-wiki/Linux-development-builds.md -echo "" >> ./build-wiki/Linux-development-builds.md +echo "\n" >> ./build-wiki/Linux-development-builds.md cd ./build-wiki git commit -a -m "New files." diff --git a/resources/scripts/.travis-install-osx.sh b/resources/scripts/.travis-install-osx.sh index 38da27d48..155187b06 100755 --- a/resources/scripts/.travis-install-osx.sh +++ b/resources/scripts/.travis-install-osx.sh @@ -1,52 +1,35 @@ #!/bin/sh +# Build application. mkdir rssguard-build && cd rssguard-build qmake .. "USE_WEBENGINE=$USE_WEBENGINE" -make lrelease make +qmake .. "USE_WEBENGINE=$USE_WEBENGINE" make install -#rm -rfv "RSS Guard.app/Contents/Frameworks" -#ls "RSS Guard.app/Contents" - +# Make DMG image. make dmg -make zip - -#hdiutil create -fs HFS+ -srcfolder "./RSS Guard.app/" -volname "RSS Guard" rssguard.dmg -#make dmg - -ls -lha otool -L "RSS Guard.app/Contents/MacOS/rssguard" -cd "RSS Guard.app" -ls -lha +set -- *.dmg +dmgname="$1" -cd .. +if [ "$USE_WEBENGINE" = true ]; then + dmgnamenospace="rssguard-$(git rev-parse --short HEAD)-mac.AppImage" +else + dmgnamenospace="rssguard-$(git rev-parse --short HEAD)-nowebengine-mac.AppImage" +fi + +echo "File to upload: $dmgname" +echo "URL ending: $dmgnamenospace" git config --global user.email "rotter.martinos@gmail.com" git config --global user.name "martinrotter" git clone -q --depth=1 https://martinrotter:${GH_TOKEN}@github.com/martinrotter/rssguard.wiki.git ./build-wiki -set -- *.dmg -dmgname="$1" -dmgnamenospace="${dmgname// /-}" -echo "DMGNAME IS: $dmgname" -echo "DMGNAME NO SPACE IS: $dmgnamenospace" - curl --upload-file "./$dmgname" "https://transfer.sh/$dmgnamenospace" --silent >> ./build-wiki/Mac-OS-X-development-builds.md echo "\n" >> ./build-wiki/Mac-OS-X-development-builds.md -set -- *.zip -zipname="$1" -zipnamenospace="${zipname// /-}" -echo "ZIPNAME IS: $zipname" -echo "ZIPNAME NO SPACE IS: $zipnamenospace" - -curl --upload-file "./$zipname" "https://transfer.sh/$zipnamenospace" --silent >> ./build-wiki/Mac-OS-X-development-builds.md -echo "\n" >> ./build-wiki/Mac-OS-X-development-builds.md - -cat ./build-wiki/Mac-OS-X-development-builds.md - cd ./build-wiki git add *.* git commit -m "New files." diff --git a/rssguard.pro b/rssguard.pro index 5bb9ad350..35c33261c 100755 --- a/rssguard.pro +++ b/rssguard.pro @@ -44,9 +44,8 @@ # # # Other information: -# - supports Windows, Linux, Mac OS X, -# - Qt 5.6.0 and higher is required, -# - Qt 5.9.0 and hiher is recommended, +# - supports Windows, Linux, Mac OS X, Android, +# - Qt 5.8.0 or higher is required, # - C++ 11 is required. # # Authors and contributors: @@ -70,7 +69,7 @@ APP_LOW_NAME = "rssguard" APP_LOW_H_NAME = ".rssguard" APP_AUTHOR = "Martin Rotter" APP_COPYRIGHT = "(C) 2011-2017 $$APP_AUTHOR" -APP_VERSION = "3.5.1" +APP_VERSION = "3.5.2" APP_LONG_NAME = "$$APP_NAME $$APP_VERSION" APP_EMAIL = "rotter.martinos@gmail.com" APP_URL = "https://github.com/martinrotter/rssguard"