~aleteoryx/muditaos: [EGD-7969] Added lacking dependencies in cmake

5 files changed, 34 insertions(+), 28 deletions(-)

M cmake/modules/Assets.cmake
M cmake/modules/DiskImage.cmake
M products/BellHybrid/assets.json
M products/PurePhone/assets.json
M test/CMakeLists.txt

M cmake/modules/Assets.cmake => cmake/modules/Assets.cmake +2 -0

@@ 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

M cmake/modules/DiskImage.cmake => cmake/modules/DiskImage.cmake +2 -3

@@ 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}

M products/BellHybrid/assets.json => products/BellHybrid/assets.json +14 -10

@@ 2,54 2,58 @@
     "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",

M products/PurePhone/assets.json => products/PurePhone/assets.json +15 -15

@@ 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",

M test/CMakeLists.txt => test/CMakeLists.txt +1 -0

@@ 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)