[rtems-central commit] build: Change attribute names

[Sebastian Huber]

Module:    rtems-central
Branch:    master
Commit:    30b8653a137e65efcb7fc1b8a5c74151c11c5f76
Changeset: http://git.rtems.org/rtems-central/commit/?id=30b8653a137e65efcb7fc1b8a5c74151c11c5f76

Author:    Sofia Pacheco <sofia.pacheco at edisoft.pt>
Date:      Fri May  5 14:41:20 2023 +0200

build: Change attribute names

---

 config.yml                    | 4 ++--
 rtemsspec/build.py            | 4 ++--
 rtemsspec/tests/test_build.py | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config.yml b/config.yml
index 1b96b7e7..975f9f6d 100644
--- a/config.yml
+++ b/config.yml
@@ -20,7 +20,7 @@ build:
   - RTEMS_SMP
   - sparc/gr712rc
   source-directory: modules/rtems
-  sources:
+  extra-files:
   - bsps/shared/doxygen.h
   - bsps/shared/cache/cacheimpl.h
   - bsps/shared/dev/clock/clockimpl.h
@@ -51,7 +51,7 @@ build:
   - testsuites/validation/tx-thread-queue.h
   - waf
   - wscript
-  uids:
+  build-uids:
   - /build/cpukit/librtemscpu
   - /build/cpukit/librtemstest
   - /build/testsuites/membench/grp
diff --git a/rtemsspec/build.py b/rtemsspec/build.py
index 6fbc0f66..699c6296 100644
--- a/rtemsspec/build.py
+++ b/rtemsspec/build.py
@@ -94,12 +94,12 @@ def gather_files(config: dict,
         if item["type"] == "build" and item["build-type"] == "bsp":
             arch_bsps = bsps.setdefault(item["arch"].strip(), {})
             arch_bsps[item["bsp"].strip()] = item
-    source_files: List[str] = list(config["sources"])
+    source_files: List[str] = list(config["extra-files"])
     arch = config["arch"]
     bsp = config["bsp"]
     enabled = [arch, arch + "/" + bsp] + config["enabled"]
     _gather_source_files(bsps[arch][bsp], enabled, source_files)
-    for uid in config["uids"]:
+    for uid in config["build-uids"]:
         _gather_source_files(item_cache[uid], enabled, source_files)
     if test_header:
         _gather_test_header(item_cache, source_files)
diff --git a/rtemsspec/tests/test_build.py b/rtemsspec/tests/test_build.py
index a1e1a995..be9b8527 100644
--- a/rtemsspec/tests/test_build.py
+++ b/rtemsspec/tests/test_build.py
@@ -38,8 +38,8 @@ def test_build(tmpdir):
     build_config["arch"] = "foo"
     build_config["bsp"] = "bar"
     build_config["enabled"] = ["A"]
-    build_config["sources"] = ["a", "b"]
-    build_config["uids"] = ["/g"]
+    build_config["extra-files"] = ["a", "b"]
+    build_config["build-uids"] = ["/g"]
     files = gather_files(build_config, item_cache)
     assert files == ["a", "b", "stu", "jkl", "mno", "abc", "def", "ghi", "th"]
     files = gather_files(build_config, item_cache, test_header=False)