From c59241b9a4d673ac3eb1db8cbfad51eb522f9555 Mon Sep 17 00:00:00 2001 From: hedger Date: Fri, 16 Sep 2022 20:43:09 +0400 Subject: [PATCH] fbt: rebuilding assets when git commit id changes --- assets/SConscript | 4 ++++ site_scons/fbt/version.py | 2 ++ 2 files changed, 6 insertions(+) diff --git a/assets/SConscript b/assets/SConscript index 6328035fa..9776b3fdb 100644 --- a/assets/SConscript +++ b/assets/SConscript @@ -1,5 +1,7 @@ Import("env") +from fbt.version import get_fast_git_version_id + # HACHHACK # Currently injected to CPPPATH by libs - since they are built earlier and depend on assets # env.Append( @@ -7,6 +9,7 @@ Import("env") # Dir("./compiled"), # ] # ) +version_value = Value(get_fast_git_version_id()) assetsenv = env.Clone( tools=["fbt_assets"], @@ -74,6 +77,7 @@ assetsenv.Alias("proto_ver", proto_ver) # Gather everything into a static lib assets_parts = (icons, proto, dolphin_blocking, dolphin_internal, proto_ver) +assetsenv.Depends(assets_parts, version_value) assetslib = assetsenv.Library("${FW_LIB_NAME}", assets_parts) assetsenv.Install("${LIB_DIST_DIR}", assetslib) diff --git a/site_scons/fbt/version.py b/site_scons/fbt/version.py index 4745c7002..1b1c166f2 100644 --- a/site_scons/fbt/version.py +++ b/site_scons/fbt/version.py @@ -1,7 +1,9 @@ import subprocess import datetime +from functools import cache +@cache def get_fast_git_version_id(): try: version = (