Merge branch 'dev'
This commit is contained in:
commit
9e0f8f2aa1
|
@ -8,8 +8,6 @@ branches:
|
|||
only:
|
||||
- master
|
||||
- dev
|
||||
except:
|
||||
- build-artifacts
|
||||
|
||||
environment:
|
||||
QTDIR: 'C:\Qt\5.7\msvc2013'
|
||||
|
@ -33,14 +31,14 @@ build_script:
|
|||
|
||||
on_success:
|
||||
- dir
|
||||
- git clone -q --depth=1 --branch=build-artifacts https://github.com/martinrotter/rssguard.git c:\rssguard-artifacts
|
||||
- git clone -q --depth=1 https://github.com/martinrotter/rssguard.wiki.git c:\rssguard-wiki
|
||||
- git config --global credential.helper store
|
||||
- ps: Add-Content "$env:USERPROFILE\.git-credentials" "https://$($env:access_token):x-oauth-basic@github.com`n"
|
||||
- git config --global user.email "rotter.martinos@gmail.com"
|
||||
- git config --global user.name "martinrotter"
|
||||
- cd ..\rssguard-build
|
||||
- for /f "tokens=*" %%F in ('dir /s /b *.7z') do curl --upload-file %%F https://transfer.sh/rssguard-win32.7z --silent >> ..\rssguard-artifacts\windows-builds.txt
|
||||
- cd ..\rssguard-artifacts
|
||||
- for /f "tokens=*" %%F in ('dir /s /b *.7z') do curl --upload-file %%F https://transfer.sh/rssguard-win32.7z --silent >> ..\rssguard-wiki\Windows-development-builds.md
|
||||
- cd ..\rssguard-wiki
|
||||
- git add *.*
|
||||
- git commit -m "New files."
|
||||
- git push origin build-artifacts
|
||||
- git push origin master
|
|
@ -11,11 +11,11 @@ ls -lha
|
|||
|
||||
git config --global user.email "rotter.martinos@gmail.com"
|
||||
git config --global user.name "martinrotter"
|
||||
git clone -q --depth=1 --branch=build-artifacts https://martinrotter:${GH_TOKEN}@github.com/martinrotter/rssguard.git ./build-artifacts
|
||||
curl --upload-file ./rssguard-osx.dmg https://transfer.sh/rssguard-osx.dmg --silent >> ./build-artifacts/macosx-builds.txt
|
||||
cat ./build-artifacts/macosx-builds.txt
|
||||
git clone -q --depth=1 https://martinrotter:${GH_TOKEN}@github.com/martinrotter/rssguard.wiki.git ./build-wiki
|
||||
curl --upload-file ./rssguard-osx.dmg https://transfer.sh/rssguard-osx.dmg --silent >> ./build-wiki/Mac-OS-X-development-builds.md
|
||||
cat ./build-wiki/Mac-OS-X-development-builds.md
|
||||
|
||||
cd ./build-artifacts
|
||||
git add *.txt
|
||||
cd ./build-wiki
|
||||
git add *.*
|
||||
git commit -m "New files."
|
||||
git push origin build-artifacts
|
||||
git push origin master
|
19
rssguard.pro
19
rssguard.pro
|
@ -36,6 +36,8 @@
|
|||
# Variables:
|
||||
# USE_WEBENGINE - if specified, then QtWebEngine module for internal web browser is used.
|
||||
# Otherwise simple text component is used and some features will be disabled.
|
||||
# Default value is "false". If QtWebEngine is installed during compilation, then
|
||||
# value of this variable is tweaked automatically.
|
||||
# PREFIX - specifies base folder to which files are copied during "make install"
|
||||
# step, defaults to "$$OUT_PWD/usr" on Linux and to "$$OUT_PWD/app" on Windows.
|
||||
# LRELEASE_EXECUTABLE - specifies the name/path of "lrelease" executable, defaults to "lrelease".
|
||||
|
@ -100,7 +102,17 @@ isEmpty(DESTDIR) {
|
|||
}
|
||||
|
||||
isEmpty(USE_WEBENGINE) {
|
||||
USE_WEBENGINE = true
|
||||
USE_WEBENGINE = false
|
||||
message(rssguard: USE_WEBENGINE variable is not set.)
|
||||
|
||||
qtHaveModule(webenginewidgets) {
|
||||
USE_WEBENGINE = true
|
||||
message("rssguard: WebEngine component IS installed, enabling it.")
|
||||
}
|
||||
else {
|
||||
USE_WEBENGINE = false
|
||||
message("rssguard: WebEngine component is probably NOT installed, disabling it.")
|
||||
}
|
||||
}
|
||||
|
||||
message(rssguard: Shadow copy build directory \"$$OUT_PWD\".)
|
||||
|
@ -148,6 +160,7 @@ message(rssguard: Build revision: \"$$APP_REVISION\".)
|
|||
message(rssguard: lrelease executable name: \"$$LRELEASE_EXECUTABLE\".)
|
||||
|
||||
QT += core gui widgets sql network xml printsupport
|
||||
|
||||
CONFIG *= c++11 debug_and_release warn_on
|
||||
DEFINES *= QT_USE_QSTRINGBUILDER QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS UNICODE _UNICODE
|
||||
VERSION = $$APP_VERSION
|
||||
|
@ -546,6 +559,10 @@ win32 {
|
|||
QMAKE_EXTRA_TARGETS += seven_zip zip
|
||||
}
|
||||
|
||||
equals(USE_WEBENGINE, false) {
|
||||
# Add extra file naming when building without webengine.
|
||||
}
|
||||
|
||||
# Create NSIS installer target on Windows.
|
||||
win32 {
|
||||
nsis.target = nsis
|
||||
|
|
Loading…
Reference in New Issue