cmake: Reformat to fix tab/space mixture

This commit is contained in:
Yuri D'Elia 2022-10-03 17:40:48 +02:00
parent 992845198d
commit 63605f4c86
1 changed files with 325 additions and 287 deletions

View File

@ -2,80 +2,98 @@ cmake_minimum_required(VERSION 3.15)
include(cmake/Utilities.cmake) include(cmake/Utilities.cmake)
include(cmake/GetGitRevisionDescription.cmake) include(cmake/GetGitRevisionDescription.cmake)
SET(PROJECT_VERSION_SUFFIX set(PROJECT_VERSION_SUFFIX
"<auto>" "<auto>"
CACHE CACHE
STRING STRING
"Full version suffix to be shown on the info screen in settings (e.g. full_version=4.0.3-BETA+1035.PR111.B4, suffix=-BETA+1035.PR111.B4). Defaults to '+<commit sha>.<dirty?>.<debug?>' if set to '<auto>'." "Full version suffix to be shown on the info screen in settings (e.g. full_version=4.0.3-BETA+1035.PR111.B4, suffix=-BETA+1035.PR111.B4). Defaults to '+<commit sha>.<dirty?>.<debug?>' if set to '<auto>'."
) )
SET(PROJECT_VERSION_SUFFIX_SHORT set(PROJECT_VERSION_SUFFIX_SHORT
"<auto>" "<auto>"
CACHE CACHE
STRING STRING
"Short version suffix to be shown on splash screen. Defaults to '+<BUILD_NUMBER>' if set to '<auto>'." "Short version suffix to be shown on splash screen. Defaults to '+<BUILD_NUMBER>' if set to '<auto>'."
) )
SET(BUILD_NUMBER set(BUILD_NUMBER
"" ""
CACHE STRING "Build number of the firmware. Resolved automatically if not specified." CACHE
) STRING
"Build number of the firmware. Resolved automatically if not specified.")
include(cmake/ProjectVersion.cmake)
INCLUDE(cmake/ProjectVersion.cmake)
resolve_version_variables() resolve_version_variables()
set(PROJECT_VERSION_FLAVOUR
""
CACHE STRING "Firmware flavour to build - DEBUG, DEVEL, APLHA, BETA or RC")
set(PROJECT_VERSION_FLAVOUR_REVISION
""
CACHE STRING "Firmware flavour version, e.g. 1 for RC1, etc")
SET(PROJECT_VERSION_FLAVOUR "" CACHE STRING "Firmware flavour to build - DEBUG, DEVEL, APLHA, BETA or RC") if(NOT PROJECT_VERSION_FLAVOUR STREQUAL "")
SET(PROJECT_VERSION_FLAVOUR_REVISION "" CACHE STRING "Firmware flavour version, e.g. 1 for RC1, etc") set(PROJECT_VERSION "${PROJECT_VERSION}-${PROJECT_VERSION_FLAVOUR}")
IF( NOT PROJECT_VERSION_FLAVOUR STREQUAL "")
SET(PROJECT_VERSION "${PROJECT_VERSION}-${PROJECT_VERSION_FLAVOUR}")
add_compile_definitions(FW_FLAVOR=${PROJECT_VERSION_FLAVOUR}) add_compile_definitions(FW_FLAVOR=${PROJECT_VERSION_FLAVOUR})
IF( NOT PROJECT_VERSION_FLAVOUR_REVISION STREQUAL "") if(NOT PROJECT_VERSION_FLAVOUR_REVISION STREQUAL "")
SET(PROJECT_VERSION "${PROJECT_VERSION}${PROJECT_VERSION_FLAVOUR_REVISION}") set(PROJECT_VERSION "${PROJECT_VERSION}${PROJECT_VERSION_FLAVOUR_REVISION}")
add_compile_definitions(FW_FLAVERSION=${PROJECT_VERSION_FLAVOUR_REVISION}) add_compile_definitions(FW_FLAVERSION=${PROJECT_VERSION_FLAVOUR_REVISION})
ENDIF() endif()
ENDIF() endif()
# Inform user about the resolved settings # Inform user about the resolved settings
MESSAGE(STATUS "Project version: ${PROJECT_VERSION}") message(STATUS "Project version: ${PROJECT_VERSION}")
MESSAGE( message(
STATUS "Project version with short suffix: ${PROJECT_VERSION}${PROJECT_VERSION_SUFFIX_SHORT}" STATUS
) "Project version with short suffix: ${PROJECT_VERSION}${PROJECT_VERSION_SUFFIX_SHORT}"
)
SET(FN_PREFIX "FW${PROJECT_VERSION}${PROJECT_VERSION_SUFFIX_SHORT}") set(FN_PREFIX "FW${PROJECT_VERSION}${PROJECT_VERSION_SUFFIX_SHORT}")
MESSAGE(WARNING " message(
WARNING
"
***************** YOUR ATTENTION PLEASE ***************** ***************** YOUR ATTENTION PLEASE *****************
CMake support is experimental. There is no guarantee at this time. If you have problems you are encouraged to fall back to the tried-and-true methods. CMake support is experimental. There is no guarantee at this time. If you have problems you are encouraged to fall back to the tried-and-true methods.
*********************** THANK YOU ********************** *********************** THANK YOU **********************
We now return to your regularly scheduled Firmware Build." We now return to your regularly scheduled Firmware Build.")
option(SECONDARY_LANGUAGES "Secondary language support in the firmware" ON)
set(MAIN_LANGUAGES
cs de es fr it pl
CACHE STRING
"The list of 'main' languages to be included, in the correct order")
set(COMMUNITY_LANGUAGES
nl
ro
hu
hr
sk
sv
no
CACHE STRING
"The list of community languages to be included, in the correct order"
) )
set(SELECTED_LANGUAGES ${MAIN_LANGUAGES} ${COMMUNITY_LANGUAGES})
OPTION(SECONDARY_LANGUAGES "Secondary language support in the firmware" ON)
SET(MAIN_LANGUAGES cs de es fr it pl CACHE STRING "The list of 'main' languages to be included, in the correct order")
SET(COMMUNITY_LANGUAGES nl ro hu hr sk sv no CACHE STRING "The list of community languages to be included, in the correct order")
SET(SELECTED_LANGUAGES ${MAIN_LANGUAGES} ${COMMUNITY_LANGUAGES})
get_dependency_directory(prusa3dboards PRUSA_BOARDS_DIR) get_dependency_directory(prusa3dboards PRUSA_BOARDS_DIR)
project(Prusa-Firmware) project(Prusa-Firmware)
add_subdirectory(lib) add_subdirectory(lib)
FILE(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/Firmware/config.h MAX_SIZE_LINE REGEX "^#define \+LANG_SIZE_RESERVED \+") file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/Firmware/config.h MAX_SIZE_LINE
STRING(REGEX MATCH "0x[0-9]+" MAX_SIZE_HEX "${MAX_SIZE_LINE}") REGEX "^#define \+LANG_SIZE_RESERVED \+")
string(REGEX MATCH "0x[0-9]+" MAX_SIZE_HEX "${MAX_SIZE_LINE}")
math(EXPR LANG_MAX_SIZE "${MAX_SIZE_HEX}" OUTPUT_FORMAT DECIMAL) math(EXPR LANG_MAX_SIZE "${MAX_SIZE_HEX}" OUTPUT_FORMAT DECIMAL)
message("Language maximum size (from config.h): ${LANG_MAX_SIZE} bytes") message("Language maximum size (from config.h): ${LANG_MAX_SIZE} bytes")
set (LANG_BIN_MAX 249856) # Ditto, this in xflash_layout.h but needs invocation of the preprocessor... :-/ set(LANG_BIN_MAX 249856) # Ditto, this in xflash_layout.h but needs invocation
# of the preprocessor... :-/
get_recommended_gcc_version(RECOMMENDED_TOOLCHAIN_VERSION) get_recommended_gcc_version(RECOMMENDED_TOOLCHAIN_VERSION)
if(CMAKE_CROSSCOMPILING AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL if(CMAKE_CROSSCOMPILING AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL
${RECOMMENDED_TOOLCHAIN_VERSION} ${RECOMMENDED_TOOLCHAIN_VERSION})
) message(
message(WARNING "Recommended AVR toolchain is ${RECOMMENDED_TOOLCHAIN_VERSION}" WARNING "Recommended AVR toolchain is ${RECOMMENDED_TOOLCHAIN_VERSION}"
", but you have ${CMAKE_CXX_COMPILER_VERSION}" ", but you have ${CMAKE_CXX_COMPILER_VERSION}")
)
elseif(NOT CMAKE_CROSSCOMPILING AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU") elseif(NOT CMAKE_CROSSCOMPILING AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
message( message(
@ -106,11 +124,10 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
add_compile_definitions(_DEBUG) add_compile_definitions(_DEBUG)
endif() endif()
# #
# Firmware - get file lists. # Firmware - get file lists.
# #
SET(FW_SOURCES set(FW_SOURCES
adc.cpp adc.cpp
backlight.cpp backlight.cpp
BlinkM.cpp BlinkM.cpp
@ -180,8 +197,7 @@ SET(FW_SOURCES
vector_3.cpp vector_3.cpp
xflash.c xflash.c
xflash_dump.cpp xflash_dump.cpp
xyzcal.cpp xyzcal.cpp)
)
list(TRANSFORM FW_SOURCES PREPEND ${CMAKE_CURRENT_SOURCE_DIR}/Firmware/) list(TRANSFORM FW_SOURCES PREPEND ${CMAKE_CURRENT_SOURCE_DIR}/Firmware/)
set(AVR_SOURCES set(AVR_SOURCES
@ -208,11 +224,10 @@ set(AVR_SOURCES
WString.cpp WString.cpp
abi.cpp abi.cpp
main.cpp main.cpp
# new.cpp # What happened to this? it was removed in 1.0.5-1 to 1.0.5.2? # new.cpp # What happened to this? it was removed in 1.0.5-1 to 1.0.5.2?
) )
list(TRANSFORM AVR_SOURCES PREPEND ${PRUSA_BOARDS_DIR}/cores/prusa_einsy_rambo/) list(TRANSFORM AVR_SOURCES PREPEND ${PRUSA_BOARDS_DIR}/cores/prusa_einsy_rambo/)
# #
# Target configuration # Target configuration
# #
@ -222,7 +237,10 @@ if(CMAKE_CROSSCOMPILING)
foreach(file IN LISTS ${source_list}) foreach(file IN LISTS ${source_list})
get_filename_component(base ${file} NAME) get_filename_component(base ${file} NAME)
set(target "${prefix}${base}") set(target "${prefix}${base}")
set_property(SOURCE ${file} APPEND PROPERTY COMPILE_OPTIONS "-frandom-seed=${target}.o") set_property(
SOURCE ${file}
APPEND
PROPERTY COMPILE_OPTIONS "-frandom-seed=${target}.o")
endforeach() endforeach()
endfunction() endfunction()
@ -254,7 +272,8 @@ if(CMAKE_CROSSCOMPILING)
set(CMAKE_C_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) set(CMAKE_C_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
# mcu and target-related settings # mcu and target-related settings
add_compile_options(-mmcu=atmega2560 -DF_CPU=16000000L -DARDUINO=10819 -DARDUINO_AVR_PRUSA_EINSY_RAMBO -DARDUINO_ARCH_AVR) add_compile_options(-mmcu=atmega2560 -DF_CPU=16000000L -DARDUINO=10819
-DARDUINO_AVR_PRUSA_EINSY_RAMBO -DARDUINO_ARCH_AVR)
add_link_options(-mmcu=atmega2560 -Wl,-u,vfprintf -lprintf_flt -lm) add_link_options(-mmcu=atmega2560 -Wl,-u,vfprintf -lprintf_flt -lm)
# disable some C++ language features # disable some C++ language features
@ -276,20 +295,17 @@ if(CMAKE_CROSSCOMPILING)
# Create this target before we apply the GC options # Create this target before we apply the GC options
add_library(avr_core STATIC ${AVR_SOURCES}) add_library(avr_core STATIC ${AVR_SOURCES})
set_reproducible_target(avr_core) set_reproducible_target(avr_core)
target_include_directories(avr_core PRIVATE target_include_directories(
${PRUSA_BOARDS_DIR}/cores/prusa_einsy_rambo/ avr_core PRIVATE ${PRUSA_BOARDS_DIR}/cores/prusa_einsy_rambo/
${PRUSA_BOARDS_DIR}/variants/prusa_einsy_rambo/ ${PRUSA_BOARDS_DIR}/variants/prusa_einsy_rambo/)
)
endif() endif()
# Setup language resources: # Setup language resources: file(GLOB LANG_VARIANTS RELATIVE
# file(GLOB LANG_VARIANTS RELATIVE ${PROJECT_SOURCE_DIR}/lang/po ${PROJECT_SOURCE_DIR}/lang/po/Firmware_??.po) # ${PROJECT_SOURCE_DIR}/lang/po ${PROJECT_SOURCE_DIR}/lang/po/Firmware_??.po)
# string(REPLACE "Firmware_" "" LANG_VARIANTS "${LANG_VARIANTS}") # string(REPLACE "Firmware_" "" LANG_VARIANTS "${LANG_VARIANTS}") string(REPLACE
# string(REPLACE ".po" "" LANG_VARIANTS "${LANG_VARIANTS}") # ".po" "" LANG_VARIANTS "${LANG_VARIANTS}") list(SORT LANG_VARIANTS)
# list(SORT LANG_VARIANTS)
# message("Languages found: ${LANG_VARIANTS}") # message("Languages found: ${LANG_VARIANTS}")
# Meta target to build absolutely everything # Meta target to build absolutely everything
add_custom_target(ALL_FIRMWARE) add_custom_target(ALL_FIRMWARE)
add_custom_target(ALL_ENGLISH) add_custom_target(ALL_ENGLISH)
@ -297,14 +313,15 @@ add_custom_target(ALL_MULTILANG)
add_dependencies(ALL_FIRMWARE ALL_ENGLISH ALL_MULTILANG) add_dependencies(ALL_FIRMWARE ALL_ENGLISH ALL_MULTILANG)
function(add_base_binary variant_name) function(add_base_binary variant_name)
add_executable(${variant_name} ${FW_SOURCES} ${FW_HEADERS} ${VARIANT_CFG_FILE}) add_executable(${variant_name} ${FW_SOURCES} ${FW_HEADERS}
${VARIANT_CFG_FILE})
target_include_directories(${variant_name} PRIVATE target_include_directories(
${PRUSA_BOARDS_DIR}/cores/prusa_einsy_rambo/ ${variant_name}
PRIVATE ${PRUSA_BOARDS_DIR}/cores/prusa_einsy_rambo/
${PRUSA_BOARDS_DIR}/variants/prusa_einsy_rambo/ ${PRUSA_BOARDS_DIR}/variants/prusa_einsy_rambo/
${VARIANT_CFG_DIR} # Include the header for this variant. ${VARIANT_CFG_DIR} # Include the header for this variant.
${CMAKE_SOURCE_DIR}/Firmware ${CMAKE_SOURCE_DIR}/Firmware)
)
target_link_libraries(${variant_name} avr_core) target_link_libraries(${variant_name} avr_core)
@ -313,174 +330,193 @@ function(add_base_binary variant_name)
target_link_options(${variant_name} PUBLIC -Wl,-T,${LINKER_SCRIPT}) target_link_options(${variant_name} PUBLIC -Wl,-T,${LINKER_SCRIPT})
# limit the text section to 248K (256K - 8k reserved for the bootloader) # limit the text section to 248K (256K - 8k reserved for the bootloader)
target_link_options(${variant_name} PUBLIC -Wl,--defsym=__TEXT_REGION_LENGTH__=248K) target_link_options(${variant_name} PUBLIC
-Wl,--defsym=__TEXT_REGION_LENGTH__=248K)
# generate firmware.bin file # generate firmware.bin file
objcopy(${variant_name} "ihex" ".hex") objcopy(${variant_name} "ihex" ".hex")
# produce ASM listing. Note we also specify the .map as a byproduct so it gets cleaned # produce ASM listing. Note we also specify the .map as a byproduct so it gets
# because link_options doesn't have a "generated outputs" feature. # cleaned because link_options doesn't have a "generated outputs" feature.
add_custom_command( add_custom_command(
TARGET ${variant_name} POST_BUILD COMMAND ${CMAKE_OBJDUMP} --prefix ${CMAKE_SOURCE_DIR} -CSd ${variant_name} > ${variant_name}.asm TARGET ${variant_name}
BYPRODUCTS ${variant_name}.asm ${variant_name}.map POST_BUILD
) COMMAND ${CMAKE_OBJDUMP} --prefix ${CMAKE_SOURCE_DIR} -CSd ${variant_name} >
${variant_name}.asm
BYPRODUCTS ${variant_name}.asm ${variant_name}.map)
# inform about the firmware's size in terminal # inform about the firmware's size in terminal
add_custom_command( add_custom_command(
TARGET ${variant_name} POST_BUILD COMMAND ${CMAKE_SIZE_UTIL} -C --mcu=atmega2560 ${variant_name} TARGET ${variant_name}
) POST_BUILD
COMMAND ${CMAKE_SIZE_UTIL} -C --mcu=atmega2560 ${variant_name})
report_size(${variant_name}) report_size(${variant_name})
# generate linker map file # generate linker map file
target_link_options(${variant_name} PUBLIC -Wl,-Map=${CMAKE_CURRENT_BINARY_DIR}/${variant_name}.map) target_link_options(${variant_name} PUBLIC
-Wl,-Map=${CMAKE_CURRENT_BINARY_DIR}/${variant_name}.map)
target_compile_definitions(${variant_name} PRIVATE target_compile_definitions(${variant_name} PRIVATE CMAKE_LANG_CONTROL)
CMAKE_LANG_CONTROL
)
endfunction() endfunction()
function(fw_add_variant variant_name) function(fw_add_variant variant_name)
# Set FW_SOURCES to be reproducible in this variant as it's set in a separate project # Set FW_SOURCES to be reproducible in this variant as it's set in a separate
# project
set_reproducible_sources(FW_SOURCES "Firmware/") set_reproducible_sources(FW_SOURCES "Firmware/")
# Create the Configuration_Prusa.h for this variant so it can be #included. # Create the Configuration_Prusa.h for this variant so it can be #included.
set(VARIANT_CFG_DIR "${CMAKE_CURRENT_BINARY_DIR}/include") set(VARIANT_CFG_DIR "${CMAKE_CURRENT_BINARY_DIR}/include")
set(VARIANT_CFG_FILE "${VARIANT_CFG_DIR}/Configuration_prusa.h") set(VARIANT_CFG_FILE "${VARIANT_CFG_DIR}/Configuration_prusa.h")
add_custom_command(OUTPUT ${VARIANT_CFG_FILE} add_custom_command(
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/Firmware/variants/${variant_name}.h ${VARIANT_CFG_FILE} OUTPUT ${VARIANT_CFG_FILE}
COMMAND
${CMAKE_COMMAND} -E copy
${CMAKE_SOURCE_DIR}/Firmware/variants/${variant_name}.h
${VARIANT_CFG_FILE}
COMMENT "Generating Configuration_prusa.h for ${variant_name}" COMMENT "Generating Configuration_prusa.h for ${variant_name}"
BYPRODUCTS ${VARIANT_CFG_DIR} BYPRODUCTS ${VARIANT_CFG_DIR})
) string(REPLACE "1_75mm_" "" variant_name "${variant_name}")
STRING(REPLACE "1_75mm_" "" variant_name "${variant_name}") string(REPLACE "-E3Dv6full" "" variant_name "${variant_name}")
STRING(REPLACE "-E3Dv6full" "" variant_name "${variant_name}")
SET(FW_EN "${variant_name}_EN-only") set(FW_EN "${variant_name}_EN-only")
SET(FW_MULTI "${variant_name}_Multilang") set(FW_MULTI "${variant_name}_Multilang")
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_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}
POST_BUILD POST_BUILD
COMMAND ${CMAKE_OBJCOPY} -O ihex ${CMAKE_CURRENT_BINARY_DIR}/${FW_EN} ${CMAKE_BINARY_DIR}/${FN_PREFIX}-${FW_EN}.hex COMMAND ${CMAKE_OBJCOPY} -O ihex ${CMAKE_CURRENT_BINARY_DIR}/${FW_EN}
${CMAKE_BINARY_DIR}/${FN_PREFIX}-${FW_EN}.hex
BYPRODUCTS ${CMAKE_BINARY_DIR}/${FN_PREFIX}-${FW_EN}.hex BYPRODUCTS ${CMAKE_BINARY_DIR}/${FN_PREFIX}-${FW_EN}.hex
COMMENT "Generating ${variant_name} hex" COMMENT "Generating ${variant_name} hex")
)
add_dependencies(ALL_ENGLISH "${FW_EN}") add_dependencies(ALL_ENGLISH "${FW_EN}")
if (NOT SECONDARY_LANGUAGES) if(NOT SECONDARY_LANGUAGES)
return() #Done, if no languages there's nothing else to do. return() # Done, if no languages there's nothing else to do.
else() else()
add_base_binary(${FW_MULTI}) add_base_binary(${FW_MULTI})
target_compile_definitions(${FW_MULTI} PUBLIC LANG_MODE=1) target_compile_definitions(${FW_MULTI} PUBLIC LANG_MODE=1)
endif() endif()
#Construct language map # Construct language map
set(LANG_TMP_DIR ${CMAKE_BINARY_DIR}/${variant_name}/lang) set(LANG_TMP_DIR ${CMAKE_BINARY_DIR}/${variant_name}/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_FWBIN ${CMAKE_CURRENT_BINARY_DIR}/${variant_name}.bin)
set(LANG_FINAL_BIN ${LANG_TMP_DIR}/${variant_name}_lang.bin) set(LANG_FINAL_BIN ${LANG_TMP_DIR}/${variant_name}_lang.bin)
set(LANG_FINAL_HEX ${LANG_TMP_DIR}/${variant_name}_lang.hex) set(LANG_FINAL_HEX ${LANG_TMP_DIR}/${variant_name}_lang.hex)
add_custom_command(OUTPUT ${LANG_FWBIN} add_custom_command(
COMMAND "${CMAKE_OBJCOPY}" -I ihex -O binary ${CMAKE_CURRENT_BINARY_DIR}/${variant_name}_Multilang.hex ${LANG_FWBIN} OUTPUT ${LANG_FWBIN}
DEPENDS ${FW_MULTI} COMMAND
) "${CMAKE_OBJCOPY}" -I ihex -O binary
add_custom_command(OUTPUT ${LANG_MAP} ${CMAKE_CURRENT_BINARY_DIR}/${variant_name}_Multilang.hex ${LANG_FWBIN}
COMMAND ${CMAKE_SOURCE_DIR}/lang/lang-map.py "${FW_MULTI}" "${LANG_FWBIN}" > "${LANG_MAP}" DEPENDS ${FW_MULTI})
DEPENDS ${LANG_FWBIN} add_custom_command(
) OUTPUT ${LANG_MAP}
COMMAND ${CMAKE_SOURCE_DIR}/lang/lang-map.py "${FW_MULTI}" "${LANG_FWBIN}" >
"${LANG_MAP}"
DEPENDS ${LANG_FWBIN})
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(OUTPUT ${LANG_BIN} add_custom_command(
# COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lang/lang-check.py --no-warning --map "${LANG_MAP}" "${PO_FILE}" OUTPUT ${LANG_BIN}
# COMMAND ${CMAKE_COMMAND} -E echo "Building lang_${LANG}.bin" # COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lang/lang-check.py --no-warning
COMMAND ${CMAKE_SOURCE_DIR}/lang/lang-build.py ${LANG_MAP} ${PO_FILE} ${LANG_BIN} # --map "${LANG_MAP}" "${PO_FILE}" COMMAND ${CMAKE_COMMAND} -E echo
# "Building lang_${LANG}.bin"
COMMAND ${CMAKE_SOURCE_DIR}/lang/lang-build.py ${LANG_MAP} ${PO_FILE}
${LANG_BIN}
# Check bin size: # Check bin size:
COMMAND ${CMAKE_COMMAND} -DLANG_MAX_SIZE=${LANG_MAX_SIZE} COMMAND
-DLANG_FILE=${LANG_BIN} ${CMAKE_COMMAND} -DLANG_MAX_SIZE=${LANG_MAX_SIZE}
-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}
COMMENT "Generating ${variant_name}_${LANG}.bin from .po" COMMENT "Generating ${variant_name}_${LANG}.bin from .po")
) 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( OUTPUT ${LANG_FINAL_BIN} add_custom_command(
OUTPUT ${LANG_FINAL_BIN}
COMMAND ${CMAKE_COMMAND} -E cat ${LANG_BINS} > ${LANG_FINAL_BIN} COMMAND ${CMAKE_COMMAND} -E cat ${LANG_BINS} > ${LANG_FINAL_BIN}
DEPENDS ${LANG_BINS} DEPENDS ${LANG_BINS}
COMMENT "Merging language binaries" COMMENT "Merging language binaries")
) add_custom_command(
add_custom_command( OUTPUT ${LANG_FINAL_BIN} OUTPUT ${LANG_FINAL_BIN}
COMMAND ${CMAKE_COMMAND} -DLANG_MAX_SIZE=${LANG_BIN_MAX} COMMAND
-DLANG_FILE=${LANG_FINAL_BIN} ${CMAKE_COMMAND} -DLANG_MAX_SIZE=${LANG_BIN_MAX}
-P ${PROJECT_CMAKE_DIR}/Check_final_lang_bin_size.cmake -DLANG_FILE=${LANG_FINAL_BIN} -P
APPEND ${PROJECT_CMAKE_DIR}/Check_final_lang_bin_size.cmake
) APPEND)
add_custom_command( OUTPUT ${LANG_FINAL_HEX} add_custom_command(
COMMAND ${CMAKE_OBJCOPY} -I binary -O ihex ${LANG_FINAL_BIN} ${LANG_FINAL_HEX} OUTPUT ${LANG_FINAL_HEX}
COMMAND ${CMAKE_OBJCOPY} -I binary -O ihex ${LANG_FINAL_BIN}
${LANG_FINAL_HEX}
DEPENDS ${LANG_FINAL_BIN} DEPENDS ${LANG_FINAL_BIN}
COMMENT "Generating Hex for language data" COMMENT "Generating Hex for language data")
)
set(LANG_HEX ${CMAKE_BINARY_DIR}/${FN_PREFIX}-${variant_name}-Languages.hex) set(LANG_HEX ${CMAKE_BINARY_DIR}/${FN_PREFIX}-${variant_name}-Languages.hex)
add_custom_target(${variant_name}-language-hex add_custom_target(
${variant_name}-language-hex
COMMAND ${CMAKE_COMMAND} -E copy ${FW_MULTI}.hex ${LANG_HEX} COMMAND ${CMAKE_COMMAND} -E copy ${FW_MULTI}.hex ${LANG_HEX}
COMMAND ${CMAKE_COMMAND} -E cat ${LANG_FINAL_HEX} >> ${LANG_HEX} COMMAND ${CMAKE_COMMAND} -E cat ${LANG_FINAL_HEX} >> ${LANG_HEX}
COMMENT "Generating final ${variant_name}-Languages.hex" COMMENT "Generating final ${variant_name}-Languages.hex"
BYPRODUCTS ${LANG_HEX} BYPRODUCTS ${LANG_HEX}
DEPENDS ${LANG_FINAL_HEX} DEPENDS ${LANG_FINAL_HEX})
)
add_dependencies(ALL_MULTILANG ${variant_name}-language-hex) add_dependencies(ALL_MULTILANG ${variant_name}-language-hex)
else() else()
set (ALL_VARIANT_HEXES "") set(ALL_VARIANT_HEXES "")
# Non-xflash, e.g. MK2.5 # Non-xflash, e.g. MK2.5
foreach(LANG IN LISTS SELECTED_LANGUAGES) foreach(LANG IN LISTS SELECTED_LANGUAGES)
SET(LANG_HEX_FN ${variant_name}-en_${LANG}) set(LANG_HEX_FN ${variant_name}-en_${LANG})
SET(LANG_HEX ${CMAKE_BINARY_DIR}/${FN_PREFIX}-${LANG_HEX_FN}.hex) set(LANG_HEX ${CMAKE_BINARY_DIR}/${FN_PREFIX}-${LANG_HEX_FN}.hex)
SET(LANG_BIN ${LANG_TMP_DIR}/${variant_name}_${LANG}.bin) set(LANG_BIN ${LANG_TMP_DIR}/${variant_name}_${LANG}.bin)
SET(LANG_FWBIN_TMP ${LANG_TMP_DIR}/${variant_name}-en_${LANG}.bin) set(LANG_FWBIN_TMP ${LANG_TMP_DIR}/${variant_name}-en_${LANG}.bin)
#Intermediate 2-lang bin # Intermediate 2-lang bin
add_custom_command(OUTPUT ${LANG_FWBIN_TMP} add_custom_command(
OUTPUT ${LANG_FWBIN_TMP}
COMMAND ${CMAKE_COMMAND} -E copy ${LANG_FWBIN} ${LANG_FWBIN_TMP} COMMAND ${CMAKE_COMMAND} -E copy ${LANG_FWBIN} ${LANG_FWBIN_TMP}
COMMAND ${CMAKE_SOURCE_DIR}/lang/lang-patchsec.py ${FW_MULTI} ${LANG_BIN} ${LANG_FWBIN_TMP} COMMAND ${CMAKE_SOURCE_DIR}/lang/lang-patchsec.py ${FW_MULTI}
${LANG_BIN} ${LANG_FWBIN_TMP}
DEPENDS ${LANG_FWBIN} ${LANG_BIN} DEPENDS ${LANG_FWBIN} ${LANG_BIN}
COMMENT "Generating ${variant_name}-en_${LANG}.bin" COMMENT "Generating ${variant_name}-en_${LANG}.bin")
)
#Final hex: # Final hex:
add_custom_target(${LANG_HEX_FN} add_custom_target(
${LANG_HEX_FN}
COMMAND ${CMAKE_OBJCOPY} -I binary -O ihex ${LANG_FWBIN_TMP} ${LANG_HEX} COMMAND ${CMAKE_OBJCOPY} -I binary -O ihex ${LANG_FWBIN_TMP} ${LANG_HEX}
BYPRODUCTS ${LANG_HEX} BYPRODUCTS ${LANG_HEX}
DEPENDS ${LANG_FWBIN_TMP} DEPENDS ${LANG_FWBIN_TMP}
COMMENT "Creating ${LANG_HEX_FN}.hex" COMMENT "Creating ${LANG_HEX_FN}.hex")
) list(APPEND ALL_VARIANT_HEXES ${LANG_HEX_FN})
LIST(APPEND ALL_VARIANT_HEXES ${LANG_HEX_FN})
endforeach() endforeach()
add_custom_target("${variant_name}-All-Languages" add_custom_target("${variant_name}-All-Languages"
DEPENDS ${ALL_VARIANT_HEXES} DEPENDS ${ALL_VARIANT_HEXES})
)
add_dependencies(ALL_MULTILANG "${variant_name}-All-Languages") add_dependencies(ALL_MULTILANG "${variant_name}-All-Languages")
endif() endif()
endfunction() endfunction()
if(CMAKE_CROSSCOMPILING) if(CMAKE_CROSSCOMPILING)
# build a list of all supported variants # build a list of all supported variants
file(GLOB ALL_VARIANTS RELATIVE ${PROJECT_SOURCE_DIR}/Firmware/variants ${PROJECT_SOURCE_DIR}/Firmware/variants/*.h) file(
GLOB ALL_VARIANTS
RELATIVE ${PROJECT_SOURCE_DIR}/Firmware/variants
${PROJECT_SOURCE_DIR}/Firmware/variants/*.h)
list(TRANSFORM ALL_VARIANTS REPLACE "\.h$" "") list(TRANSFORM ALL_VARIANTS REPLACE "\.h$" "")
set(FW_VARIANTS ${ALL_VARIANTS} CACHE STRING "Firmware variants to be built") set(FW_VARIANTS
${ALL_VARIANTS}
CACHE STRING "Firmware variants to be built")
foreach(THIS_VAR IN LISTS FW_VARIANTS) foreach(THIS_VAR IN LISTS FW_VARIANTS)
if(NOT ${THIS_VAR} IN_LIST ALL_VARIANTS) if(NOT ${THIS_VAR} IN_LIST ALL_VARIANTS)
@ -490,11 +526,13 @@ if(CMAKE_CROSSCOMPILING)
message("Variant added: ${THIS_VAR}") message("Variant added: ${THIS_VAR}")
string(REPLACE "-E3Dv6full" "" DIR_NAME "${THIS_VAR}") string(REPLACE "-E3Dv6full" "" DIR_NAME "${THIS_VAR}")
string(REPLACE "1_75mm_" "" DIR_NAME "${DIR_NAME}") string(REPLACE "1_75mm_" "" DIR_NAME "${DIR_NAME}")
# Generate a file in a subfolder so that we can organize things a little more neatly in VS code # Generate a file in a subfolder so that we can organize things a little
FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/build_gen/${DIR_NAME}) # more neatly in VS code
FILE(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/build_gen/${DIR_NAME}/CMakeLists.txt "project(${DIR_NAME})\nfw_add_variant(${THIS_VAR})") file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/build_gen/${DIR_NAME})
file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/build_gen/${DIR_NAME}/CMakeLists.txt
"project(${DIR_NAME})\nfw_add_variant(${THIS_VAR})")
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/build_gen/${DIR_NAME}) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/build_gen/${DIR_NAME})
#fw_add_variant(${TRIMMED_NAME}) # fw_add_variant(${TRIMMED_NAME})
endforeach(THIS_VAR IN LISTS FW_VARIANTS) endforeach(THIS_VAR IN LISTS FW_VARIANTS)
endif() endif()