diff --git a/goldendict.pro b/goldendict.pro index 9e3d8ec3..fc780cb9 100644 --- a/goldendict.pro +++ b/goldendict.pro @@ -1,18 +1,18 @@ TEMPLATE = app TARGET = goldendict -VERSION = 1.5.0-RC2+git +VERSION = 22.2.alpha # Generate version file. We do this here and in a build rule described later. # The build rule is required since qmake isn't run each time the project is # rebuilt; and doing it here is required too since any other way the RCC # compiler would complain if version.txt wouldn't exist (fresh checkouts). -system(git describe --tags --always --dirty > version.txt): hasGit=1 +system(git describe --tags --always --dirty): hasGit=1 -isEmpty( hasGit ) { - message(Failed to precisely describe the version via Git -- using the default version string) - system(echo $$VERSION > version.txt) +!isEmpty(hasGit){ + GIT_HASH=$$system(git rev-parse --short HEAD ) } +system(echo $${VERSION}.$${GIT_HASH} > version.txt) # DEPENDPATH += . generators INCLUDEPATH += . @@ -62,7 +62,7 @@ win32 { TARGET = GoldenDict win32-msvc* { - VERSION = 1.5.0 # More complicated things cause errors during compilation under MSVC++ + #VERSION = 22.2 # More complicated things cause errors during compilation under MSVC++ DEFINES += __WIN32 _CRT_SECURE_NO_WARNINGS contains(QMAKE_TARGET.arch, x86_64) { DEFINES += NOMINMAX __WIN64 @@ -611,11 +611,11 @@ TRANSLATIONS += locale/ru_RU.ts \ PRE_TARGETDEPS += $$PWD/version.txt revtarget.target = $$PWD/version.txt - !win32 { - revtarget.commands = cd $$PWD; git describe --tags --always --dirty > $$revtarget.target - } else { - revtarget.commands = git --git-dir=\"$$PWD/.git\" describe --tags --always --dirty > $$revtarget.target - } +# !win32 { +# revtarget.commands = cd $$PWD; git describe --tags --always --dirty > $$revtarget.target +# } else { +# revtarget.commands = git --git-dir=\"$$PWD/.git\" describe --tags --always --dirty > $$revtarget.target +# } ALL_SOURCES = $$SOURCES $$HEADERS $$FORMS for(src, ALL_SOURCES) {