From 22a4979d9191892a5337ecee5a0409be5e86b8d5 Mon Sep 17 00:00:00 2001 From: Adam Dobrowolski Date: Mon, 15 Nov 2021 16:33:41 +0100 Subject: [PATCH] [EGD-7969] Added lacking dependencies in cmake We didn't have proper dependency for assets --- cmake/modules/Assets.cmake | 2 ++ cmake/modules/DiskImage.cmake | 5 ++--- products/BellHybrid/assets.json | 24 ++++++++++++++---------- products/PurePhone/assets.json | 30 +++++++++++++++--------------- test/CMakeLists.txt | 1 + 5 files changed, 34 insertions(+), 28 deletions(-) diff --git a/cmake/modules/Assets.cmake b/cmake/modules/Assets.cmake index da54010ec5bb7d927cd57bd14b8dd6d4a1f089aa..6633d7780203c0d38500536c057350db7e2a18d1 100644 --- a/cmake/modules/Assets.cmake +++ b/cmake/modules/Assets.cmake @@ -15,6 +15,7 @@ function(add_assets_target) add_custom_target( ${_ASSETS_TARGET} + DEPENDS json-target COMMAND mkdir -p ${_ASSETS_DEST_DIR} COMMAND rsync -qravu --delete ${_ASSETS_SOURCE_DIR}/.boot.json* @@ -23,6 +24,7 @@ function(add_assets_target) COMMAND rsync -qravu --delete ${_ASSETS_SOURCE_DIR}/assets ${_ASSETS_SOURCE_DIR}/country-codes.db + ${_ASSETS_SOURCE_DIR}/Luts.bin ${_ASSETS_DEST_DIR}/current COMMAND rsync -qravu --delete ${EXCLUDED} ${_ASSETS_SOURCE_DIR}/user diff --git a/cmake/modules/DiskImage.cmake b/cmake/modules/DiskImage.cmake index caeb401fc70a0c442c34ec1c2102d26d5b7763bc..9e6186b78ffda01fb201acd99bedb1c824255256 100644 --- a/cmake/modules/DiskImage.cmake +++ b/cmake/modules/DiskImage.cmake @@ -2,7 +2,7 @@ function(add_image) cmake_parse_arguments( _ARG "" - "PRODUCT;SYSROOT;ASSETS;IMAGE_PARTITIONS" + "PRODUCT;SYSROOT;ASSETS;IMAGE_PARTITIONS;DEPENDS" "" ${ARGN} ) @@ -59,8 +59,7 @@ function(add_image) add_custom_command( OUTPUT ${DISK_IMAGE_NAME} - DEPENDS ${COMMAND_DEPENDS} - DEPENDS json-target + DEPENDS ${COMMAND_DEPENDS} ${_ARG_DEPENDS} COMMAND ${SCRIPT_PATH} ${DISK_IMAGE_NAME} diff --git a/products/BellHybrid/assets.json b/products/BellHybrid/assets.json index 13a9e4c5a3490d9a9f117b935cb4fac789a2ffdc..48f3cce51d1c16da0112c32001a88094830e81fa 100644 --- a/products/BellHybrid/assets.json +++ b/products/BellHybrid/assets.json @@ -1,55 +1,59 @@ { "comment": "This is kiss structure - asset path & sha", "assets": [ + { + "name": "./fonts/pure/dejavu_sans_bold_27.mpf", + "output":"image/assets/fonts/dejavu_sans_bold_27.mpf" + }, { "name": "./fonts/bell/gt_pressura_regular_38.mpf", - "output": "assets/fonts/gt_pressura_regular_38.mpf", + "output": "image/assets/fonts/gt_pressura_regular_38.mpf", "ref": "fd168040c5d1216d457e6cf223e8ea9bb76bf7b" }, { "name": "./fonts/bell/gt_pressura_light_38.mpf", - "output": "assets/fonts/gt_pressura_light_38.mpf", + "output": "image/assets/fonts/gt_pressura_light_38.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a" }, { "name": "./fonts/bell/gt_pressura_regular_90.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a", - "output": "assets/fonts/gt_pressura_regular_90.mpf" + "output": "image/assets/fonts/gt_pressura_regular_90.mpf" }, { "name": "./fonts/bell/gt_pressura_regular_190.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a", - "output": "assets/fonts/gt_pressura_regular_190.mpf" + "output": "image/assets/fonts/gt_pressura_regular_190.mpf" }, { "name": "./fonts/common/gt_pressura_light_30.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a", - "output": "assets/fonts/gt_pressura_light_30.mpf" + "output": "image/assets/fonts/gt_pressura_light_30.mpf" }, { "name": "./fonts/common/gt_pressura_regular_30.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a", - "output": "assets/fonts/gt_pressura_regular_30.mpf" + "output": "image/assets/fonts/gt_pressura_regular_30.mpf" }, { "name": "./fonts/common/gt_pressura_bold_30.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a", - "output": "assets/fonts/gt_pressura_bold_30.mpf" + "output": "image/assets/fonts/gt_pressura_bold_30.mpf" }, { "name": "./fonts/common/gt_pressura_regular_46.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a", - "output": "assets/fonts/gt_pressura_regular_46.mpf" + "output": "image/assets/fonts/gt_pressura_regular_46.mpf" }, { "name": "./fonts/common/gt_pressura_light_46.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a", - "output": "assets/fonts/gt_pressura_light_46.mpf" + "output": "image/assets/fonts/gt_pressura_light_46.mpf" }, { "name": "./fonts/common/gt_pressura_light_90.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a", - "output": "assets/fonts/gt_pressura_light_90.mpf" + "output": "image/assets/fonts/gt_pressura_light_90.mpf" }, { "name": "./image/Luts.bin", diff --git a/products/PurePhone/assets.json b/products/PurePhone/assets.json index c2c4eef416f4151bbf5fd88773dfce96457c8af4..ae845512dc9c41da3adef80f0c266e26b9884cd2 100644 --- a/products/PurePhone/assets.json +++ b/products/PurePhone/assets.json @@ -2,69 +2,69 @@ "assets": [ { "name": "./fonts/pure/dejavu_sans_bold_27.mpf", - "output":"assets/fonts/dejavu_sans_bold_27.mpf" + "output":"image/assets/fonts/dejavu_sans_bold_27.mpf" }, { "name": "./fonts/pure/gt_pressura_regular_20.mpf", - "output":"assets/fonts/gt_pressura_regular_20.mpf" + "output":"image/assets/fonts/gt_pressura_regular_20.mpf" }, { "name": "./fonts/pure/gt_pressura_bold_20.mpf", - "output":"assets/fonts/gt_pressura_bold_20.mpf" + "output":"image/assets/fonts/gt_pressura_bold_20.mpf" }, { "name": "./fonts/pure/gt_pressura_regular_24.mpf", - "output":"assets/fonts/gt_pressura_regular_24.mpf" + "output":"image/assets/fonts/gt_pressura_regular_24.mpf" }, { "name": "./fonts/pure/gt_pressura_bold_24.mpf", - "output":"assets/fonts/gt_pressura_bold_24.mpf" + "output":"image/assets/fonts/gt_pressura_bold_24.mpf" }, { "name": "./fonts/pure/gt_pressura_light_27.mpf", - "output":"assets/fonts/gt_pressura_light_27.mpf" + "output":"image/assets/fonts/gt_pressura_light_27.mpf" }, { "name": "./fonts/pure/gt_pressura_regular_27.mpf", - "output":"assets/fonts/gt_pressura_regular_27.mpf" + "output":"image/assets/fonts/gt_pressura_regular_27.mpf" }, { "name": "./fonts/pure/gt_pressura_bold_27.mpf", - "output":"assets/fonts/gt_pressura_bold_27.mpf" + "output":"image/assets/fonts/gt_pressura_bold_27.mpf" }, { "name": "./fonts/pure/gt_pressura_bold_32.mpf", - "output":"assets/fonts/gt_pressura_bold_32.mpf" + "output":"image/assets/fonts/gt_pressura_bold_32.mpf" }, { "name": "./fonts/common/gt_pressura_light_30.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a", - "output": "assets/fonts/gt_pressura_light_30.mpf" + "output": "image/assets/fonts/gt_pressura_light_30.mpf" }, { "name": "./fonts/common/gt_pressura_regular_30.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a", - "output": "assets/fonts/gt_pressura_regular_30.mpf" + "output": "image/assets/fonts/gt_pressura_regular_30.mpf" }, { "name": "./fonts/common/gt_pressura_bold_30.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a", - "output": "assets/fonts/gt_pressura_bold_30.mpf" + "output": "image/assets/fonts/gt_pressura_bold_30.mpf" }, { "name": "./fonts/common/gt_pressura_regular_46.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a", - "output": "assets/fonts/gt_pressura_regular_46.mpf" + "output": "image/assets/fonts/gt_pressura_regular_46.mpf" }, { "name": "./fonts/common/gt_pressura_light_46.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a", - "output": "assets/fonts/gt_pressura_light_46.mpf" + "output": "image/assets/fonts/gt_pressura_light_46.mpf" }, { "name": "./fonts/common/gt_pressura_light_90.mpf", "ref": "10c74fcb09c2022325767cad735c0183b6f5393a", - "output": "assets/fonts/gt_pressura_light_90.mpf" + "output": "image/assets/fonts/gt_pressura_light_90.mpf" }, { "name": "./image/Luts.bin", diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 409d82ad3c13d826391f5b0699242ea4de62ee58..85918ead58a436e01f5106da5e02b92c1447155b 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -36,6 +36,7 @@ add_image( SYSROOT test-sysroot ASSETS test-assets IMAGE_PARTITIONS ${CMAKE_SOURCE_DIR}/config/products/PurePhone/image_partitions.map + DEPENDS test-assets ) macro(enable_test_filesystem)