From 21587c811e5c5edcdadfbb2f0e5cfb0cb397839e Mon Sep 17 00:00:00 2001 From: Charles-Edouard de la Vergne Date: Fri, 12 Apr 2024 14:10:42 +0200 Subject: [PATCH] Cleanup plugin-sdk: Keep directory name 'src_plugin_sdk' for needed symlinks --- .github/workflows/codespell.yml | 2 +- Makefile | 2 +- {src_common => src_plugin_sdk}/asset_info.h | 0 {src_common => src_plugin_sdk}/caller_api.h | 0 {src_common => src_plugin_sdk}/common_utils.c | 0 {src_common => src_plugin_sdk}/common_utils.h | 0 {src_common => src_plugin_sdk}/eth_plugin_interface.h | 0 {src_common => src_plugin_sdk}/plugin_utils.c | 0 {src_common => src_plugin_sdk}/plugin_utils.h | 0 {src_common => src_plugin_sdk}/tx_content.h | 0 tests/unit/CMakeLists.txt | 2 +- 11 files changed, 3 insertions(+), 3 deletions(-) rename {src_common => src_plugin_sdk}/asset_info.h (100%) rename {src_common => src_plugin_sdk}/caller_api.h (100%) rename {src_common => src_plugin_sdk}/common_utils.c (100%) rename {src_common => src_plugin_sdk}/common_utils.h (100%) rename {src_common => src_plugin_sdk}/eth_plugin_interface.h (100%) rename {src_common => src_plugin_sdk}/plugin_utils.c (100%) rename {src_common => src_plugin_sdk}/plugin_utils.h (100%) rename {src_common => src_plugin_sdk}/tx_content.h (100%) diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 6e8e7a747e..1a0118b13d 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -23,4 +23,4 @@ jobs: with: builtin: clear,rare check_filenames: true - path: src, src_bagl, src_common, src_features, src_nbgl, src_plugin_sdk, src_plugins, doc, client + path: src, src_bagl, src_features, src_nbgl, src_plugin_sdk, src_plugins, doc, client diff --git a/Makefile b/Makefile index 5f04e2b28a..0bfb878b5d 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ APPVERSION_P = 0 APPVERSION = $(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)-dev # Application source files -APP_SOURCE_PATH += src_common src src_features src_plugins +APP_SOURCE_PATH += src_plugin_sdk src src_features src_plugins ifeq ($(TARGET_NAME),TARGET_STAX) APP_SOURCE_PATH += src_nbgl else diff --git a/src_common/asset_info.h b/src_plugin_sdk/asset_info.h similarity index 100% rename from src_common/asset_info.h rename to src_plugin_sdk/asset_info.h diff --git a/src_common/caller_api.h b/src_plugin_sdk/caller_api.h similarity index 100% rename from src_common/caller_api.h rename to src_plugin_sdk/caller_api.h diff --git a/src_common/common_utils.c b/src_plugin_sdk/common_utils.c similarity index 100% rename from src_common/common_utils.c rename to src_plugin_sdk/common_utils.c diff --git a/src_common/common_utils.h b/src_plugin_sdk/common_utils.h similarity index 100% rename from src_common/common_utils.h rename to src_plugin_sdk/common_utils.h diff --git a/src_common/eth_plugin_interface.h b/src_plugin_sdk/eth_plugin_interface.h similarity index 100% rename from src_common/eth_plugin_interface.h rename to src_plugin_sdk/eth_plugin_interface.h diff --git a/src_common/plugin_utils.c b/src_plugin_sdk/plugin_utils.c similarity index 100% rename from src_common/plugin_utils.c rename to src_plugin_sdk/plugin_utils.c diff --git a/src_common/plugin_utils.h b/src_plugin_sdk/plugin_utils.h similarity index 100% rename from src_common/plugin_utils.h rename to src_plugin_sdk/plugin_utils.h diff --git a/src_common/tx_content.h b/src_plugin_sdk/tx_content.h similarity index 100% rename from src_common/tx_content.h rename to src_plugin_sdk/tx_content.h diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt index 3683680a95..088c298b83 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -52,7 +52,7 @@ FetchContent_MakeAvailable(cmocka) add_compile_definitions(TEST DEBUG=0 SKIP_FOR_CMOCKA) include_directories(../../src/) -include_directories(../../src_common) +include_directories(../../src_plugin_sdk) # add cmocka tests add_executable(test_demo tests/demo.c)