diff --git a/BuildBotLib/qtUpdater.py b/BuildBotLib/qtUpdater.py index 469f7fb..38b992b 100644 --- a/BuildBotLib/qtUpdater.py +++ b/BuildBotLib/qtUpdater.py @@ -189,13 +189,14 @@ class QtUpdater(Make): 'android': self.lsAndroid, } + return self.generateCmd(platformLsCmd[platform]) + + def installExtraStep(self, platform): cpCmd = { 'windows': self.cpExtraWindows(), } - stringCmd = platformLsCmd[platform] + "; " + cpCmd.get(platform, "") - - return self.generateCmd(stringCmd) + return self.generateCmd(cpCmd.get(platform, "")) def generateInstallStep(self, platform): @@ -207,6 +208,11 @@ class QtUpdater(Make): "install qt into worker", dustepIf)] + res = [self.generateStep(self.installExtraStep(platform), + platform, + "copy qt assets into worker", + dustepIf)] + res += [self.generateStep(['git', 'clean', '-xdf'], platform, "clean old build data",