From f472a31da4498e8c22cdcbfc47a988a5f46983d4 Mon Sep 17 00:00:00 2001 From: Frank Livingston Date: Thu, 29 Mar 2018 13:51:58 -0500 Subject: [PATCH] PASDK-605:Add PASDK root dir variable to Windows environment setup batch file --- scripts/build_fd_pkg.bat | 3 +-- scripts/build_paf_libs.bat | 3 +-- scripts/setup_env.bat | 10 ++++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/build_fd_pkg.bat b/scripts/build_fd_pkg.bat index a70bc262..d58da933 100644 --- a/scripts/build_fd_pkg.bat +++ b/scripts/build_fd_pkg.bat @@ -12,8 +12,7 @@ @echo Executing: %~fn0 %1 if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0.. - -set PASDK_ROOT=%PASDK_ROOT_DIR% +if "%PASDK_ROOT%" == "" set PASDK_ROOT=%PASDK_ROOT_DIR% :: Set PASDK local root directory set PASDK_LROOT_DIR=%PASDK_ROOT_DIR%\pasdk diff --git a/scripts/build_paf_libs.bat b/scripts/build_paf_libs.bat index 1d0b5ac9..f267f0fd 100644 --- a/scripts/build_paf_libs.bat +++ b/scripts/build_paf_libs.bat @@ -15,8 +15,7 @@ @echo Executing: %~fn0 %1 if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0.. - -set PASDK_ROOT=%PASDK_ROOT_DIR% +if "%PASDK_ROOT%" == "" set PASDK_ROOT=%PASDK_ROOT_DIR% :: Set PASDK local root directory set PASDK_LROOT_DIR=%PASDK_ROOT_DIR%\pasdk diff --git a/scripts/setup_env.bat b/scripts/setup_env.bat index 58581ca5..38f911ef 100644 --- a/scripts/setup_env.bat +++ b/scripts/setup_env.bat @@ -122,13 +122,23 @@ set SED_INSTALL_DIR=%PA_TOOLS_DIR%\GnuWin32 set PYTHON_INSTALL_DIR=%PA_TOOLS_DIR%\Python%PYTHON_VER% set ZIP_INSTALL_DIR=%PA_TOOLS_DIR% set CYGWIN_INSTALL_DIR=%TOOLS_DRIVE%\cygwin\bin +:: :: Codegen tools +:: NOTE: These installation locations are tied into the build set ARM_CGT_INSTALL_DIR=%TI_TOOLS_DIR%\gcc-arm-none-eabi-%ARM_CGT_VERSION% set ARM_CGT_INSTALL_DIR_DH_DEC=%TI_TOOLS_DIR%\gcc-arm-none-eabi-%ARM_CGT_VERSION_DH_DEC% set ARM_CGT_INSTALL_DIR_DTSX_DEC=%TI_TOOLS_DIR%\gcc-arm-none-eabi-%ARM_CGT_VERSION_DTSX_DEC% set C6X_CGT_INSTALL_DIR=%TI_TOOLS_DIR%\ti-cgt-c6000_%C6X_CGT_VER_DOT% set C6X_CGT_INSTALL_DIR_DH_ASP=%TI_TOOLS_DIR%\ti-cgt-c6000_%C6X_CGT_VER_DOT_DH_ASP% set C6X_CGT_INSTALL_DIR_DTSX_ASP_PARMA=%TI_TOOLS_DIR%\ti-cgt-c6000_%C6X_CGT_VER_DOT_DTSX_ASP_PARMA% +:: +:: PASDK +:: +if "%PASDK_ROOT%" NEQ "" ( + set PASDK_ROOT=%PASDK_ROOT_DIR% +) else ( + set PASDK_ROOT=%~dp0.. +) rem @echo ####################################################################### -- 2.39.2