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

Workaround for Windows/Mac wildcard issue 

Only zip MK2.5/S and E3DREVO on Linux
This commit is contained in:
3d-gussner 2024-07-09 15:43:52 +02:00
parent e405e9140c
commit d769fcc094
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
CMakeLists.txt
View File

@ -53,6 +53,7 @@ message(STATUS "Project version (Configuration.h): ${PROJECT_VERSION}")
#message(STATUS "Project version commit number....: ${PROJECT_VERSION_COMMIT}") #For debuging #message(STATUS "Project version commit number....: ${PROJECT_VERSION_COMMIT}") #For debuging
message(STATUS "Filename suffix..................: ${FN_VERSION_SUFFIX}") message(STATUS "Filename suffix..................: ${FN_VERSION_SUFFIX}")
message(STATUS "Filename debug suffix ...........: ${FN_VERSION_DEBUG_SUFFIX}") message(STATUS "Filename debug suffix ...........: ${FN_VERSION_DEBUG_SUFFIX}")
#message(STATUS "Host OS .........................: ${CMAKE_HOST_SYSTEM_NAME}")
# testing # testing
# SET(FW_COMMIT_DSC "v3.13.0-1234") # SET(FW_COMMIT_DSC "v3.13.0-1234")
@ -587,15 +588,17 @@ function(fw_add_variant variant_name)
add_custom_target(${FW_LANG_FINAL} DEPENDS ${FW_LANG_FINAL}.hex) add_custom_target(${FW_LANG_FINAL} DEPENDS ${FW_LANG_FINAL}.hex)
list(APPEND ALL_VARIANT_HEXES ${FW_LANG_FINAL}) list(APPEND ALL_VARIANT_HEXES ${FW_LANG_FINAL})
endforeach() endforeach()
add_custom_target("${variant_name}-All-Languages" DEPENDS ${ALL_VARIANT_HEXES}) if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
add_custom_command(TARGET "${variant_name}-All-Languages" add_custom_target("${variant_name}-All-Languages" DEPENDS ${ALL_VARIANT_HEXES})
POST_BUILD add_custom_command(TARGET "${variant_name}-All-Languages"
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory "release" WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -E tar "cfv" "release/${variant_name}_${FN_VERSION_SUFFIX}.zip" --format=zip ${variant_name}_${FN_VERSION_SUFFIX}_en*.hex COMMAND ${CMAKE_COMMAND} -E make_directory "release"
BYPRODUCTS "${CMAKE_BINARY_DIR}/release/${variant_name}_${FN_VERSION_SUFFIX}.zip" COMMAND ${CMAKE_COMMAND} -E tar "cfv" "release/${variant_name}_${FN_VERSION_SUFFIX}.zip" --format=zip ${variant_name}_${FN_VERSION_SUFFIX}_en*.hex
) BYPRODUCTS "${CMAKE_BINARY_DIR}/release/${variant_name}_${FN_VERSION_SUFFIX}.zip"
add_dependencies(ALL_MULTILANG "${variant_name}-All-Languages") )
add_dependencies(ALL_MULTILANG "${variant_name}-All-Languages")
endif()
endif() endif()
endfunction() endfunction()
@ -639,13 +642,15 @@ endif()
SET(REVO_FW_ZIP_NAME "E3D_REVO_FW_MK3_MK3S_MK3S+_${FN_VERSION_SUFFIX}.zip") SET(REVO_FW_ZIP_NAME "E3D_REVO_FW_MK3_MK3S_MK3S+_${FN_VERSION_SUFFIX}.zip")
add_custom_command(TARGET ALL_MULTILANG if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
POST_BUILD add_custom_command(TARGET ALL_MULTILANG
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/release POST_BUILD
BYPRODUCTS ${CMAKE_BINARY_DIR}/release/${REVO_FW_ZIP_NAME} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/release
COMMAND ${CMAKE_COMMAND} -E tar "cfv" "${REVO_FW_ZIP_NAME}" --format=zip *E3DREVO*.hex BYPRODUCTS ${CMAKE_BINARY_DIR}/release/${REVO_FW_ZIP_NAME}
COMMAND ${CMAKE_COMMAND} -E rm *E3DREVO*.hex COMMAND ${CMAKE_COMMAND} -E tar "cfv" "${REVO_FW_ZIP_NAME}" --format=zip *E3DREVO*.hex
) COMMAND ${CMAKE_COMMAND} -E rm *E3DREVO*.hex
)
endif()
# #
# Tests # Tests