From e2a8334f9623bcb9b351cb2dd404bac22185e269 Mon Sep 17 00:00:00 2001 From: TiejunZhou <50469179+TiejunMS@users.noreply.github.com> Date: Mon, 24 Apr 2023 09:33:00 +0800 Subject: Include tx_user.h in cortex_m3/4/7 IAR and AC5 port (#255) * Include tx_user.h in ARMv7-M IAR port * Include tx_user.h in ARMv7-M AC5 port * Include tx_user.h in cortex_m3/4/7 IAR and AC5 port --- test/ports/azrtos_setenv_ac5.bat | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/ports/azrtos_setenv_ac5.bat b/test/ports/azrtos_setenv_ac5.bat index 144f7a67..5ae48eff 100644 --- a/test/ports/azrtos_setenv_ac5.bat +++ b/test/ports/azrtos_setenv_ac5.bat @@ -7,7 +7,9 @@ IF EXIST "%AZRTOS_ARM_COMPILER_5_DIR%" GOTO FOUND_ARM_COMPILER_5 SET "AZRTOS_ARM_COMPILER_5_DIR=%ProgramFiles%\Arm\Development Studio 2021.0\sw\ARMCompiler5.06u7\bin" IF EXIST "%AZRTOS_ARM_COMPILER_5_DIR%" ( SET "PATH=%AZRTOS_ARM_COMPILER_5_DIR%;%PATH%" - SET "ARMLMD_LICENSE_FILE=%APPDATA%\arm\ds\licenses" + IF "%ARMLMD_LICENSE_FILE%"=="" ( + SET "ARMLMD_LICENSE_FILE=%APPDATA%\arm\ds\licenses" + ) SET "ARM_CONFIG_PATH=%APPDATA%\arm\ds\2021.0" SET "ARM_PRODUCT_DEF=%ProgramFiles%\Arm\Development Studio 2021.0\sw\mappings\gold.elmap" GOTO FOUND_ARM_COMPILER_5 @@ -16,7 +18,9 @@ IF EXIST "%AZRTOS_ARM_COMPILER_5_DIR%" ( SET "AZRTOS_ARM_COMPILER_5_DIR=%ProgramFiles%\Arm\Development Studio 2020.1\sw\ARMCompiler5.06u7\bin" IF EXIST "%AZRTOS_ARM_COMPILER_5_DIR%" ( SET "PATH=%AZRTOS_ARM_COMPILER_5_DIR%;%PATH%" - SET "ARMLMD_LICENSE_FILE=%APPDATA%\arm\ds\licenses" + IF "%ARMLMD_LICENSE_FILE%"=="" ( + SET "ARMLMD_LICENSE_FILE=%APPDATA%\arm\ds\licenses" + ) SET "ARM_CONFIG_PATH=%APPDATA%\arm\ds\2020.1" SET "ARM_PRODUCT_DEF=%ProgramFiles%\Arm\Development Studio 2020.1\sw\mappings\gold.elmap" GOTO FOUND_ARM_COMPILER_5 @@ -25,7 +29,9 @@ IF EXIST "%AZRTOS_ARM_COMPILER_5_DIR%" ( SET "AZRTOS_ARM_COMPILER_5_DIR=%ProgramFiles%\Arm\Development Studio 2020.0\sw\ARMCompiler5.06u6\bin" IF EXIST "%AZRTOS_ARM_COMPILER_5_DIR%" ( SET "PATH=%AZRTOS_ARM_COMPILER_5_DIR%;%PATH%" - SET "ARMLMD_LICENSE_FILE=%APPDATA%\arm\ds\licenses" + IF "%ARMLMD_LICENSE_FILE%"=="" ( + SET "ARMLMD_LICENSE_FILE=%APPDATA%\arm\ds\licenses" + ) SET "ARM_CONFIG_PATH=%APPDATA%\arm\ds\2020.0" SET "ARM_PRODUCT_DEF=%ProgramFiles%\Arm\Development Studio 2020.0\sw\mappings\gold.elmap" GOTO FOUND_ARM_COMPILER_5 @@ -34,7 +40,9 @@ IF EXIST "%AZRTOS_ARM_COMPILER_5_DIR%" ( SET "AZRTOS_ARM_COMPILER_5_DIR=%ProgramFiles%\DS-5 v5.29.3\sw\ARMCompiler5.06u6\bin" IF EXIST "%AZRTOS_ARM_COMPILER_5_DIR%" ( SET "PATH=%AZRTOS_ARM_COMPILER_5_DIR%;%PATH%" - SET "ARMLMD_LICENSE_FILE=%APPDATA%\ARM\DS-5\licenses" + IF "%ARMLMD_LICENSE_FILE%"=="" ( + SET "ARMLMD_LICENSE_FILE=%APPDATA%\arm\ds\licenses" + ) SET "ARM_CONFIG_PATH=%APPDATA%\ARM\DS-5_v5.29.3" SET "ARM_PRODUCT_PATH=%ProgramFiles%\DS-5 v5.29.3\sw\mappings" GOTO FOUND_ARM_COMPILER_5 -- cgit v1.3.1