fix url

BuildBotLib/make.py

@@ -25,11 +25,14 @@ class Make(BaseModule):
     def isTest(self, step):
         return step.getProperty('test')
 
+    def getNameProjectFromGitUrl(self, url):
+        return url[url.rfind('/'): len(url) - 4]
+
     def destDirPrivate(self, props):
         repo = str(props.getProperty('repository'))
         now = datetime.datetime.now().strftime("(%H_%M)_%m-%d-%Y")
 
-        return repo[repo.rfind('/'): len(repo) - 4] + "/" + now
+        return self.getNameProjectFromGitUrl(repo) + "/" + now
 
     def tempDirPrivate(self, props):
         repo = str(props.getProperty('repository'))
@@ -186,10 +189,16 @@ class Make(BaseModule):
             def tempDir(props):
                 return self.tempRepoDir
 
+            @util.renderer
+            def projectName(props):
+                repo = str(props.getProperty('repository'))
+                return self.getNameProjectFromGitUrl(repo)
+
             res += [steps.Trigger(schedulerNames=['repogen'],
                                   doStepIf=lambda step: self.isRelease(step),
                                   set_properties={"tempPackage": self.tempDir,
-                                                  "platform": platform}
+                                                  "platform": platform,
+                                                  "projectName": projectName}
                                   )]
 
         res += [self.generateStep(self.makeTarget('distclean'),

BuildBotLib/qifRepogen.py

@@ -13,6 +13,12 @@ class QIFRepogen (BaseModule):
 
         def generateRepogenCmd(props):
             repoLocation = props.getProperty('repoLocation') + "/"
+            projectName = props.getProperty('projectName')
+
+            if (len(projectName) <= 0):
+                raise Exception('Project undefined')
+
+            repoLocation += projectName + "/"
             repoLocation += props.getProperty('platform')
             tempPackage = props.getProperty('tempPackage')
 
@@ -65,10 +71,16 @@ class QIFRepogen (BaseModule):
 
             util.StringParameter(
                 name='platform',
-                label='target platform (linux of windows)',
+                label='target platform (linux, windows)',
                 default=BaseModule.P_Linux
             ),
 
+            util.StringParameter(
+                name='projectName',
+                label='name of buildet project',
+                default=''
+            ),
+
             util.StringParameter(
                 name='repoLocation',
                 label='repository location',