matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disconnect version numbers from the content of v* tags

Browse Source
This commit is contained in:
Tamás Bálint Misius 2021-04-16 17:54:25 +02:00
parent 824372102f
commit b94e26d6f0
No known key found for this signature in database
GPG Key ID: 5B472A12F6ECA9F2
4 changed files with 6 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/get-type.py vendored
View File

@ -9,7 +9,7 @@ match_snapshot = re.match(r'refs/tags/snapshot-([0-9]+)', ref)
if match_stable:
print('::set-output name=TYPE::stable')
print('::set-output name=NAME::v%s.%s.%s' % (match_stable.group(1), match_stable.group(2), match_stable.group(3)))
print('::set-output name=RELTYPECFG::%s' % base64.b64encode(('-Dignore_updates=false\t-Dversion_major=%s\t-Dversion_minor=%s\t-Dversion_build=%s' % (match_stable.group(1), match_stable.group(2), match_stable.group(3))).encode('utf-8')).decode('utf-8'))
print('::set-output name=RELTYPECFG::%s' % base64.b64encode(('-Dignore_updates=false').encode('utf-8')).decode('utf-8'))
elif match_snapshot:
print('::set-output name=TYPE::snapshot')
print('::set-output name=NAME::snapshot-%s' % match_snapshot.group(1))

5
meson.build
View File

@ -261,15 +261,10 @@ conf_data.set('PIX32OGL', get_option('ogli'))
conf_data.set('BETA', get_option('beta'))
conf_data.set('NO_INSTALL_CHECK', not get_option('install_check'))
conf_data.set('IGNORE_UPDATES', get_option('ignore_updates'))
conf_data.set('SAVE_VERSION', get_option('version_major'))
conf_data.set('MINOR_VERSION', get_option('version_minor'))
conf_data.set('BUILD_NUM', get_option('version_build'))
conf_data.set('MOD_ID', get_option('mod_id'))
conf_data.set('DEBUG', get_option('debug'))
conf_data.set('SNAPSHOT', get_option('snapshot'))
conf_data.set('SNAPSHOT_ID', get_option('snapshot_id'))
conf_data.set('FUTURE_SAVE_VERSION', get_option('future_major'))
conf_data.set('FUTURE_MINOR_VERSION', get_option('future_minor'))
conf_data.set('SERVER', '"' + get_option('server') + '"')
conf_data.set('STATICSERVER', '"' + get_option('static_server') + '"')
if get_option('update_server') != ''

35
meson_options.txt
View File

@ -41,27 +41,6 @@ option(
value: false,
description: 'Snapshot build'
)
option(
'version_major',
type: 'integer',
min: 0,
value: 95,
description: 'Major version'
)
option(
'version_minor',
type: 'integer',
min: 0,
value: 0,
description: 'Minor version'
)
option(
'version_build',
type: 'integer',
min: 0,
value: 345,
description: 'Build number'
)
option(
'snapshot_id',
type: 'integer',
@ -69,20 +48,6 @@ option(
value: 199,
description: 'Snapshot ID, only relevant if \'snapshot\' is true'
)
option(
'future_major',
type: 'integer',
min: 0,
value: 96,
description: 'Future major version, used for debugging and in snapshots, only relevant if at least one of \'snapshot\', \'beta\', or \'debug\' is true, or if \'mod_id\' is set'
)
option(
'future_minor',
type: 'integer',
min: 0,
value: 0,
description: 'Future minor version, similar to \'future_major\''
)
option(
'mod_id',
type: 'integer',

10
src/Config.template.h
View File

@ -40,13 +40,13 @@
#endif
//VersionInfoStart
#mesondefine SAVE_VERSION
#mesondefine MINOR_VERSION
#mesondefine BUILD_NUM
#define SAVE_VERSION 95
#define MINOR_VERSION 0
#define BUILD_NUM 345
#mesondefine SNAPSHOT_ID
#mesondefine MOD_ID
#mesondefine FUTURE_SAVE_VERSION
#mesondefine FUTURE_MINOR_VERSION
#define FUTURE_SAVE_VERSION 96
#define FUTURE_MINOR_VERSION 0
#if !(defined(SNAPSHOT) || defined(BETA) || defined(DEBUG) || MOD_ID > 0)
#undef FUTURE_SAVE_VERSION