TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

py/mkrules: Add support for custom manifest variables.

Browse Source 
This allows e.g. a board (or make command line) to set

    MICROPY_MANIFEST_MY_VARIABLE = path/to/somewhere
    set(MICROPY_MANIFEST_MY_VARIABLE path/to/somewhere)

and then in the manifest.py they can query this, e.g. via

    include("$(MY_VARIABLE)/path/manifest.py")

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
This commit is contained in:
Jim Mussared
2023-11-09 17:57:40 +11:00
committed by Damien George
parent 094b52b8ad
commit 992cd64555
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
py/mkrules.cmake
View File

@@ -218,10 +218,27 @@ if(MICROPY_FROZEN_MANIFEST)
set(MICROPY_CROSS_FLAGS "-f${MICROPY_CROSS_FLAGS}")
endif()
# Set default path variables to be passed to makemanifest.py. These will
# be available in path substitutions. Additional variables can be set
# per-board in mpconfigboard.cmake.
set(MICROPY_MANIFEST_PORT_DIR ${MICROPY_PORT_DIR})
set(MICROPY_MANIFEST_BOARD_DIR ${MICROPY_BOARD_DIR})
set(MICROPY_MANIFEST_MPY_DIR ${MICROPY_DIR})
set(MICROPY_MANIFEST_MPY_LIB_DIR ${MICROPY_LIB_DIR})
# Find all MICROPY_MANIFEST_* variables and turn them into command line arguments.
get_cmake_property(_manifest_vars VARIABLES)
list(FILTER _manifest_vars INCLUDE REGEX "MICROPY_MANIFEST_.*")
foreach(_manifest_var IN LISTS _manifest_vars)
list(APPEND _manifest_var_args "-v")
string(REGEX REPLACE "MICROPY_MANIFEST_(.*)" "\\1" _manifest_var_name ${_manifest_var})
list(APPEND _manifest_var_args "${_manifest_var_name}=${${_manifest_var}}")
endforeach()
add_custom_target(
BUILD_FROZEN_CONTENT ALL
BYPRODUCTS ${MICROPY_FROZEN_CONTENT}
COMMAND ${Python3_EXECUTABLE} ${MICROPY_DIR}/tools/makemanifest.py -o ${MICROPY_FROZEN_CONTENT} -v "MPY_DIR=${MICROPY_DIR}" -v "MPY_LIB_DIR=${MICROPY_LIB_DIR}" -v "PORT_DIR=${MICROPY_PORT_DIR}" -v "BOARD_DIR=${MICROPY_BOARD_DIR}" -b "${CMAKE_BINARY_DIR}" ${MICROPY_CROSS_FLAGS} --mpy-tool-flags=${MICROPY_MPY_TOOL_FLAGS} ${MICROPY_FROZEN_MANIFEST}
COMMAND ${Python3_EXECUTABLE} ${MICROPY_DIR}/tools/makemanifest.py -o ${MICROPY_FROZEN_CONTENT} ${_manifest_var_args} -b "${CMAKE_BINARY_DIR}" ${MICROPY_CROSS_FLAGS} --mpy-tool-flags=${MICROPY_MPY_TOOL_FLAGS} ${MICROPY_FROZEN_MANIFEST}
DEPENDS
${MICROPY_QSTRDEFS_GENERATED}
${MICROPY_ROOT_POINTERS}