From d5160b436fe33bc042c94f3c9061b1c9daa703fb Mon Sep 17 00:00:00 2001 From: Glowbal Date: Tue, 18 Oct 2016 22:14:19 +0200 Subject: [PATCH] Fix build tools not working with two digit build numbers --- tools/make.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/make.py b/tools/make.py index f694791634..530eeaf032 100644 --- a/tools/make.py +++ b/tools/make.py @@ -583,8 +583,8 @@ def set_version_in_files(): newVersionShort = newVersion[:-2] # MAJOR.MINOR.PATCH # Regex patterns - pattern = re.compile(r"(\b[0\.-9]+\b\.[0\.-9]+\b\.[0\.-9]+\b\.[0\.-9]+)") # MAJOR.MINOR.PATCH.BUILD - patternShort = re.compile(r"(\b[0\.-9]+\b\.[0\.-9]+\b\.[0\.-9]+)") # MAJOR.MINOR.PATCH + pattern = re.compile(r"([\d]+\.[\d]+\.[\d]+\.[\d]+)") # MAJOR.MINOR.PATCH.BUILD + patternShort = re.compile(r"([\d]+\.[\d]+\.[\d]+)") # MAJOR.MINOR.PATCH # Change versions in files containing version for i in versionFiles: @@ -608,6 +608,7 @@ def set_version_in_files(): # First item in the list findall returns versionFound = versionFound[0] + newVersionUsed = "" # Use the same version length as the one found if len(versionFound) == len(newVersion): newVersionUsed = newVersion