From patchwork Mon Apr 9 14:13:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [bitbake-devel, 09/21] Hob: clean up and unify the steps for PACKAGE_GENERATING and FAST_IMAGE_GENERATING to call generate_packages_async() and fast_generate_image_async() Date: Mon, 09 Apr 2012 14:13:39 -0000 From: Shane Wang X-Patchwork-Id: 25403 Message-Id: <9777caf8458702194379782790fd2f063b12f754.1333980505.git.shane.wang@intel.com> To: bitbake-devel@lists.openembedded.org For the steps in PACKAGE_GENERATING, the patch consolidates them into generate_packages_async() to call. For the steps in FAST_IMAGE_GENERATING, the patch also consolidates them into fast_generate_image_async() to call. Signed-off-by: Shane Wang --- bitbake/lib/bb/ui/crumbs/builder.py | 30 +++++++++++++++++++----------- 1 files changed, 19 insertions(+), 11 deletions(-) diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index a0ad5a0..8a95b94 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py @@ -345,6 +345,22 @@ class Builder(gtk.Window): self.set_user_config() self.handler.generate_recipes() + def generate_packages_async(self): + self.switch_page(self.PACKAGE_GENERATING) + # Build packages + _, all_recipes = self.recipe_model.get_selected_recipes() + self.set_user_config() + self.handler.reset_build() + self.handler.generate_packages(all_recipes) + + def fast_generate_image_async(self): + self.switch_page(self.FAST_IMAGE_GENERATING) + # Build packages + _, all_recipes = self.recipe_model.get_selected_recipes() + self.set_user_config() + self.handler.reset_build() + self.handler.generate_packages(all_recipes) + def load_template(self, path): self.template = TemplateMgr() self.template.load(path) @@ -402,7 +418,6 @@ class Builder(gtk.Window): elif next_step == self.PACKAGE_GENERATING or next_step == self.FAST_IMAGE_GENERATING: # both PACKAGE_GENEATING and FAST_IMAGE_GENERATING share the same page self.build_details_page.show_page(next_step) - self.generate_packages() elif next_step == self.PACKAGE_GENERATED: pass @@ -460,13 +475,6 @@ class Builder(gtk.Window): left = self.package_model.set_selected_packages(selected_packages) self.configuration.selected_packages += left - def generate_packages(self): - # Build packages - _, all_recipes = self.recipe_model.get_selected_recipes() - self.set_user_config() - self.handler.reset_build() - self.handler.generate_packages(all_recipes) - def generate_image(self): # Build image self.set_user_config() @@ -737,7 +745,7 @@ class Builder(gtk.Window): dialog.run() dialog.destroy() return - self.switch_page(self.PACKAGE_GENERATING) + self.generate_packages_async() def build_image(self): selected_packages = self.package_model.get_selected_packages() @@ -767,7 +775,7 @@ class Builder(gtk.Window): dialog.destroy() return - self.switch_page(self.FAST_IMAGE_GENERATING) + self.fast_generate_image_async() def show_binb_dialog(self, binb): markup = "Brought in by:\n%s" % binb @@ -977,7 +985,7 @@ class Builder(gtk.Window): response = dialog.run() dialog.destroy() if response == gtk.RESPONSE_YES: - self.switch_page(self.PACKAGE_GENERATING) + self.generate_packages_async() else: self.switch_page(self.PACKAGE_SELECTION) else: