From e6715db53a6236ec6a3b0336c60856f00105d110 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Fri, 26 Apr 2013 22:17:09 +0200 Subject: [PATCH] [DEV] simplify command request --- lutinTarget.py | 68 +++++++++++++++++++-------------------------- lutinTargetLinux.py | 2 +- 2 files changed, 29 insertions(+), 41 deletions(-) diff --git a/lutinTarget.py b/lutinTarget.py index 440edd8..36a7b26 100644 --- a/lutinTarget.py +++ b/lutinTarget.py @@ -185,48 +185,36 @@ class Target: for mod in self.moduleList: mod.Clean(self) else: - myLen = len(name) - if name[myLen-8:] == "-install": - tmpName = name[:myLen-8] - self.Build(tmpName + "-build") - self.InstallPackage(tmpName) - elif name[myLen-10:] == "-uninstall": - tmpName = name[:myLen-10] - self.UnInstallPackage(tmpName) - elif name[myLen-4:] == "-log": - tmpName = name[:myLen-4] - self.Log(tmpName) - elif name[myLen-5:] == "-dump": - tmpName = name[:myLen-5] - self.LoadIfNeeded(tmpName) - # clean requested - for mod in self.moduleList: - if mod.name == tmpName: - debug.info("dump module '" + tmpName + "'") - mod.Display(self) - return - debug.error("not know module name : '" + cleanName + "' to clean it") - elif name[myLen-6:] == "-clean": - cleanName = name[:myLen-6] - self.LoadIfNeeded(cleanName) - # clean requested - for mod in self.moduleList: - if mod.name == cleanName: - debug.info("Clean module '" + cleanName + "'") - mod.Clean(self) - return - debug.error("not know module name : '" + cleanName + "' to clean it") + # get the action an the module .... + gettedElement = name.split("-") + moduleName = gettedElement[0] + if len(gettedElement)>=2: + actionName = gettedElement[1] + else : + actionName = "build" + debug.verbose("requested : " + moduleName + "-" + actionName) + if actionName == "install": + self.Build(moduleName + "-build") + self.InstallPackage(moduleName) + elif actionName == "uninstall": + self.UnInstallPackage(moduleName) + elif actionName == "log": + self.Log(moduleName) else: - tmpName = name - if name[myLen-6:] == "-build": - tmpName = name[:myLen-6] - # Build requested - self.LoadIfNeeded(tmpName) + self.LoadIfNeeded(moduleName) + # clean requested for mod in self.moduleList: - if mod.name == tmpName: - debug.info("Build module '" + tmpName + "'") - return mod.Build(self, None) - debug.error("not know module name : '" + tmpName + "' to build it") + if mod.name == moduleName: + if actionName == "dump": + debug.info("dump module '" + moduleName + "'") + return mod.Display(self) + elif actionName == "clean": + debug.info("clean module '" + moduleName + "'") + return mod.Clean(self) + elif actionName == "build": + debug.info("build module '" + moduleName + "'") + return mod.Build(self, None) + debug.error("not know module name : '" + moduleName + "' to '" + actionName + "' it") __startTargetName="lutinTarget" diff --git a/lutinTargetLinux.py b/lutinTargetLinux.py index 85b5571..631fb02 100644 --- a/lutinTargetLinux.py +++ b/lutinTargetLinux.py @@ -23,7 +23,7 @@ class Target(lutinTarget.Target): def MakePackage(self, pkgName, pkgProperties): # http://alp.developpez.com/tutoriels/debian/creer-paquet/ debug.debug("------------------------------------------------------------------------") - debug.info("Generate package '" + pkgName + "'") + debug.info("Generate package '" + pkgName + "' v"+pkgProperties["VERSION"]) debug.debug("------------------------------------------------------------------------") self.GetStagingFolder(pkgName) targetOutFolderDebian=self.GetStagingFolder(pkgName) + "/DEBIAN/"