From a8429bf608b6de6473ef032a8dbfad6da4bcc070 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 26 Apr 2023 10:04:03 +0200 Subject: build: Load items on demand during a build If the CSafeLoader is available, load only the necessary build items. This considerably speeds up the build setup time if the CSafeLoader is used. --- wscript | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/wscript b/wscript index de634cc8d0..00d386a52a 100755 --- a/wscript +++ b/wscript @@ -1180,6 +1180,22 @@ try: super(ItemCache, self).__init__() self.spec_directories = [] + def __missing__(self, uid): + name = uid + ".yml" + for path in self.spec_directories: + path2 = os.path.join(path, name[1:]) + try: + with open(path2, "r") as f: + content = f.read() + except OSError: + pass + else: + data = load(content, SafeLoader) + item = ctors[data["build-type"]](uid, data) + self[uid] = item + return item + raise KeyError("No item file found for UID: {}".format(uid)) + def set_spec_directories(self, spec_directories): self.spec_directories = spec_directories @@ -1209,6 +1225,9 @@ try: for path in self.spec_directories: self.load_from_yaml(path, path) + + def load_on_demand(self, ctx): + pass except ImportError: # # Fall back to the Python implementation provided by the project. This @@ -1309,6 +1328,9 @@ except ImportError: for path in self.spec_directories: load_items_in_directory(ctx, path) + def load_on_demand(self, ctx): + self.load_all(ctx) + items = ItemCache() @@ -1509,6 +1531,7 @@ def configure_variant(conf, cp, bsp_map, path_list, top_group, variant): conf.env["BSP_BASE"] = bsp_base conf.env["BSP_NAME"] = bsp_name conf.env["BSP_FAMILY"] = family + conf.env["BSP_UID"] = bsp_item.uid conf.env["DEST_OS"] = "rtems" # For the enabled-by evaluation we have to use the base BSP defined by the @@ -1643,13 +1666,13 @@ def build(bld): ], ) items.set_spec_directories(bld.env.SPECS) - items.load_all(bld) + items.load_on_demand(bld) append_variant_builds(bld) return long_command_line_workaround(bld) bic = BuildItemContext(bld.env.ARCH_INCLUDES.split(), [], [], [], [], [], []) - bsps[bld.env.ARCH][bld.env.BSP_BASE].build(bld, bic) + items[bld.env.BSP_UID].build(bld, bic) items[bld.env.TOPGROUP_UID].build(bld, bic) -- cgit v1.2.3