diff --git a/python_modules/conf.py b/python_modules/conf.py index 7bd31b52..0367f9b6 100644 --- a/python_modules/conf.py +++ b/python_modules/conf.py @@ -46,6 +46,28 @@ des_files_deb64 = [paths.des_grub_etc, paths.des_main_line_pep_id ] +deb_64_cmds= ['lbinit', + 'inflate_bubble.set_fusato_structure', + 'inflate_bubble.set_desktop_environment', + 'inflate_bubble.set_extra_packages', + 'inflate_bubble.set_general_packages', + 'inflate_bubble.set_system_packages', + 'inflate_bubble.set_system_packages_64', + 'inflate_bubble.set_python_packages', + 'inflate_bubble.set_calamares_packages', + 'inflate_bubble.set_firmware_packages', + 'inflate_bubble.set_binary_packages_64', + 'copy_folders.copy_folders_files', + 'copy_files_specified.copy_specific_files', + 'copy_files_specified.set_symlinks', + 'copy_deb64_specific', + 'run_build', + 'finish_cleanup.make_check_sum', + 'finish_cleanup.copy_iso_file_nightly_deb64', + 'finish_cleanup.copy_iso_file_prod_deb64', + 'finish_cleanup.kill_old_iso' + ] + ### Inflate bubble section env_list =('xfce4') diff --git a/python_modules/deb_64.py b/python_modules/deb_64.py index b1865f02..7437507e 100644 --- a/python_modules/deb_64.py +++ b/python_modules/deb_64.py @@ -73,64 +73,28 @@ def run_build(): os.system(run_cmd) +def execute_build_cmds(): + """ Loop through the commands for the + Build Process + """ + cmd_list = collections.deque(conf.deb_64_cmds) + cmd_size = len(cmd_list) + for h in range(cmd_size): + x = cmd_list.popleft() + execute = x + '()' + execute + + def readybuild(): """" Ready the bld structure""" if os.path.exists('fusato'): rm_cmd = "sudo rm -r -f fusato" os.system(rm_cmd) os.makedirs('fusato') - # Run lb config to begin the setup - lbinit() - # Prep the folders - inflate_bubble.set_fusato_structure() - # Packages - inflate_bubble.set_desktop_environment() - inflate_bubble.set_extra_packages() - inflate_bubble.set_general_packages() - inflate_bubble.set_system_packages() - inflate_bubble.set_system_packages_64() - #inflate_bubble.set_artwork_packages() - inflate_bubble.set_python_packages() - inflate_bubble.set_calamares_packages() - inflate_bubble.set_firmware_packages() - inflate_bubble.set_binary_packages_64() - copy_folders.copy_folders_files() - copy_files_specified.copy_specific_files() - copy_files_specified.set_symlinks() - copy_deb64_specific() - run_build() - finish_cleanup.make_check_sum() - finish_cleanup.copy_iso_file_nightly_deb64() - finish_cleanup.copy_iso_file_prod_deb64() - finish_cleanup.kill_old_iso() - + execute_build_cmds() else: os.makedirs('fusato') - # Run lb config to begin the setup - lbinit() - # Prep the folders - inflate_bubble.set_fusato_structure() - # Packages - inflate_bubble.set_desktop_environment() - inflate_bubble.set_extra_packages() - inflate_bubble.set_general_packages() - inflate_bubble.set_system_packages() - inflate_bubble.set_system_packages_64() - #inflate_bubble.set_artwork_packages() - inflate_bubble.set_python_packages() - inflate_bubble.set_calamares_packages() - inflate_bubble.set_firmware_packages() - inflate_bubble.set_binary_packages_64() - copy_folders.copy_folders_files() - copy_files_specified.copy_specific_files() - copy_files_specified.set_symlinks() - copy_deb64_specific() - run_build() - finish_cleanup.make_check_sum() - finish_cleanup.copy_iso_file_nightly_deb64() - finish_cleanup.copy_iso_file_prod_deb64() - finish_cleanup.kill_old_iso() - + execute_build_cmds() readybuild()