From 7e5d8db3614f1c4d55558f5e3b00e591e50845bb Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Thu, 10 Sep 2015 21:50:26 +0200 Subject: [PATCH] [DEV] add list of element package (no package generated) --- lutin/module.py | 2 +- lutin/z_target/lutinTarget_Linux.py | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lutin/module.py b/lutin/module.py index a0abf03..196c2ed 100644 --- a/lutin/module.py +++ b/lutin/module.py @@ -610,7 +610,7 @@ class Module: self.sub_heritage_list.add_heritage(self.local_heritage) target.make_package(self.name, self.package_prop, os.path.join(self.origin_path, ".."), self.sub_heritage_list) else: - target.make_package(self.name, self.package_prop, os.path.join(self.origin_path, "..")) + target.make_package(self.name, self.package_prop, os.path.join(self.origin_path, ".."), self.sub_heritage_list) # return local dependency ... return self.sub_heritage_list diff --git a/lutin/z_target/lutinTarget_Linux.py b/lutin/z_target/lutinTarget_Linux.py index fd72ff1..9996bf6 100644 --- a/lutin/z_target/lutinTarget_Linux.py +++ b/lutin/z_target/lutinTarget_Linux.py @@ -48,13 +48,13 @@ class Target(target.Target): result += elem return result - def make_package(self, pkgName, pkgProperties, basePkgPath, type="generic"): + def make_package(self, pkgName, pkgProperties, basePkgPath, heritage_list, type="generic"): if type == "debian": - self.make_package_debian(pkgName, pkgProperties, basePkgPath) + self.make_package_debian(pkgName, pkgProperties, basePkgPath, heritage_list) elif type == "generic": - self.make_package_generic(pkgName, pkgProperties, basePkgPath) + self.make_package_generic(pkgName, pkgProperties, basePkgPath, heritage_list) - def make_package_debian(self, pkgName, pkgProperties, basePkgPath): + def make_package_debian(self, pkgName, pkgProperties, basePkgPath, heritage_list): # http://alp.developpez.com/tutoriels/debian/creer-paquet/ debianPkgName = re.sub("_", "-", pkgName) debug.debug("------------------------------------------------------------------------") @@ -178,7 +178,10 @@ class Target(target.Target): * *--> YY *--> sources """ - def make_package_generic(self, pkgName, pkgProperties, basePkgPath): + def make_package_generic(self, pkgName, pkgProperties, basePkgPath, heritage_list): + debug.warning("heritage for " + str(pkgName) + ":") + for heritage in heritage_list.list_heritage: + debug.warning("heritage .... " + str(heritage.name) + " : " + str(heritage.depends)) debianPkgName = re.sub("_", "-", pkgName) debug.debug("------------------------------------------------------------------------") debug.info("Generate generic '" + debianPkgName + "' v"+pkgProperties["VERSION"])