Save / restore path before / after PDK LLD libraries build

diff --git a/scripts/build_ccs_projects.bat b/scripts/build_ccs_projects.bat
index 80625d1165b34ae138e5354e91edc853ec363d80..0b4363a08bdb838cd89a1933da2c225b049681b6 100644 (file)
--- a/scripts/build_ccs_projects.bat
+++ b/scripts/build_ccs_projects.bat
@@ -13,8 +13,10 @@
 
 if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..\
 
-for %%i in (git.exe) do set GIT_PATH=%%~sp$PATH:i
+:: Set unzip path
+for %%i in (git.exe) do set GIT_PATH=%DRIVE%%%~sp$PATH:i
 set UNZIP_PATH=%GIT_PATH%..\usr\bin
+set GIT_PATH=
 
 :: Set PASDK local root directory
 set PASDK_LROOT_DIR=%PASDK_ROOT_DIR%pasdk

diff --git a/scripts/build_pdk_libs.bat b/scripts/build_pdk_libs.bat
index 29b9f633c40865747984d373195b51d75e851a37..ac9b98857f29996649fc0535045b86799a78f9b1 100644 (file)
--- a/scripts/build_pdk_libs.bat
+++ b/scripts/build_pdk_libs.bat
@@ -11,6 +11,9 @@
 
 if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..\
 
+:: Save path
+set PATH_ORG=%PATH%
+
 :: Set custom Processor SDK local root directory
 set PSDK_CUST_LROOT_DIR=%PASDK_ROOT_DIR%psdk_cust
 
@@ -37,4 +40,7 @@ popd
 
 popd
 
+:: Restore path
+set PATH=%PATH_ORG%
+
 set PSDK_CUST_LROOT_DIR=

diff --git a/scripts/setup_env.bat b/scripts/setup_env.bat
index 11a3ee001a7bf35ce305e45c4e12f80b331acbae..efff39081ee3b48d4e41c58a364f512757adc457 100644 (file)
--- a/scripts/setup_env.bat
+++ b/scripts/setup_env.bat
@@ -56,7 +56,7 @@ set ZIP_INSTALL_DIR=%PA_TOOLS_DIR%
 :: *************************************************************************
 :: ** Set the PATH
 :: *************************************************************************
-for %%i in (git.exe) do set GIT_PATH=%%~sp$PATH:i
+for %%i in (git.exe) do set GIT_PATH=%DRIVE%%%~sp$PATH:i
 set PATH=%SystemRoot%;%SystemRoot%\system32
 set PATH=%XDC_INSTALL_DIR%;%PATH%
 set PATH=%XDC_INSTALL_DIR%\jre\bin;%PATH%