Make the version number 1.20000.x if the branch name is <digit>.x or <digit>.<digit>.x

This commit is contained in:
Dan Hawkins 2018-02-19 18:14:49 +00:00
commit 061b3d4fcf
2 changed files with 4 additions and 4 deletions

View file

@ -3,6 +3,6 @@
<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
<path>/${PROJECT_DIR_NAME}</path>
</pydev_pathproperty>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python interpreter</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">python35</pydev_property>
</pydev_project>

View file

@ -68,7 +68,7 @@ def getGitRevision(gitrootpath, basenumber):
# Handle:
# origin/master
# origin/2.0.x
def getVersionPrefix(sourcebranch):
def getVersionPrefix(sourcebranch):
print("Determining version number prefix from source branch name: {0}".format(sourcebranch))
defaultversionprefix = "1.30000.0."
@ -90,14 +90,14 @@ def getGitRevision(gitrootpath, basenumber):
versionprefix = defaultversionprefix
else:
splitnumbercount = 0
isIntermediateReleaseBranch = false
isIntermediateReleaseBranch = False
for split in splits:
if split.isdigit():
versionprefix += split + "."
splitnumbercount += 1
else:
if split == "x":
isIntermediateReleaseBranch = true
isIntermediateReleaseBranch = True
break
if splitnumbercount > 2:
break