From d85999799412f91ef64f2c9fb4e39cd6af31eda5 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Mon, 11 Jul 2022 10:56:46 -0400 Subject: [PATCH] scripts: move process_gperf.py to scripts/build Move scripts needed by the build system and not designed to be run individually or standalone into the build subfolder. Signed-off-by: Anas Nashif --- CMakeLists.txt | 2 +- CODEOWNERS | 2 +- MAINTAINERS.yml | 2 +- doc/build/cmake/build-postprocess-4.svg | 2 +- doc/build/cmake/index.rst | 4 ++-- scripts/{ => build}/process_gperf.py | 0 6 files changed, 6 insertions(+), 6 deletions(-) rename scripts/{ => build}/process_gperf.py (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b2e38ada8..7d02a9299d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -896,7 +896,7 @@ if(CONFIG_USERSPACE) ) set(GEN_KOBJ_LIST ${ZEPHYR_BASE}/scripts/build/gen_kobject_list.py) - set(PROCESS_GPERF ${ZEPHYR_BASE}/scripts/process_gperf.py) + set(PROCESS_GPERF ${ZEPHYR_BASE}/scripts/build/process_gperf.py) endif() get_property(CSTD GLOBAL PROPERTY CSTD) diff --git a/CODEOWNERS b/CODEOWNERS index 13033e225d..4e97e5ad08 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -705,7 +705,7 @@ scripts/build/gen_image_info.py @tejlmand /scripts/build/gen_kobject_placeholders.py @dcpleung /scripts/build/gen_syscalls.py @dcpleung @nashif /scripts/list_boards.py @mbolivar-nordic -/scripts/process_gperf.py @dcpleung @nashif +/scripts/build/process_gperf.py @dcpleung @nashif /scripts/build/gen_relocate_app.py @dcpleung /scripts/requirements*.txt @mbolivar-nordic @galak @nashif /scripts/tests/twister/ @aasthagr diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml index a14a65b240..1d744a8e09 100644 --- a/MAINTAINERS.yml +++ b/MAINTAINERS.yml @@ -1974,7 +1974,7 @@ Userspace: - scripts/build/gen_app_partitions.py - scripts/build/gen_kobject_list.py - scripts/build/gen_syscalls.py - - scripts/process_gperf.py + - scripts/build/process_gperf.py - scripts/build/gen_relocate_app.py - include/zephyr/sys/kobject.h labels: diff --git a/doc/build/cmake/build-postprocess-4.svg b/doc/build/cmake/build-postprocess-4.svg index 9c15abbdaa..7db427dee4 100644 --- a/doc/build/cmake/build-postprocess-4.svg +++ b/doc/build/cmake/build-postprocess-4.svg @@ -1,4 +1,4 @@ -

Makefile
(various)

Makefile...
Kernel object hash
Kernel object hash
zephyr_pre1.elf
zephyr_pre1.elf
scripts/build/gen_kobject_list.py
(Find all kernel objects)
scripts/build/gen_kobject_list.py...
kobject_hash.gperf
kobject_hash.gperf

otype-to-str.h
otype-to-size.h
kobj-types-enum.h
driver-validation.h

otype-to-str.h...
GNU gperf
GNU gperf
kobject_hash_preprocessed.c
kobject_hash_preprocessed.c
scripts/process_gperf.py
(Optimize hashing)
scripts/process_gperf.py...
kobject_hash.c
kobject_hash.c
GNU cc
(cpp, cc1, as)
GNU cc...
kobject_hash.c.obj
kobject_hash.c.obj
kobject_hash_renamed.o
kobject_hash_renamed.o
GNU objdump
GNU objdump Viewer does not support full SVG 1.1 \ No newline at end of file +

Makefile
(various)

Makefile...
Kernel object hash
Kernel object hash
zephyr_pre1.elf
zephyr_pre1.elf
scripts/build/gen_kobject_list.py
(Find all kernel objects)
scripts/build/gen_kobject_list.py...
kobject_hash.gperf
kobject_hash.gperf

otype-to-str.h
otype-to-size.h
kobj-types-enum.h
driver-validation.h

otype-to-str.h...
GNU gperf
GNU gperf
kobject_hash_preprocessed.c
kobject_hash_preprocessed.c
scripts/build/process_gperf.py
(Optimize hashing)
scripts/build/process_gperf.py...
kobject_hash.c
kobject_hash.c
GNU cc
(cpp, cc1, as)
GNU cc...
kobject_hash.c.obj
kobject_hash.c.obj
kobject_hash_renamed.o
kobject_hash_renamed.o
GNU objdump
GNU objdump Viewer does not support full SVG 1.1 \ No newline at end of file diff --git a/doc/build/cmake/index.rst b/doc/build/cmake/index.rst index b50c88711f..c638b842bd 100644 --- a/doc/build/cmake/index.rst +++ b/doc/build/cmake/index.rst @@ -402,10 +402,10 @@ The following is a detailed description of the scripts used during the build pro .. _process_gperf.py: -:zephyr_file:`scripts/process_gperf.py` +:zephyr_file:`scripts/build/process_gperf.py` --------------------------------------- -.. include:: ../../../scripts/process_gperf.py +.. include:: ../../../scripts/build/process_gperf.py :start-after: """ :end-before: """ diff --git a/scripts/process_gperf.py b/scripts/build/process_gperf.py similarity index 100% rename from scripts/process_gperf.py rename to scripts/build/process_gperf.py