josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmake: Cleanup XFLASH multi-language rules

This commit is contained in:
Yuri D'Elia 2022-10-03 18:01:48 +02:00
parent 7e56a8255b
commit 7d9dc1007c
1 changed files with 49 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
CMakeLists.txt
View File

@ -300,12 +300,6 @@ if(CMAKE_CROSSCOMPILING)
${PRUSA_BOARDS_DIR}/variants/prusa_einsy_rambo/) ${PRUSA_BOARDS_DIR}/variants/prusa_einsy_rambo/)
endif() endif()
# Setup language resources: file(GLOB LANG_VARIANTS RELATIVE
# ${PROJECT_SOURCE_DIR}/lang/po ${PROJECT_SOURCE_DIR}/lang/po/Firmware_??.po)
# string(REPLACE "Firmware_" "" LANG_VARIANTS "${LANG_VARIANTS}") string(REPLACE
# ".po" "" LANG_VARIANTS "${LANG_VARIANTS}") list(SORT LANG_VARIANTS)
# message("Languages found: ${LANG_VARIANTS}")
# Meta targets to build absolutely everything # Meta targets to build absolutely everything
add_custom_target(ALL_FIRMWARE) add_custom_target(ALL_FIRMWARE)
add_custom_target(ALL_ENGLISH) add_custom_target(ALL_ENGLISH)
@ -385,9 +379,6 @@ function(fw_add_variant variant_name)
set(FW_HEX ${CMAKE_BINARY_DIR}/${FN_PREFIX}-${FW_EN}.hex) set(FW_HEX ${CMAKE_BINARY_DIR}/${FN_PREFIX}-${FW_EN}.hex)
add_base_binary(${FW_EN}) add_base_binary(${FW_EN})
# target_compile_options(${variant_name} PRIVATE) # turn this on for lolz
# -Wdouble-promotion)
target_compile_definitions(${FW_EN} PUBLIC LANG_MODE=0) target_compile_definitions(${FW_EN} PUBLIC LANG_MODE=0)
add_custom_command( add_custom_command(
TARGET ${FW_EN} TARGET ${FW_EN}
@ -399,80 +390,80 @@ function(fw_add_variant variant_name)
add_dependencies(ALL_ENGLISH ${FW_EN}) add_dependencies(ALL_ENGLISH ${FW_EN})
# Multi-language build/s # Multi-language build/s
add_base_binary(${FW_MULTI}) set(FW_LANG_BASE "${variant_name}_Multilang_base")
target_compile_definitions(${FW_MULTI} PUBLIC LANG_MODE=1) set(FW_LANG_FINAL "${variant_name}_Multilang")
add_base_binary(${FW_LANG_BASE})
target_compile_definitions(${FW_LANG_BASE} PUBLIC LANG_MODE=1)
# Construct language map # Construct language map
set(LANG_TMP_DIR ${CMAKE_BINARY_DIR}/${variant_name}/lang) set(LANG_TMP_DIR lang)
set(LANG_MAP ${LANG_TMP_DIR}/${variant_name}_lang.map) set(LANG_MAP ${LANG_TMP_DIR}/${variant_name}_lang.map)
set(LANG_FWBIN ${CMAKE_CURRENT_BINARY_DIR}/${variant_name}.bin) set(LANG_HEX ${CMAKE_BINARY_DIR}/${FN_PREFIX}-${FW_LANG_FINAL}.hex)
set(LANG_FINAL_BIN ${LANG_TMP_DIR}/${variant_name}_lang.bin)
set(LANG_FINAL_HEX ${LANG_TMP_DIR}/${variant_name}_lang.hex)
add_custom_command( add_custom_command(
OUTPUT ${LANG_FWBIN} OUTPUT ${FW_LANG_BASE}.bin
COMMAND COMMAND ${CMAKE_OBJCOPY} -I ihex -O binary ${FW_LANG_BASE}.hex
"${CMAKE_OBJCOPY}" -I ihex -O binary ${FW_LANG_BASE}.bin
${CMAKE_CURRENT_BINARY_DIR}/${variant_name}_Multilang.hex ${LANG_FWBIN} DEPENDS ${FW_LANG_BASE}.hex)
DEPENDS ${FW_MULTI})
add_custom_command( add_custom_command(
OUTPUT ${LANG_MAP} OUTPUT ${LANG_MAP}
COMMAND ${CMAKE_SOURCE_DIR}/lang/lang-map.py "${FW_MULTI}" "${LANG_FWBIN}" > COMMAND ${CMAKE_SOURCE_DIR}/lang/lang-map.py ${FW_LANG_BASE}
"${LANG_MAP}" ${FW_LANG_BASE}.bin > ${LANG_MAP}
DEPENDS ${LANG_FWBIN}) DEPENDS ${FW_LANG_BASE}.bin
COMMENT "Generating ${variant_name} language map")
set(LANG_BINS "") set(LANG_BINS "")
foreach(LANG IN LISTS SELECTED_LANGUAGES) foreach(LANG IN LISTS SELECTED_LANGUAGES)
set(LANG_BIN ${LANG_TMP_DIR}/${variant_name}_${LANG}.bin) set(LANG_BIN ${LANG_TMP_DIR}/${variant_name}_${LANG}.bin)
set(PO_FILE "${CMAKE_SOURCE_DIR}/lang/po/Firmware_${LANG}.po") set(PO_FILE "${CMAKE_SOURCE_DIR}/lang/po/Firmware_${LANG}.po")
add_custom_command( add_custom_command(
OUTPUT ${LANG_BIN} OUTPUT ${LANG_BIN}
# COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lang/lang-check.py --no-warning #[[
# --map "${LANG_MAP}" "${PO_FILE}" COMMAND ${CMAKE_COMMAND} -E echo # Check po file:
# "Building lang_${LANG}.bin" #COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lang/lang-check.py --no-warning --map ${LANG_MAP} ${PO_FILE}
COMMAND ${CMAKE_SOURCE_DIR}/lang/lang-build.py ${LANG_MAP} ${PO_FILE} #]]
${LANG_BIN} COMMAND ${CMAKE_SOURCE_DIR}/lang/lang-build.py ${LANG_MAP} ${PO_FILE} ${LANG_BIN}
# Check bin size: # Check bin size:
COMMAND COMMAND
${CMAKE_COMMAND} -DLANG_MAX_SIZE=${LANG_MAX_SIZE} ${CMAKE_COMMAND} -DLANG_MAX_SIZE=${LANG_MAX_SIZE}
-DLANG_FILE=${LANG_BIN} -P ${PROJECT_CMAKE_DIR}/Check_lang_size.cmake -DLANG_FILE=${LANG_BIN} -P ${PROJECT_CMAKE_DIR}/Check_lang_size.cmake
DEPENDS ${LANG_MAP} DEPENDS ${LANG_MAP} ${PO_FILE}
COMMENT "Generating ${variant_name}_${LANG}.bin from .po") COMMENT "Generating ${variant_name}_${LANG}.bin")
list(APPEND LANG_BINS ${LANG_BIN}) list(APPEND LANG_BINS ${LANG_BIN})
endforeach() endforeach()
string(FIND ${variant_name} "MK3" HAS_XFLASH) string(FIND ${variant_name} "MK3" HAS_XFLASH)
if(${HAS_XFLASH} GREATER_EQUAL 0) if(${HAS_XFLASH} GREATER_EQUAL 0)
add_custom_command( set(LANG_CATBIN ${LANG_TMP_DIR}/${variant_name}_cat.bin)
OUTPUT ${LANG_FINAL_BIN} set(LANG_CATHEX ${LANG_TMP_DIR}/${variant_name}_cat.hex)
COMMAND ${CMAKE_COMMAND} -E cat ${LANG_BINS} > ${LANG_FINAL_BIN}
DEPENDS ${LANG_BINS}
COMMENT "Merging language binaries")
add_custom_command(
OUTPUT ${LANG_FINAL_BIN}
COMMAND
${CMAKE_COMMAND} -DLANG_MAX_SIZE=${LANG_BIN_MAX}
-DLANG_FILE=${LANG_FINAL_BIN} -P
${PROJECT_CMAKE_DIR}/Check_final_lang_bin_size.cmake
APPEND)
add_custom_command(
OUTPUT ${LANG_FINAL_HEX}
COMMAND ${CMAKE_OBJCOPY} -I binary -O ihex ${LANG_FINAL_BIN}
${LANG_FINAL_HEX}
DEPENDS ${LANG_FINAL_BIN}
COMMENT "Generating Hex for language data")
set(LANG_HEX ${CMAKE_BINARY_DIR}/${FN_PREFIX}-${variant_name}-Languages.hex)
add_custom_target( add_custom_command(
${variant_name}-language-hex OUTPUT ${LANG_CATBIN}
COMMAND ${CMAKE_COMMAND} -E copy ${FW_MULTI}.hex ${LANG_HEX} COMMAND ${CMAKE_COMMAND} -E cat ${LANG_BINS} > ${LANG_CATBIN}
COMMAND ${CMAKE_COMMAND} -E cat ${LANG_FINAL_HEX} >> ${LANG_HEX} DEPENDS ${LANG_BINS}
COMMENT "Generating final ${variant_name}-Languages.hex" COMMENT "Merging language catalogs")
#[[
#add_custom_command(OUTPUT ${LANG_FINAL_BIN}
# COMMAND ${CMAKE_COMMAND} -DLANG_MAX_SIZE=${LANG_BIN_MAX} -DLANG_FILE=${LANG_FINAL_BIN}
# -P ${PROJECT_CMAKE_DIR}/Check_final_lang_bin_size.cmake
# APPEND)
#]]
add_custom_command(
OUTPUT ${LANG_CATHEX}
COMMAND ${CMAKE_OBJCOPY} -I binary -O ihex ${LANG_CATBIN} ${LANG_CATHEX}
DEPENDS ${LANG_CATBIN}
COMMENT "Generating Hex for language data")
add_custom_command(
OUTPUT ${FW_LANG_FINAL}.hex
COMMAND ${CMAKE_COMMAND} -E cat ${FW_LANG_BASE}.hex ${LANG_CATHEX} > ${FW_LANG_FINAL}.hex
COMMAND ${CMAKE_COMMAND} -E copy ${FW_LANG_FINAL}.hex ${LANG_HEX}
BYPRODUCTS ${LANG_HEX} BYPRODUCTS ${LANG_HEX}
DEPENDS ${LANG_FINAL_HEX}) DEPENDS ${LANG_CATHEX}
add_dependencies(ALL_MULTILANG ${variant_name}-language-hex) COMMENT "Generating final ${FW_LANG_FINAL}.hex")
add_custom_target(${FW_LANG_FINAL} DEPENDS ${FW_LANG_FINAL}.hex)
add_dependencies(ALL_MULTILANG ${FW_LANG_FINAL})
else() else()
set(ALL_VARIANT_HEXES "") set(ALL_VARIANT_HEXES "")
# Non-xflash, e.g. MK2.5 # Non-xflash, e.g. MK2.5