Testing: Changes to Modules
Signed-off-by: debianpepper <pdpdebdevuan@protonmail.com>
This commit is contained in:
parent
b2a69a95ad
commit
e1cb1b0dfd
|
@ -48,8 +48,9 @@ class BuildXfce:
|
|||
""" init the build process"""
|
||||
self.sbase = sbase
|
||||
self.sarch = sarch
|
||||
self.change_to_fusato_root_and_build()
|
||||
|
||||
self.change_to_fusato_root_and_build()
|
||||
|
||||
|
||||
def change_to_fusato_root_and_build(self):
|
||||
""" change to the correct folder for the build """
|
||||
os.chdir(HOME_FOLDER + FUSATO_ROOT)
|
||||
|
@ -64,7 +65,9 @@ class BuildXfce:
|
|||
if self.sbase in ["deb", "dev"]:
|
||||
arch_suffix = self.sarch[1:]
|
||||
if arch_suffix in ["64", "32", "arm"]:
|
||||
lbsetup = getattr(conf, f"LBSET_{self.sbase.upper()}{arch_suffix}")
|
||||
lbsetup = getattr(conf,
|
||||
f"LBSET_{self.sbase.upper()}{arch_suffix}"
|
||||
)
|
||||
os.system(lbsetup)
|
||||
return lbsetup
|
||||
|
||||
|
@ -73,39 +76,25 @@ class BuildXfce:
|
|||
"""
|
||||
Helper for the infra classes this is shared for all builds
|
||||
"""
|
||||
infra.ChrootFolders(self.sbase, self.sarch)
|
||||
infra.BinaryFolders(self.sbase, self.sarch)
|
||||
infra.ArchitectureFiles(self.sbase, self.sarch)
|
||||
infra.Archive(self.sbase, self.sarch)
|
||||
infra_methods = [infra.ChrootFolders, infra.BinaryFolders,
|
||||
infra.ArchitectureFiles, infra.Archive
|
||||
]
|
||||
for method in infra_methods:
|
||||
method(self.sbase, self.sarch)
|
||||
|
||||
|
||||
def xfce_helper(self):
|
||||
"""
|
||||
Helper for the xfce desktop shared for all builds
|
||||
"""
|
||||
if self.sarch[1:] == "64":
|
||||
cmd_list = collections.deque(conf.build64_xfce_build)
|
||||
list_size = len(cmd_list)
|
||||
for _ in range(list_size):
|
||||
i = cmd_list.popleft()
|
||||
execute = i + '()'
|
||||
arch_suffix = self.sarch[1:]
|
||||
cmd_list = None
|
||||
if arch_suffix in ["64", "32", "arm"]:
|
||||
cmd_list = getattr(conf, f"build{arch_suffix}_xfce_build", [])
|
||||
for command in cmd_list:
|
||||
execute = command + '()'
|
||||
exec(execute)
|
||||
elif self.sarch[1:] == "32":
|
||||
cmd_list = collections.deque(conf.build32_xfce_build)
|
||||
list_size = len(cmd_list)
|
||||
for _ in range(list_size):
|
||||
i = cmd_list.popleft()
|
||||
execute = i + '()'
|
||||
exec(execute)
|
||||
elif self.sarch[1:] == "arm":
|
||||
cmd_list = collections.deque(conf.buildarm_xfce_build)
|
||||
list_size = len(cmd_list)
|
||||
for _ in range(list_size):
|
||||
i = cmd_list.popleft()
|
||||
execute = i + '()'
|
||||
exec(execute)
|
||||
else:
|
||||
cmd_list = None
|
||||
return cmd_list
|
||||
|
||||
|
||||
def cleanup_helper(self):
|
||||
|
|
Loading…
Reference in New Issue