diff options
Diffstat (limited to 'bitbake-dev/lib/bb/cooker.py')
-rw-r--r-- | bitbake-dev/lib/bb/cooker.py | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/bitbake-dev/lib/bb/cooker.py b/bitbake-dev/lib/bb/cooker.py index 1bf7d4bd14..25131b7406 100644 --- a/bitbake-dev/lib/bb/cooker.py +++ b/bitbake-dev/lib/bb/cooker.py | |||
@@ -245,7 +245,7 @@ class BBCooker: | |||
245 | 245 | ||
246 | def compareRevisions(self): | 246 | def compareRevisions(self): |
247 | ret = bb.fetch.fetcher_compare_revisons(self.configuration.data) | 247 | ret = bb.fetch.fetcher_compare_revisons(self.configuration.data) |
248 | bb.event.fire(bb.command.CookerCommandSetExitCode(self.configuration.event_data, ret)) | 248 | bb.event.fire(bb.command.CookerCommandSetExitCode(ret), self.configuration.event_data) |
249 | 249 | ||
250 | def showEnvironment(self, buildfile = None, pkgs_to_build = []): | 250 | def showEnvironment(self, buildfile = None, pkgs_to_build = []): |
251 | """ | 251 | """ |
@@ -403,7 +403,7 @@ class BBCooker: | |||
403 | Generate an event with the result | 403 | Generate an event with the result |
404 | """ | 404 | """ |
405 | depgraph = self.generateDepTreeData(pkgs_to_build, task) | 405 | depgraph = self.generateDepTreeData(pkgs_to_build, task) |
406 | bb.event.fire(bb.event.DepTreeGenerated(self.configuration.data, depgraph)) | 406 | bb.event.fire(bb.event.DepTreeGenerated(depgraph), self.configuration.data) |
407 | 407 | ||
408 | def generateDotGraphFiles(self, pkgs_to_build, task): | 408 | def generateDotGraphFiles(self, pkgs_to_build, task): |
409 | """ | 409 | """ |
@@ -544,7 +544,7 @@ class BBCooker: | |||
544 | 544 | ||
545 | bb.fetch.fetcher_init(self.configuration.data) | 545 | bb.fetch.fetcher_init(self.configuration.data) |
546 | 546 | ||
547 | bb.event.fire(bb.event.ConfigParsed(self.configuration.data)) | 547 | bb.event.fire(bb.event.ConfigParsed(), self.configuration.data) |
548 | 548 | ||
549 | except IOError, e: | 549 | except IOError, e: |
550 | bb.msg.fatal(bb.msg.domain.Parsing, "Error when parsing %s: %s" % (afile, str(e))) | 550 | bb.msg.fatal(bb.msg.domain.Parsing, "Error when parsing %s: %s" % (afile, str(e))) |
@@ -657,7 +657,7 @@ class BBCooker: | |||
657 | taskdata.add_provider(self.configuration.data, self.status, item) | 657 | taskdata.add_provider(self.configuration.data, self.status, item) |
658 | 658 | ||
659 | buildname = bb.data.getVar("BUILDNAME", self.configuration.data) | 659 | buildname = bb.data.getVar("BUILDNAME", self.configuration.data) |
660 | bb.event.fire(bb.event.BuildStarted(buildname, [item], self.configuration.event_data)) | 660 | bb.event.fire(bb.event.BuildStarted(buildname, [item]), self.configuration.event_data) |
661 | 661 | ||
662 | # Execute the runqueue | 662 | # Execute the runqueue |
663 | runlist = [[item, "do_%s" % task]] | 663 | runlist = [[item, "do_%s" % task]] |
@@ -680,7 +680,7 @@ class BBCooker: | |||
680 | retval = False | 680 | retval = False |
681 | if not retval: | 681 | if not retval: |
682 | self.command.finishAsyncCommand() | 682 | self.command.finishAsyncCommand() |
683 | bb.event.fire(bb.event.BuildCompleted(buildname, item, self.configuration.event_data, failures)) | 683 | bb.event.fire(bb.event.BuildCompleted(buildname, item, failures), self.configuration.event_data) |
684 | return False | 684 | return False |
685 | return 0.5 | 685 | return 0.5 |
686 | 686 | ||
@@ -716,14 +716,14 @@ class BBCooker: | |||
716 | retval = False | 716 | retval = False |
717 | if not retval: | 717 | if not retval: |
718 | self.command.finishAsyncCommand() | 718 | self.command.finishAsyncCommand() |
719 | bb.event.fire(bb.event.BuildCompleted(buildname, targets, self.configuration.event_data, failures)) | 719 | bb.event.fire(bb.event.BuildCompleted(buildname, targets, failures), self.configuration.event_data) |
720 | return None | 720 | return None |
721 | return 0.5 | 721 | return 0.5 |
722 | 722 | ||
723 | self.buildSetVars() | 723 | self.buildSetVars() |
724 | 724 | ||
725 | buildname = bb.data.getVar("BUILDNAME", self.configuration.data) | 725 | buildname = bb.data.getVar("BUILDNAME", self.configuration.data) |
726 | bb.event.fire(bb.event.BuildStarted(buildname, targets, self.configuration.event_data)) | 726 | bb.event.fire(bb.event.BuildStarted(buildname, targets), self.configuration.event_data) |
727 | 727 | ||
728 | localdata = data.createCopy(self.configuration.data) | 728 | localdata = data.createCopy(self.configuration.data) |
729 | bb.data.update_data(localdata) | 729 | bb.data.update_data(localdata) |
@@ -786,7 +786,7 @@ class BBCooker: | |||
786 | self.cookerState = cookerParsed | 786 | self.cookerState = cookerParsed |
787 | return None | 787 | return None |
788 | 788 | ||
789 | return 0.00001 | 789 | return True |
790 | 790 | ||
791 | def checkPackages(self, pkgs_to_build): | 791 | def checkPackages(self, pkgs_to_build): |
792 | 792 | ||
@@ -904,15 +904,15 @@ class BBCooker: | |||
904 | else: | 904 | else: |
905 | self.server.serve_forever() | 905 | self.server.serve_forever() |
906 | 906 | ||
907 | bb.event.fire(CookerExit(self.configuration.event_data)) | 907 | bb.event.fire(CookerExit(), self.configuration.event_data) |
908 | 908 | ||
909 | class CookerExit(bb.event.Event): | 909 | class CookerExit(bb.event.Event): |
910 | """ | 910 | """ |
911 | Notify clients of the Cooker shutdown | 911 | Notify clients of the Cooker shutdown |
912 | """ | 912 | """ |
913 | 913 | ||
914 | def __init__(self, d): | 914 | def __init__(self): |
915 | bb.event.Event.__init__(self, d) | 915 | bb.event.Event.__init__(self) |
916 | 916 | ||
917 | class CookerParser: | 917 | class CookerParser: |
918 | def __init__(self, cooker, filelist, masked): | 918 | def __init__(self, cooker, filelist, masked): |
@@ -932,8 +932,6 @@ class CookerParser: | |||
932 | self.pointer = 0 | 932 | self.pointer = 0 |
933 | 933 | ||
934 | def parse_next(self): | 934 | def parse_next(self): |
935 | print "Pointer %d" % self.pointer | ||
936 | |||
937 | if self.pointer < len(self.filelist): | 935 | if self.pointer < len(self.filelist): |
938 | f = self.filelist[self.pointer] | 936 | f = self.filelist[self.pointer] |
939 | cooker = self.cooker | 937 | cooker = self.cooker |
@@ -964,7 +962,7 @@ class CookerParser: | |||
964 | cooker.bb_cache.remove(f) | 962 | cooker.bb_cache.remove(f) |
965 | raise | 963 | raise |
966 | finally: | 964 | finally: |
967 | bb.event.fire(bb.event.ParseProgress(cooker.configuration.event_data, self.cached, self.parsed, self.skipped, self.masked, self.error, self.total)) | 965 | bb.event.fire(bb.event.ParseProgress(self.cached, self.parsed, self.skipped, self.masked, self.error, self.total), cooker.configuration.event_data) |
968 | 966 | ||
969 | self.pointer += 1 | 967 | self.pointer += 1 |
970 | 968 | ||