aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge with develop.

Browse Source 
--HG--
branch : feature
This commit is contained in:
dismine 2015-01-23 12:11:12 +02:00
commit bdc1fa2e7f
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/debian/changelog vendored
View File

@ -1,4 +1,4 @@
valentina (0.2.8-alpha) trusty; urgency=low valentina (0.2.9) trusty; urgency=low
* Auto build. * Auto build.

2
dist/nsis/valentina.nsi vendored
View File

@ -14,7 +14,7 @@ SetCompressor /FINAL /SOLID lzma
!define MUI_FILE "valentina" !define MUI_FILE "valentina"
!insertmacro GetPEVersionLocal "c:\pack\valentina\valentina.exe" ver !insertmacro GetPEVersionLocal "c:\pack\valentina\valentina.exe" ver
!define MUI_VERSION "${ver_1}.${ver_2}.${ver_3}-alpha" !define MUI_VERSION "${ver_1}.${ver_2}.${ver_3}"
!define MUI_BRANDINGTEXT "Valentina ${MUI_VERSION}" !define MUI_BRANDINGTEXT "Valentina ${MUI_VERSION}"
!define WEBSITE_LINK "http://www.valentina-project.org/" !define WEBSITE_LINK "http://www.valentina-project.org/"

2
dist/rpm/valentina.spec vendored
View File

@ -25,7 +25,7 @@ BuildRequires: ccache
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
%endif %endif
Version: 0.2.8 Version: 0.2.9
Release: 0 Release: 0
URL: https://bitbucket.org/dismine/valentina URL: https://bitbucket.org/dismine/valentina
License: GPL-3.0+ License: GPL-3.0+

8
src/app/app.pro
View File

@ -109,7 +109,7 @@ CONFIG(debug, debug|release){
#Calculate latest tag distance and build revision only in release mode. Change number each time requare #Calculate latest tag distance and build revision only in release mode. Change number each time requare
#recompilation precompiled headers file. #recompilation precompiled headers file.
DEFINES += "LATEST_TAG_DISTANCE=0" DEFINES += "LATEST_TAG_DISTANCE=0"
DEFINES += "BUILD_REVISION=\\\"uknown\\\"" DEFINES += "BUILD_REVISION=\\\"unknown\\\""
}else{ }else{
# Release mode # Release mode
DEFINES += V_NO_ASSERT DEFINES += V_NO_ASSERT
@ -126,7 +126,7 @@ CONFIG(debug, debug|release){
} }
#latest tag distance number for using in version #latest tag distance number for using in version
HG_DISTANCE=$$system(hg log -r tip --template '{latesttagdistance}') HG_DISTANCE=$$system(hg log -r. --template '{latesttagdistance}')
isEmpty(HG_DISTANCE){ isEmpty(HG_DISTANCE){
HG_DISTANCE = 0 # if we can't find local revision left 0. HG_DISTANCE = 0 # if we can't find local revision left 0.
} }
@ -135,10 +135,10 @@ CONFIG(debug, debug|release){
#build revision number for using in version #build revision number for using in version
unix { unix {
HG_HESH=$$system("hg log -r tip --template '{node|short}'") HG_HESH=$$system("hg log -r. --template '{node|short}'")
} else { } else {
# Use escape character before "|" on Windows # Use escape character before "|" on Windows
HG_HESH=$$system(hg log -r tip --template "{node^|short}") HG_HESH=$$system(hg log -r. --template "{node^|short}")
} }
isEmpty(HG_HESH){ isEmpty(HG_HESH){
HG_HESH = "unknown" # if we can't find build revision left unknown. HG_HESH = "unknown" # if we can't find build revision left unknown.