mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-02 00:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename the ui 'init' method to 'main'

Browse Source 
As these may run the UI in a blocking fashion and then return the exit code,
'init' was an inappropriate name, and 'main' is more appropriate.

(Bitbake rev: 4d081a0ed759bd526ab01849d650bd9e8d80ddd1)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Chris Larson
2010-12-09 14:05:22 -05:00
committed by Richard Purdie
parent 72c6953488
commit c8d2dad049
6 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
bitbake/bin/bitbake
View File

@@ -46,9 +46,6 @@ __version__ = "1.11.0"
logger = logging.getLogger("BitBake")
#============================================================================#
# BBOptions
#============================================================================#
class BBConfiguration(object):
"""
Manages build options and configurations for one run
@@ -89,13 +86,8 @@ warnings.filterwarnings("ignore", category=PendingDeprecationWarning)
warnings.filterwarnings("ignore", category=ImportWarning)
warnings.filterwarnings("ignore", category=DeprecationWarning, module="<string>$")
#============================================================================#
# main
#============================================================================#
def main():
return_value = 1
parser = optparse.OptionParser(
version = "BitBake Build Tool Core version %s, %%prog version %s" % (bb.__version__, __version__),
usage = """%prog [options] [package ...]
@@ -190,7 +182,6 @@ Default BBFILES are the .bb files in the current directory.""")
bb.utils.clean_environment()
cooker = bb.cooker.BBCooker(configuration, server)
cooker.parseCommandLine()
serverinfo = server.BitbakeServerInfo(cooker.server)
@@ -201,7 +192,7 @@ Default BBFILES are the .bb files in the current directory.""")
logger.removeHandler(loghandler)
# Setup a connection to the server (cooker)
serverConnection = server.BitBakeServerConnection(serverinfo)
server_connection = server.BitBakeServerConnection(serverinfo)
# Launch the UI
if configuration.ui:
@@ -214,17 +205,15 @@ Default BBFILES are the .bb files in the current directory.""")
# Dynamically load the UI based on the ui name. Although we
# suggest a fixed set this allows you to have flexibility in which
# ones are available.
uimodule = __import__("bb.ui", fromlist = [ui])
ui_init = getattr(uimodule, ui).init
module = __import__("bb.ui", fromlist = [ui])
ui_main = getattr(module, ui).main
except AttributeError:
print("FATAL: Invalid user interface '%s' specified. " % ui)
print("Valid interfaces are 'ncurses', 'depexp' or the default, 'knotty'.")
else:
return_value = server.BitbakeUILauch().launch(serverinfo, ui_init, serverConnection.connection, serverConnection.events)
return server.BitbakeUILauch().launch(serverinfo, ui_main, server_connection.connection, server_connection.events)
finally:
serverConnection.terminate()
return return_value
server_connection.terminate()
if __name__ == "__main__":
ret = main()