Remove unzip (git tools) from path since this disturbs PAF library builds

diff --git a/scripts/build_ccs_projects.bat b/scripts/build_ccs_projects.bat
index c5569653af91f592f926a5317c8b2e33030ce356..80625d1165b34ae138e5354e91edc853ec363d80 100644 (file)
--- a/scripts/build_ccs_projects.bat
+++ b/scripts/build_ccs_projects.bat
@@ -13,6 +13,9 @@
 
 if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..\
 
+for %%i in (git.exe) do set GIT_PATH=%%~sp$PATH:i
+set UNZIP_PATH=%GIT_PATH%..\usr\bin
+
 :: Set PASDK local root directory
 set PASDK_LROOT_DIR=%PASDK_ROOT_DIR%pasdk
 :: Set custom Processor SDK local root directory
@@ -42,7 +45,7 @@ set SAVE_CYGWIN=%CYGWIN%
 set CYGWIN=nontsec
 
 
-:: Initialize RTSC tools discovery path
+rem :: Initialize RTSC tools discovery path
 eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.ccstudio.apps.initialize -rtsc.productDiscoveryPath %PSDK_CUST_LROOT_DIR%
 eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.ccstudio.apps.initialize -rtsc.productDiscoveryPath %PSDK_CUST_LROOT_DIR%
 eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.ccstudio.apps.initialize -rtsc.productDiscoveryPath %PSDK_CUST_LROOT_DIR%
@@ -79,12 +82,12 @@ mkdir %PKG_DIR%
 ::if exist %OAR_PKG_INSTALL_DIR% ( rmdir /S / Q %OAR_PKG_INSTALL_DIR% )
 ::if exist %DDP_PKG_INSTALL_DIR% ( rmdir /S / Q %DDP_PKG_INSTALL_DIR% )
 ::if exist %MATTHD_PKG_INSTALL_DIR% ( rmdir /S / Q %MATTHD_PKG_INSTALL_DIR% )
-@unzip -o -d %BMDA_PKG_INSTALL_DIR% %PKG_DIR%\bmda.zip
-@unzip -o -d %CAR_PKG_INSTALL_DIR% %PKG_DIR%\car.zip
-@unzip -o -d %OAR_PKG_INSTALL_DIR% %PKG_DIR%\oar.zip
-@unzip -o -d %DDP_PKG_INSTALL_DIR% %PKG_DIR%\ddp.zip
-@unzip -o -d %MATTHD_PKG_INSTALL_DIR% %PKG_DIR%\matthd.zip
-@unzip -o -d %INTR_PKG_INSTALL_DIR% %PKG_DIR%\intrinsics.zip
+@%UNZIP_PATH%\unzip -o -d %BMDA_PKG_INSTALL_DIR% %PKG_DIR%\bmda.zip
+@%UNZIP_PATH%\unzip -o -d %CAR_PKG_INSTALL_DIR% %PKG_DIR%\car.zip
+@%UNZIP_PATH%\unzip -o -d %OAR_PKG_INSTALL_DIR% %PKG_DIR%\oar.zip
+@%UNZIP_PATH%\unzip -o -d %DDP_PKG_INSTALL_DIR% %PKG_DIR%\ddp.zip
+@%UNZIP_PATH%\unzip -o -d %MATTHD_PKG_INSTALL_DIR% %PKG_DIR%\matthd.zip
+@%UNZIP_PATH%\unzip -o -d %INTR_PKG_INSTALL_DIR% %PKG_DIR%\intrinsics.zip
 
 
 ::
@@ -100,6 +103,7 @@ eclipsec 
 :: Build DSP application project
 eclipsec \96noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.ccstudio.apps.projectBuild -ccs.projects test_dsp -ccs.configuration Debug
 
+set UNZIP_PATH=
 set PASDK_LROOT_DIR=
 set PSDK_CUST_LROOT_DIR=
 set PDK_CUST_LROOT_DIR=

diff --git a/scripts/setup_env.bat b/scripts/setup_env.bat
index b40773681d30dc6e5830c3305b2c4810e6045362..11a3ee001a7bf35ce305e45c4e12f80b331acbae 100644 (file)
--- a/scripts/setup_env.bat
+++ b/scripts/setup_env.bat
@@ -63,7 +63,7 @@ set PATH=%XDC_INSTALL_DIR%\jre\bin;%PATH%
 set PATH=%PATH%;%CCS_INSTALL_DIR%\eclipse
 set PATH=%PATH%;%SED_INSTALL_DIR%\bin
 set PATH=%PATH%;%PYTHON_INSTALL_DIR%;%PYTHON_INSTALL_DIR%\Scripts
-set PATH=%PATH%;%GIT_PATH%;%GIT_PATH%..\usr\bin
+set PATH=%PATH%;%GIT_PATH%
 set PATH=%PATH%;%ZIP_INSTALL_DIR%\7-Zip
 set GIT_PATH=