summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/ui/depexp.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-20 22:54:41 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-22 12:10:13 +0100
commitf0930c8d63cc9fd8ead759b3230ab708fffa6ed4 (patch)
treed589dce4ac5f1fb34ee6d21fc9889a9d6a48b81d /bitbake/lib/bb/ui/depexp.py
parentf242f5060bbc62815b6d5a245c1a9bf18f23675f (diff)
downloadpoky-f0930c8d63cc9fd8ead759b3230ab708fffa6ed4.tar.gz
bitbake: cooker: Move commandline parsing back into the UI/cookerdata
Building up a set of actions for the server is tricky since we depend upon the commandline but fall back to values from the datastore. We should be able to build a datastore without a commandline and vice versa. Ultimately the UI should send the commands to the server. This patch amounts to code rearranging, moving the heavy lifting to the UI, though a helper in the configuration option. This will need further cleanup/tweaking but this should be the only update needed to the UIs. The code now queries the server for any missing data should it need to. This code allows various knowledge of configuration variables to move to the UI side only, partcularly pkgs_to_build but also all the command specifiers. It should also be possible to move cmd eventually, I'm just unsure if any callers call the commands expecting this to default to something sane right now. (Bitbake rev: 2dbbb1d51dafd4451fef8fe16f095bcd4b8f1177) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui/depexp.py')
-rw-r--r--bitbake/lib/bb/ui/depexp.py16
1 files changed, 9 insertions, 7 deletions
diff --git a/bitbake/lib/bb/ui/depexp.py b/bitbake/lib/bb/ui/depexp.py
index 85910f6925..885c31aeac 100644
--- a/bitbake/lib/bb/ui/depexp.py
+++ b/bitbake/lib/bb/ui/depexp.py
@@ -196,16 +196,18 @@ class gtkthread(threading.Thread):
196 gtkthread.quit.set() 196 gtkthread.quit.set()
197 197
198 198
199def main(server, eventHandler): 199def main(server, eventHandler, params):
200 try: 200 try:
201 cmdline, error = server.runCommand(["getCmdLineAction"]) 201 params.updateFromServer(server)
202 if error: 202 cmdline = params.parseActions()
203 print("Error getting bitbake commandline: %s" % error) 203 if not cmdline:
204 return 1
205 elif not cmdline:
206 print("Nothing to do. Use 'bitbake world' to build everything, or run 'bitbake --help' for usage information.") 204 print("Nothing to do. Use 'bitbake world' to build everything, or run 'bitbake --help' for usage information.")
207 return 1 205 return 1
208 elif not cmdline or cmdline[0] != "generateDotGraph": 206 if 'msg' in cmdline and cmdline['msg']:
207 logger.error(cmdline['msg'])
208 return 1
209 cmdline = cmdline['action']
210 if not cmdline or cmdline[0] != "generateDotGraph":
209 print("This UI is only compatible with the -g option") 211 print("This UI is only compatible with the -g option")
210 return 1 212 return 1
211 ret, error = server.runCommand(["generateDepTreeEvent", cmdline[1], cmdline[2]]) 213 ret, error = server.runCommand(["generateDepTreeEvent", cmdline[1], cmdline[2]])