From 5058d6cf0c30a6e7d6633c2e3c782c5cf8305f5b Mon Sep 17 00:00:00 2001 From: EndrII Date: Fri, 16 Apr 2021 10:47:28 +0300 Subject: [PATCH 1/2] ref #14 fixed custom builds --- BuildBotLib/make.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/BuildBotLib/make.py b/BuildBotLib/make.py index 55c4932..d2e2715 100644 --- a/BuildBotLib/make.py +++ b/BuildBotLib/make.py @@ -12,9 +12,28 @@ class Make(BaseModule): def __init__(self, platform): BaseModule.__init__(self, platform, - util.Interpolate('%(prop:project)s')) + self.getProject()) self.tempRepoDir = "" + def getProject(self): + + @util.renderer + def cmdWraper(step): + repository = step.getProperty('repository') + + if not len(repository): + return "build" + + repository = repository.replace('.git', '') + begin = repository.rfind('/') + begin = max(repository.rfind('/', 0, begin), + repository.rfind(':', 0, begin)) + + project = repository[begin + 1:len(repository)] + return project + + return cmdWraper + def isSupport(self, step): return True From acd1d3001eac4f52488068a96ca4cca06c9a21c0 Mon Sep 17 00:00:00 2001 From: EndrII Date: Fri, 16 Apr 2021 11:09:49 +0300 Subject: [PATCH 2/2] ref #14 added a return with default value if the begin index do not findet. --- BuildBotLib/make.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/BuildBotLib/make.py b/BuildBotLib/make.py index d2e2715..0b0a995 100644 --- a/BuildBotLib/make.py +++ b/BuildBotLib/make.py @@ -29,6 +29,9 @@ class Make(BaseModule): begin = max(repository.rfind('/', 0, begin), repository.rfind(':', 0, begin)) + if begin < 0: + return "build" + project = repository[begin + 1:len(repository)] return project