FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better versions.

Browse Source
This commit is contained in:
Martin Rotter 2016-08-25 09:42:57 +02:00
parent 26cb8a5a0a
commit e7d995ad46
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.appveyor.yml
View File

@ -1,4 +1,4 @@
version: 3.3.{build} version: {build}
skip_tags: true skip_tags: true
image: Visual Studio 2013 image: Visual Studio 2013
clone_depth: 1 clone_depth: 1
@ -38,7 +38,7 @@ on_success:
- ps: Add-Content "$env:USERPROFILE\.git-credentials" "https://$($env:access_token):x-oauth-basic@github.com`n" - 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.email "rotter.martinos@gmail.com"
- git config --global user.name "martinrotter" - git config --global user.name "martinrotter"
- copy /Y ..\rssguard-build\*.7z .\ - copy /Y ..\rssguard-build\*.7z .\windows
- git add *.7z - git add windows\*.7z
- git commit -m "New files." - git commit -m "New files."
- git push origin build-artifacts - git push origin build-artifacts

2
resources/nsis/NSIS.definitions.nsh.in
View File

@ -25,5 +25,5 @@
!define MUI_ICON "@PWD@\resources\graphics\@APP_LOW_NAME@.ico" !define MUI_ICON "@PWD@\resources\graphics\@APP_LOW_NAME@.ico"
!define MUI_UNICON "@PWD@\resources\graphics\@APP_LOW_NAME@.ico" !define MUI_UNICON "@PWD@\resources\graphics\@APP_LOW_NAME@.ico"
!define PATCH "0" !define PATCH "0"
!define OUTPUT_FILE "@OUT_PWD@\@APP_LOW_NAME@-@APP_VERSION@-win32.exe" !define OUTPUT_FILE "@OUT_PWD@\@APP_LOW_NAME@-@APP_VERSION@-@APP_REVISION@-win32.exe"
!define BINARY_TREE "@OUT_PWD@\app" !define BINARY_TREE "@OUT_PWD@\app"

8
rssguard.pro
View File

@ -135,7 +135,7 @@ exists(.git) {
} }
isEmpty(APP_REVISION) { isEmpty(APP_REVISION) {
APP_REVISION = "-" APP_REVISION = ""
} }
DEFINES += APP_REVISION='"\\\"$$APP_REVISION\\\""' DEFINES += APP_REVISION='"\\\"$$APP_REVISION\\\""'
@ -537,11 +537,11 @@ QMAKE_EXTRA_COMPILERS += lrelease
win32 { win32 {
seven_zip.target = 7zip seven_zip.target = 7zip
seven_zip.depends = install seven_zip.depends = install
seven_zip.commands = $$shell_path($$shell_quote($$PWD/resources/scripts/7za/7za.exe)) a -t7z $$TARGET-$$APP_VERSION-win32.7z $$shell_path($$PREFIX/*) seven_zip.commands = $$shell_path($$shell_quote($$PWD/resources/scripts/7za/7za.exe)) a -t7z $$TARGET-$$APP_VERSION-$$APP_REVISION-win32.7z $$shell_path($$PREFIX/*)
zip.target = zip zip.target = zip
zip.depends = install zip.depends = install
zip.commands = $$shell_path($$shell_quote($$PWD/resources/scripts/7za/7za.exe)) a -tzip $$TARGET-$$APP_VERSION-win32.zip $$shell_path($$PREFIX/*) zip.commands = $$shell_path($$shell_quote($$PWD/resources/scripts/7za/7za.exe)) a -tzip $$TARGET-$$APP_VERSION-$$APP_REVISION-win32.zip $$shell_path($$PREFIX/*)
QMAKE_EXTRA_TARGETS += seven_zip zip QMAKE_EXTRA_TARGETS += seven_zip zip
} }
@ -551,7 +551,7 @@ win32 {
nsis.target = nsis nsis.target = nsis
nsis.depends = install nsis.depends = install
nsis.commands = \ nsis.commands = \
$$shell_path($$shell_quote($$PWD/resources/scripts/sed/sed.exe)) -e \"s|@APP_VERSION@|$$APP_VERSION|g; s|@APP_NAME@|$$APP_NAME|g; s|@APP_LOW_NAME@|$$APP_LOW_NAME|g; s|@EXE_NAME@|$${APP_LOW_NAME}.exe|g; s|@PWD@|$$replace(PWD, /, \\\\)|g; s|@OUT_PWD@|$$replace(OUT_PWD, /, \\\\)|g\" $$shell_path($$shell_quote($$PWD/resources/nsis/NSIS.definitions.nsh.in)) > $$shell_path($$shell_quote($$OUT_PWD/NSIS.definitions.nsh)) && \ $$shell_path($$shell_quote($$PWD/resources/scripts/sed/sed.exe)) -e \"s|@APP_VERSION@|$$APP_VERSION|g; s|@APP_REVISION@|$$APP_REVISION|g; s|@APP_NAME@|$$APP_NAME|g; s|@APP_LOW_NAME@|$$APP_LOW_NAME|g; s|@EXE_NAME@|$${APP_LOW_NAME}.exe|g; s|@PWD@|$$replace(PWD, /, \\\\)|g; s|@OUT_PWD@|$$replace(OUT_PWD, /, \\\\)|g\" $$shell_path($$shell_quote($$PWD/resources/nsis/NSIS.definitions.nsh.in)) > $$shell_path($$shell_quote($$OUT_PWD/NSIS.definitions.nsh)) && \
xcopy /Y $$shell_path($$shell_quote($$PWD/resources/nsis/NSIS.template.in)) $$shell_path($$shell_quote($$OUT_PWD/)) && \ xcopy /Y $$shell_path($$shell_quote($$PWD/resources/nsis/NSIS.template.in)) $$shell_path($$shell_quote($$OUT_PWD/)) && \
$$shell_path($$shell_quote($$PWD/resources/scripts/nsis/makensis.exe)) $$shell_path($$shell_quote($$OUT_PWD/NSIS.template.in)) $$shell_path($$shell_quote($$PWD/resources/scripts/nsis/makensis.exe)) $$shell_path($$shell_quote($$OUT_PWD/NSIS.template.in))