Droog71
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Droog71:aca552242f5ee9a16240544d76d0968c1d45a7e9
Branches Tags
Droog71:master
...
compare: Droog71:0aa043a6702eaa05acf4218a884c241c75cd4c19
Branches Tags
Droog71:master

5 Commits
aca552242f ... 0aa043a670

Author SHA1 Message Date
Droog71 0aa043a670
Merge pull request #4 from colobot/master 
Update to latest version.
 2020-07-16 08:26:55 -04:00
MrSimbax d4ab82eaae Release 0.1.12-alpha: Bump version 2019-02-23 20:01:33 +01:00
MrSimbax 6ec644d20b Release 0.1.12-alpha: Merge branch 'dev' 2019-02-23 20:01:33 +01:00
MrSimbax 7d99aa954b Fix release.py 2019-02-23 20:01:21 +01:00
MrSimbax 46098834a1 Update data submodule 2019-02-23 18:54:39 +01:00
3 changed files with 5 additions and 5 deletions
Show Stats Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -13,12 +13,12 @@ project(colobot C CXX)
set(COLOBOT_VERSION_CODENAME "Gold")
set(COLOBOT_VERSION_MAJOR 0)
set(COLOBOT_VERSION_MINOR 1)
set(COLOBOT_VERSION_REVISION 11.1)
set(COLOBOT_VERSION_REVISION 12)
# Used on official releases
#set(COLOBOT_VERSION_RELEASE_CODENAME "-alpha")
set(COLOBOT_VERSION_RELEASE_CODENAME "-alpha")
# Used on unreleased, development builds
set(COLOBOT_VERSION_UNRELEASED "+alpha")
#set(COLOBOT_VERSION_UNRELEASED "+alpha")
# Append git characteristics to version
if(DEFINED COLOBOT_VERSION_UNRELEASED)

2
data

@ -1 +1 @@
Subproject commit 8597221e4ddbb9016e7aba46c508dca84f3aa1d6
Subproject commit c467bd994e60fb54cf977fbe8583f92957330695

2
tools/release.py
View File

@ -73,7 +73,7 @@ codename = None
data = open('CMakeLists.txt', 'r').readlines()
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:
x = m.group(3)
if m.group(1) == 'MAJOR':