Skip to content

Commit 658e791

Browse files
jpakkaneRobotLeopard86
authored andcommitted
Bump version number for 1.10 rc1.
1 parent b1aad51 commit 658e791

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

mesonbuild/coredata.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
#
4545
# Pip requires that RCs are named like this: '0.1.0.rc1'
4646
# But the corresponding Git tag needs to be '0.1.0rc1'
47-
version = '1.9.99'
47+
version = '1.10.0.rc1'
4848

4949
# The next stable version when we are in dev. This is used to allow projects to
5050
# require meson version >=1.2.0 when using 1.1.99. FeatureNew won't warn when

packaging/mpackage.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,19 @@
2525

2626
fname = os.path.split(infile)[1]
2727
tmp = fname.replace('-', '_')
28-
if '0rc' in fname:
29-
version = tmp[6:-7]
30-
base_version = tmp[6:-10]
28+
29+
assert fname.endswith('.tar.gz')
30+
version_part = fname.split('-', 1)[1][:-7]
31+
32+
if 'rc' in version_part:
33+
base_version, rcnum = version_part.split('rc')
34+
version = base_version + 'rc' + rcnum
3135
extension = tmp[-7:]
32-
rcnum = tmp[-8:-7]
3336
dchversion = base_version + '~rc' + rcnum
34-
origname = tmp[:11] + '~rc' + rcnum + '.orig' + extension
37+
origname = tmp.split('rc', 1)[0] + '~rc' + rcnum + '.orig' + extension
3538
else:
36-
origname = tmp[:11] + '.orig.' + tmp[-6:]
37-
version = tmp[6:-7]
39+
origname = tmp[:-7] + '.orig.' + tmp[-6:]
40+
version = version_part
3841
dchversion = version
3942
version_lines = pathlib.Path(relfile).read_text().split('\n')[:-1]
4043
prev_ver = version_lines[-1]

0 commit comments

Comments
 (0)