Compare commits
5 Commits
aca552242f
...
0aa043a670
Author | SHA1 | Date |
---|---|---|
|
0aa043a670 | |
|
d4ab82eaae | |
|
6ec644d20b | |
|
7d99aa954b | |
|
46098834a1 |
|
@ -13,12 +13,12 @@ project(colobot C CXX)
|
||||||
set(COLOBOT_VERSION_CODENAME "Gold")
|
set(COLOBOT_VERSION_CODENAME "Gold")
|
||||||
set(COLOBOT_VERSION_MAJOR 0)
|
set(COLOBOT_VERSION_MAJOR 0)
|
||||||
set(COLOBOT_VERSION_MINOR 1)
|
set(COLOBOT_VERSION_MINOR 1)
|
||||||
set(COLOBOT_VERSION_REVISION 11.1)
|
set(COLOBOT_VERSION_REVISION 12)
|
||||||
|
|
||||||
# Used on official releases
|
# Used on official releases
|
||||||
#set(COLOBOT_VERSION_RELEASE_CODENAME "-alpha")
|
set(COLOBOT_VERSION_RELEASE_CODENAME "-alpha")
|
||||||
# Used on unreleased, development builds
|
# Used on unreleased, development builds
|
||||||
set(COLOBOT_VERSION_UNRELEASED "+alpha")
|
#set(COLOBOT_VERSION_UNRELEASED "+alpha")
|
||||||
|
|
||||||
# Append git characteristics to version
|
# Append git characteristics to version
|
||||||
if(DEFINED COLOBOT_VERSION_UNRELEASED)
|
if(DEFINED COLOBOT_VERSION_UNRELEASED)
|
||||||
|
|
2
data
2
data
|
@ -1 +1 @@
|
||||||
Subproject commit 8597221e4ddbb9016e7aba46c508dca84f3aa1d6
|
Subproject commit c467bd994e60fb54cf977fbe8583f92957330695
|
|
@ -73,7 +73,7 @@ codename = None
|
||||||
data = open('CMakeLists.txt', 'r').readlines()
|
data = open('CMakeLists.txt', 'r').readlines()
|
||||||
|
|
||||||
for i in range(len(data)):
|
for i in range(len(data)):
|
||||||
m = re.match(r'^set\(COLOBOT_VERSION_(MAJOR|MINOR|REVISION)( +)([0-9]+)\)$', data[i])
|
m = re.match(r'^set\(COLOBOT_VERSION_(MAJOR|MINOR|REVISION)( +)([0-9]+(\.[0-9]+)?)\)$', data[i])
|
||||||
if m:
|
if m:
|
||||||
x = m.group(3)
|
x = m.group(3)
|
||||||
if m.group(1) == 'MAJOR':
|
if m.group(1) == 'MAJOR':
|
||||||
|
|
Loading…
Reference in New Issue