PASDK-605:Add PASDK root dir variable to Windows environment setup batch file
authorFrank Livingston <frank-livingston@ti.com>
Thu, 29 Mar 2018 18:51:58 +0000 (13:51 -0500)
committerFrank Livingston <frank-livingston@ti.com>
Thu, 29 Mar 2018 18:51:58 +0000 (13:51 -0500)
scripts/build_fd_pkg.bat
scripts/build_paf_libs.bat
scripts/setup_env.bat

index a70bc262b74c021a68bf2445c054afee6bbe48f5..d58da9336c0d9e03f02fa9f47fbe26ed3138eab3 100644 (file)
@@ -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
index 1d0b5ac90c7f979606f9c46aae1533e1808c28fa..f267f0fd723e23f11a4f2f3d019d27b079ca4137 100644 (file)
@@ -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
index 58581ca54047bfd46495df35fa426b5bc5323933..38f911efac8eb7eacb3c4d9ad543ae76bf660aae 100644 (file)
@@ -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 #######################################################################