From e83ec13d8317595ba82f6b170199a19addcf6ee8 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Fri, 19 Apr 2024 20:35:44 -0400 Subject: [PATCH] only: shared_io.resources --- .../workflows/custom-board-build/action.yaml | 4 ++++ java_console/shared_io/build.gradle | 19 ++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.github/workflows/custom-board-build/action.yaml b/.github/workflows/custom-board-build/action.yaml index 0573db759b..61ac08ce24 100644 --- a/.github/workflows/custom-board-build/action.yaml +++ b/.github/workflows/custom-board-build/action.yaml @@ -143,6 +143,10 @@ runs: echo "SIM_OUTPUT_ROOT_FOLDER=$(realpath --relative-to=${{inputs.rusefi_dir}}/firmware ${{inputs.sim_output}})/" >> $GITHUB_ENV source ${{inputs.rusefi_dir}}/firmware/config/boards/common_script_read_meta_env.inc "${{inputs.meta_info}}" cd ${{inputs.rusefi_dir}}/firmware + ABSOLUTE_BOARD_DIR=${{github.workspace}}/$BOARD_DIR + # sometimes absolute path is simpler + echo "ABSOLUTE_BOARD_DIR=$ABSOLUTE_BOARD_DIR" >> $GITHUB_ENV + # todo: why do we require relative path exactly? BOARD_DIR=$(realpath --relative-to=. "${{github.workspace}}/$BOARD_DIR") BOARD_META_PATH=$(realpath --relative-to=. "${{github.workspace}}/$BOARD_META_PATH") echo "BOARD_DIR=$BOARD_DIR" >> $GITHUB_ENV diff --git a/java_console/shared_io/build.gradle b/java_console/shared_io/build.gradle index e9617211ea..1888993656 100644 --- a/java_console/shared_io/build.gradle +++ b/java_console/shared_io/build.gradle @@ -1,8 +1,25 @@ plugins { - id 'java' + id 'java' } apply from: '../../android/dependencies.gradle' +java { + var boardDir = System.getenv("ABSOLUTE_BOARD_DIR") + println("gradle says: ABSOLUTE_BOARD_DIR=" + boardDir) + if (boardDir != null) { + var customResourcesFolder = boardDir + "/shared_io.resources" + if (new File(customResourcesFolder).exists()) { + println(customResourcesFolder + " found!") + processResources { + duplicatesStrategy = DuplicatesStrategy.INCLUDE + from(customResourcesFolder) + } + } else { + println(customResourcesFolder + " not found.") + } + } +} + // TODO: rename folder to core_io // this CORE module cannot depend on model/ini!