From: Frank Livingston <frank-livingston@ti.com>
Date: Sat, 23 Sep 2017 06:03:48 +0000 (-0500)
Subject: PASDK-359:Fix various problem with build scripts
X-Git-Url: https://git.ti.com/gitweb?p=processor-sdk%2Fperformance-audio-sr.git;a=commitdiff_plain;h=4c131fa1f6ab9e87aafbc5e66225307e194e65da

PASDK-359:Fix various problem with build scripts

- PASDK root dir containing trailing backslash
- determination of unzip path
- install_code.bat modes other than SuperRepo
---

diff --git a/build_all.bat b/build_all.bat
index 1692aa72..cf76ae49 100644
--- a/build_all.bat
+++ b/build_all.bat
@@ -44,7 +44,9 @@ goto end
 
 
 :cont1
+:: Set PASDK root directory
 set PASDK_ROOT_DIR=%~dp0
+if "%PASDK_ROOT_DIR:~-1%"=="\" set PASDK_ROOT_DIR=%PASDK_ROOT_DIR:~0,-1%
 
 if "%3" NEQ "SDF" goto install_tools
 :: Set PASDK target and version
@@ -54,7 +56,7 @@ set PASDK_VERSION=01_00_00_05
 set FD_PKG_VERSION=01_00_00_05
 
 :: Set release directory
-set RELEASE_DIR=%PASDK_ROOT_DIR%release
+set RELEASE_DIR=%PASDK_ROOT_DIR%\release
 :: Set FD package directory
 set FD_PKG_DIR=%RELEASE_DIR%\fd_package
 :: Set OS package directory
@@ -65,7 +67,6 @@ set DHIP_PKG_DIR=%RELEASE_DIR%\dhip_package
 :: Set DTSX-IP package directory
 set DTSXIP_PKG_DIR=%RELEASE_DIR%\dtsxip_package
 
-
 if exist %RELEASE_DIR%\nul ( rmdir /S / Q %RELEASE_DIR% )
 
 
@@ -86,9 +87,9 @@ if exist %RELEASE_DIR%\nul ( rmdir /S / Q %RELEASE_DIR% )
 :: *** Build
 :: *************************************************************************
 :: Build DSP PDK LLD libraries
-::@pushd scripts
-::@cmd /c build_pdk_libs.bat
-::@popd
+rem @pushd scripts
+rem @cmd /c build_pdk_libs.bat
+rem @popd
 
 :: Build ARM/DSP PAF libraries
 @pushd scripts
diff --git a/scripts/build_ccs_projects.bat b/scripts/build_ccs_projects.bat
index e875a78c..475ef5d9 100644
--- a/scripts/build_ccs_projects.bat
+++ b/scripts/build_ccs_projects.bat
@@ -15,12 +15,12 @@
 :: %2: Build profile: Debug, Release, or SDF
 @echo Executing:  %~fn0 %1 %2
 
-if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..\
+if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..
 
 :: Set PASDK local root directory
-set PASDK_LROOT_DIR=%PASDK_ROOT_DIR%pasdk
+set PASDK_LROOT_DIR=%PASDK_ROOT_DIR%\pasdk
 :: Set custom Processor SDK local root directory
-set PSDK_CUST_LROOT_DIR=%PASDK_ROOT_DIR%psdk_cust
+set PSDK_CUST_LROOT_DIR=%PASDK_ROOT_DIR%\psdk_cust
 
 :: Set custom PDK install directory
 ::set PDK_VERSION=1_0_1_2_eng
diff --git a/scripts/build_dh_libs.bat b/scripts/build_dh_libs.bat
index e39dd52d..1c598832 100644
--- a/scripts/build_dh_libs.bat
+++ b/scripts/build_dh_libs.bat
@@ -1,6 +1,6 @@
 @echo off
 :: *************************************************************************
-::  FILE           : build_alg_libs.bat
+::  FILE           : build_dh_libs.bat
 ::  DESCRIPTION    :
 ::
 ::     Builds ARM/DSP Atmos component libraries.
@@ -10,17 +10,17 @@
 
 @echo Executing:  %~fn0
 
-if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..\
+if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..
 
 :: Save path
 set PATH_ORG=%PATH%
 
 :: Set PASDK local root directory
-set PASDK_LROOT_DIR=%PASDK_ROOT_DIR%pasdk
+set PASDK_LROOT_DIR=%PASDK_ROOT_DIR%\pasdk
 :: Set PAF root directory
 set PAF_ROOT_DIR=%PASDK_LROOT_DIR%\paf
 :: Set Dolby IP local root directory
-set DOLBY_IP_LROOT=%PASDK_ROOT_DIR%dolby_ip
+set DOLBY_IP_LROOT=%PASDK_ROOT_DIR%\dolby_ip
 
 set PASDK_ROOT_DIR_FS=%PASDK_ROOT_DIR:\=/%
 set DOLBY_IP_LROOT_FS=%DOLBY_IP_LROOT:\=/%
diff --git a/scripts/build_dhip_pkg.bat b/scripts/build_dhip_pkg.bat
index 0e45d230..19c63991 100644
--- a/scripts/build_dhip_pkg.bat
+++ b/scripts/build_dhip_pkg.bat
@@ -12,10 +12,10 @@
 :: %2: package destination directory
 @echo Executing:  %~fn0 %1 %2
 
-if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..\
+if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..
 
 :: Set Dolby IP local root directory
-set DOLBY_IP_LROOT=%PASDK_ROOT_DIR%dolby_ip
+set DOLBY_IP_LROOT=%PASDK_ROOT_DIR%\dolby_ip
 
 :: Set package directory
 if "%2"=="" goto def_prm_pkg_dest_dir
diff --git a/scripts/build_dhip_pkgs.bat b/scripts/build_dhip_pkgs.bat
index 033d7493..2d7776d0 100644
--- a/scripts/build_dhip_pkgs.bat
+++ b/scripts/build_dhip_pkgs.bat
@@ -11,7 +11,7 @@
 :: %1: packages destination directory
 @echo Executing:  %~fn0 %1
 
-if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..\
+if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..
 
 if "%1"=="" goto def_prm_dhip_pkgs_dest_dir
 
@@ -38,8 +38,8 @@ if NOT exist %DHIP_PKGS_DEST_DIR%\nul ( mkdir %DHIP_PKGS_DEST_DIR% )
 @call build_dhip_pkg oar %DHIP_PKGS_DEST_DIR%
 @call build_dhip_pkg intrinsics %DHIP_PKGS_DEST_DIR%
 
-if exist %PASDK_ROOT_DIR%docs\PASDK_release_notes_dolby_ip.pdf (
-    @copy /Y %PASDK_ROOT_DIR%docs\PASDK_release_notes_dolby_ip.pdf %DHIP_PKGS_DEST_DIR%\PASDK_release_notes_dolby_ip.pdf
+if exist %PASDK_ROOT_DIR%\docs\PASDK_release_notes_dolby_ip.pdf (
+    @copy /Y %PASDK_ROOT_DIR%\docs\PASDK_release_notes_dolby_ip.pdf %DHIP_PKGS_DEST_DIR%\PASDK_release_notes_dolby_ip.pdf
 )
 
 
diff --git a/scripts/build_dtsx_libs.bat b/scripts/build_dtsx_libs.bat
index d66ee128..e9c6e5b1 100644
--- a/scripts/build_dtsx_libs.bat
+++ b/scripts/build_dtsx_libs.bat
@@ -10,7 +10,7 @@
 
 @echo Executing:  %~fn0
 
-if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..\
+if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..
 set PASDK_ROOT_DIR_FS=%PASDK_ROOT_DIR:\=/%
 
 :: Save path
@@ -19,6 +19,7 @@ set path=%CYGWIN_INSTALL_DIR%;%PATH%
 
 set DTSX_SOURCE_PATH=..\3p-ip-dts\Source_Code\sdk-dts-uhd-no-guidedparma-src
 
+
 pushd %DTSX_SOURCE_PATH%\parma-dec\misc\build\a15\Release
 echo.
 echo %cd%
diff --git a/scripts/build_dtsxip_pkg.bat b/scripts/build_dtsxip_pkg.bat
index aded3ccb..f55cd613 100644
--- a/scripts/build_dtsxip_pkg.bat
+++ b/scripts/build_dtsxip_pkg.bat
@@ -12,10 +12,10 @@
 :: %2: package destination directory
 @echo Executing:  %~fn0 %1 %2
 
-if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..\
+if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..
 
 :: Set DTSX IP local root directory
-set DTSX_IP_LROOT=%PASDK_ROOT_DIR%3p-ip-dts
+set DTSX_IP_LROOT=%PASDK_ROOT_DIR%\3p-ip-dts
 
 :: Set package directory
 if "%2"=="" goto def_prm_pkg_dest_dir
diff --git a/scripts/build_dtsxip_pkgs.bat b/scripts/build_dtsxip_pkgs.bat
index e1de1dab..899cc96b 100644
--- a/scripts/build_dtsxip_pkgs.bat
+++ b/scripts/build_dtsxip_pkgs.bat
@@ -11,7 +11,7 @@
 :: %1: packages destination directory
 @echo Executing:  %~fn0 %1
 
-if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..\
+if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..
 
 if "%1"=="" goto def_prm_dtsxip_pkgs_dest_dir
 
@@ -34,8 +34,8 @@ if NOT exist %DTSXIP_PKGS_DEST_DIR%\nul ( mkdir %DTSXIP_PKGS_DEST_DIR% )
 @call build_dtsxip_pkg dtsxdec %DTSXIP_PKGS_DEST_DIR%
 @call build_dtsxip_pkg parma %DTSXIP_PKGS_DEST_DIR%
 
-if exist %PASDK_ROOT_DIR%docs\PASDK_release_notes_dts_ip.pdf (
-    @copy /Y %PASDK_ROOT_DIR%docs\PASDK_release_notes_dts_ip.pdf %DTSXIP_PKGS_DEST_DIR%\PASDK_release_notes_dts_ip.pdf
+if exist %PASDK_ROOT_DIR%\docs\PASDK_release_notes_dts_ip.pdf (
+    @copy /Y %PASDK_ROOT_DIR%\docs\PASDK_release_notes_dts_ip.pdf %DTSXIP_PKGS_DEST_DIR%\PASDK_release_notes_dts_ip.pdf
 )
 
 
diff --git a/scripts/build_fd_pkg.bat b/scripts/build_fd_pkg.bat
index 0627d92d..2fc7b9b0 100644
--- a/scripts/build_fd_pkg.bat
+++ b/scripts/build_fd_pkg.bat
@@ -11,10 +11,10 @@
 :: %1: package destination directory
 @echo Executing:  %~fn0 %1
 
-if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..\
+if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..
 
 :: Set PASDK local root directory
-set PASDK_LROOT_DIR=%PASDK_ROOT_DIR%pasdk
+set PASDK_LROOT_DIR=%PASDK_ROOT_DIR%\pasdk
 :: Set PAF root directory
 set PAF_ROOT_DIR=%PASDK_LROOT_DIR%\paf
 
diff --git a/scripts/build_os_pkg.bat b/scripts/build_os_pkg.bat
index 56338cf8..ff847ba1 100644
--- a/scripts/build_os_pkg.bat
+++ b/scripts/build_os_pkg.bat
@@ -11,7 +11,7 @@
 :: %1: package destination directory
 @echo Executing:  %~fn0 %1
 
-if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..\
+if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..
 
 :: Set package destination directory
 if "%1"=="" goto def_prm_pkg_dest_dir
@@ -55,53 +55,53 @@ if exist Temp\nul ( rmdir /S /Q Temp )
 if NOT exist %OS_PKG_DEST_DIR%\nul ( mkdir %OS_PKG_DEST_DIR% )
 @mkdir Temp
 
-@xcopy /E /H /I /Q %PASDK_ROOT_DIR%.git Temp\.git
+@xcopy /E /H /I /Q %PASDK_ROOT_DIR%\.git Temp\.git
 
 :: pasdk
-@xcopy /E /H /I /Q %PASDK_ROOT_DIR%pasdk Temp\pasdk
+@xcopy /E /H /I /Q %PASDK_ROOT_DIR%\pasdk Temp\pasdk
 
 :: psdk_cust
-@xcopy /E /H /I /Q %PASDK_ROOT_DIR%psdk_cust\ipc_3_43_00_00_eng Temp\psdk_cust\ipc_3_43_00_00_eng
-@xcopy /E /H /I /Q %PASDK_ROOT_DIR%psdk_cust\libarch_k2g_1_0_1_0 Temp\psdk_cust\libarch_k2g_1_0_1_0
+@xcopy /E /H /I /Q %PASDK_ROOT_DIR%\psdk_cust\ipc_3_43_00_00_eng Temp\psdk_cust\ipc_3_43_00_00_eng
+@xcopy /E /H /I /Q %PASDK_ROOT_DIR%\psdk_cust\libarch_k2g_1_0_1_0 Temp\psdk_cust\libarch_k2g_1_0_1_0
 :: PDK 1.0.1.2_eng removed from BR1, replaced w/ PrSDK 4.0, PDK 1.0.6
-::@xcopy /E /H /I /Q %PASDK_ROOT_DIR%psdk_cust\pdk_k2g_1_0_1_2_eng Temp\psdk_cust\pdk_k2g_1_0_1_2_eng
+::@xcopy /E /H /I /Q %PASDK_ROOT_DIR%\psdk_cust\pdk_k2g_1_0_1_2_eng Temp\psdk_cust\pdk_k2g_1_0_1_2_eng
 
 :: tools
 @mkdir Temp\tools
 :: tools/alpha
-@xcopy /E /H /I /Q %PASDK_ROOT_DIR%tools\alpha Temp\tools\alpha
+@xcopy /E /H /I /Q %PASDK_ROOT_DIR%\tools\alpha Temp\tools\alpha
 :: tools/pyalpha
-@xcopy /E /H /I /Q %PASDK_ROOT_DIR%tools\pyalpha\pyalpha Temp\tools\pyalpha\pyalpha
-@copy /Y %PASDK_ROOT_DIR%tools\pyalpha\__main__.py Temp\tools\pyalpha\__main__.py
-@copy /Y %PASDK_ROOT_DIR%tools\pyalpha\README.md Temp\tools\pyalpha\README.md
-@copy /Y %PASDK_ROOT_DIR%tools\pyalpha\setup.py Temp\tools\pyalpha\setup.py
+@xcopy /E /H /I /Q %PASDK_ROOT_DIR%\tools\pyalpha\pyalpha Temp\tools\pyalpha\pyalpha
+@copy /Y %PASDK_ROOT_DIR%\tools\pyalpha\__main__.py Temp\tools\pyalpha\__main__.py
+@copy /Y %PASDK_ROOT_DIR%\tools\pyalpha\README.md Temp\tools\pyalpha\README.md
+@copy /Y %PASDK_ROOT_DIR%\tools\pyalpha\setup.py Temp\tools\pyalpha\setup.py
 :: tools/bin
 @mkdir Temp\tools\bin
-@copy /Y %PASDK_ROOT_DIR%tools\bin\acp6x.exe Temp\tools\bin\acp6x.exe
-@copy /Y %PASDK_ROOT_DIR%tools\bin\itox.exe Temp\tools\bin\itox.exe
-@copy /Y %PASDK_ROOT_DIR%tools\bin\libcint.dll Temp\tools\bin\libcint.dll
-@copy /Y %PASDK_ROOT_DIR%tools\bin\LICENSE Temp\tools\bin\LICENSE
-@copy /Y %PASDK_ROOT_DIR%tools\bin\xtoi.exe Temp\tools\bin\xtoi.exe
+@copy /Y %PASDK_ROOT_DIR%\tools\bin\acp6x.exe Temp\tools\bin\acp6x.exe
+@copy /Y %PASDK_ROOT_DIR%\tools\bin\itox.exe Temp\tools\bin\itox.exe
+@copy /Y %PASDK_ROOT_DIR%\tools\bin\libcint.dll Temp\tools\bin\libcint.dll
+@copy /Y %PASDK_ROOT_DIR%\tools\bin\LICENSE Temp\tools\bin\LICENSE
+@copy /Y %PASDK_ROOT_DIR%\tools\bin\xtoi.exe Temp\tools\bin\xtoi.exe
 :: tools/
-@copy /Y %PASDK_ROOT_DIR%tools\config_cust.ini Temp\tools\config_cust.ini
-@copy /Y %PASDK_ROOT_DIR%tools\setup.bat Temp\tools\setup.bat
+@copy /Y %PASDK_ROOT_DIR%\tools\config_cust.ini Temp\tools\config_cust.ini
+@copy /Y %PASDK_ROOT_DIR%\tools\setup.bat Temp\tools\setup.bat
 
 :: docs
 @mkdir Temp\docs
-@copy /Y %PASDK_ROOT_DIR%docs\PASDK_release_notes.pdf Temp\PASDK_release_notes.pdf
-@copy /Y %PASDK_ROOT_DIR%docs\DA10x_UG_AspExample.pdf Temp\docs\DA10x_UG_AspExample.pdf
-@copy /Y %PASDK_ROOT_DIR%docs\pa-asp-fil.pdf Temp\docs\pa-asp-fil.pdf
-@copy /Y %PASDK_ROOT_DIR%docs\pa-fil-fe.pdf Temp\docs\pa-fil-fe.pdf
-@copy /Y %PASDK_ROOT_DIR%docs\PASDK_getting_started_guide.pdf Temp\docs\PASDK_getting_started_guide.pdf
-@copy /Y %PASDK_ROOT_DIR%docs\PASDK_setup_guide.pdf Temp\docs\PASDK_setup_guide.pdf
-@copy /Y %PASDK_ROOT_DIR%docs\pfpdesign.pdf Temp\docs\pfpdesign.pdf
+@copy /Y %PASDK_ROOT_DIR%\docs\PASDK_release_notes.pdf Temp\PASDK_release_notes.pdf
+@copy /Y %PASDK_ROOT_DIR%\docs\DA10x_UG_AspExample.pdf Temp\docs\DA10x_UG_AspExample.pdf
+@copy /Y %PASDK_ROOT_DIR%\docs\pa-asp-fil.pdf Temp\docs\pa-asp-fil.pdf
+@copy /Y %PASDK_ROOT_DIR%\docs\pa-fil-fe.pdf Temp\docs\pa-fil-fe.pdf
+@copy /Y %PASDK_ROOT_DIR%\docs\PASDK_getting_started_guide.pdf Temp\docs\PASDK_getting_started_guide.pdf
+@copy /Y %PASDK_ROOT_DIR%\docs\PASDK_setup_guide.pdf Temp\docs\PASDK_setup_guide.pdf
+@copy /Y %PASDK_ROOT_DIR%\docs\pfpdesign.pdf Temp\docs\pfpdesign.pdf
 
 :: scripts
 @mkdir Temp\scripts
-@copy /Y %PASDK_ROOT_DIR%scripts\build_paf_libs.bat Temp\scripts
+@copy /Y %PASDK_ROOT_DIR%\scripts\build_paf_libs.bat Temp\scripts
 :: PDK 1.0.1.2_eng removed from BR1, replaced w/ PrSDK 4.0, PDK 1.0.6
-::@copy /Y %PASDK_ROOT_DIR%scripts\build_pdk_libs.bat Temp\scripts
-@copy /Y %PASDK_ROOT_DIR%scripts\setup_env.bat Temp\scripts
+::@copy /Y %PASDK_ROOT_DIR%\scripts\build_pdk_libs.bat Temp\scripts
+@copy /Y %PASDK_ROOT_DIR%\scripts\setup_env.bat Temp\scripts
 
 @pushd Temp
 
diff --git a/scripts/build_paf_libs.bat b/scripts/build_paf_libs.bat
index 7e0cde12..e515ab87 100644
--- a/scripts/build_paf_libs.bat
+++ b/scripts/build_paf_libs.bat
@@ -14,10 +14,10 @@
 ::    ARM : Build PAF libraries for ARM
 @echo Executing:  %~fn0 %1
 
-if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..\
+if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..
 
 :: Set PASDK local root directory
-set PASDK_LROOT_DIR=%PASDK_ROOT_DIR%pasdk
+set PASDK_LROOT_DIR=%PASDK_ROOT_DIR%\pasdk
 :: Set PAF root directory
 set PAF_ROOT_DIR=%PASDK_LROOT_DIR%\paf
 
diff --git a/scripts/build_parma_libs.bat b/scripts/build_parma_libs.bat
index 54d27d35..f8219cf9 100644
--- a/scripts/build_parma_libs.bat
+++ b/scripts/build_parma_libs.bat
@@ -10,7 +10,7 @@
 
 @echo Executing:  %~fn0
 
-if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..\
+if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..
 set PASDK_ROOT_DIR_FS=%PASDK_ROOT_DIR:\=/%
 
 SET DTSX_SOURCE_PATH=..\3p-ip-dts\Source_Code\PARMA
diff --git a/scripts/build_pdk_libs.bat b/scripts/build_pdk_libs.bat
index 6f63fd60..6c56915d 100644
--- a/scripts/build_pdk_libs.bat
+++ b/scripts/build_pdk_libs.bat
@@ -9,13 +9,13 @@
 
 @echo Executing:  %~fn0
 
-if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..\
+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
+set PSDK_CUST_LROOT_DIR=%PASDK_ROOT_DIR%\psdk_cust
 
 :: Set custom PDK install directory
 set PDK_VERSION=1_0_1_2_eng
diff --git a/scripts/install_code.bat b/scripts/install_code.bat
index da9018d3..d0953f99 100644
--- a/scripts/install_code.bat
+++ b/scripts/install_code.bat
@@ -20,15 +20,21 @@ set PATH=C:\Tools;%PATH%
 set HOME=%USERPROFILE%
 
 :: Atmos component repositories
-set BMDA_GIT_REPO=git@gitorious.design.ti.com:dolby-harmonious/bmda.git
-set CAR_GIT_REPO=git@gitorious.design.ti.com:dolby-harmony-da10x/car.git
-set DDP_GIT_REPO=git@gitorious.design.ti.com:dolby-harmonious/ddp.git
-set INTR_GIT_REPO=git@gitorious.design.ti.com:dolby-harmonious/intrinsics.git
-set MATTHD_GIT_REPO=git@gitorious.design.ti.com:dolby-harmonious/mat-thd.git
-set OAR_GIT_REPO=git@gitorious.design.ti.com:dolby-harmonious/oar.git
+set BMDA_GIT_REPO=ssh://git@bitbucket.itg.ti.com/pasdk-dolbyip/bmda.git
+set CAR_GIT_REPO=ssh://git@bitbucket.itg.ti.com/pasdk-dolbyip/car.git
+set DDP_GIT_REPO=ssh://git@bitbucket.itg.ti.com/pasdk-dolbyip/ddp.git
+set INTR_GIT_REPO=ssh://git@bitbucket.itg.ti.com/pasdk-dolbyip/intrinsics.git
+set MATTHD_GIT_REPO=ssh://git@bitbucket.itg.ti.com/pasdk-dolbyip/mat-thd.git
+set OAR_GIT_REPO=ssh://git@bitbucket.itg.ti.com/pasdk-dolbyip/oar.git
+
+:: DTS component repository
+set DTS_GIT_REPO=ssh://git@bitbucket.itg.ti.com/pasdk/3p-ip-dts.git
 
 :: PAF repository
-set PAF_GIT_REPO=git@gitorious.design.ti.com:dolby-harmonious/os_paf_dev.git
+set PAF_GIT_REPO=ssh://git@bitbucket.itg.ti.com/pasdk/os_paf_dev.git
+
+:: Tools repository
+set TOOLS_GIT_REPO=ssh://git@bitbucket.itg.ti.com/pasdk/tools.git
 
 :: Web proxy
 set http_proxy=http://webproxy.ext.ti.com:80
@@ -170,6 +176,25 @@ pushd dolby_ip\oar
 call git checkout %1
 popd
 
+:: *************************************************************************
+:: ** Install DTS
+:: *************************************************************************
+if exist 3p-ip-dts\nul goto dts_update
+@echo Clone:  DTS
+call git clone %DTS_GIT_REPO% 3p-ip-dts
+if not exist 3p-ip-dts goto dts_error
+goto dts_checkout
+:dts_update
+@echo Fetch:  DTS
+pushd 3p-ip-dts
+call git fetch --tags origin
+popd
+
+:dts_checkout
+pushd 3p-ip-dts
+call git checkout %1
+popd
+
 :: *************************************************************************
 :: ** Install PAF
 :: *************************************************************************
@@ -189,6 +214,25 @@ pushd pasdk\paf
 call git checkout %1
 popd
 
+:: *************************************************************************
+:: ** Install Tools
+:: *************************************************************************
+if exist tools\nul goto tools_update
+@echo Clone:  Tools
+call git clone %TOOLS_GIT_REPO% tools
+if not exist tools goto tools_error
+goto tools_checkout
+:tools_update
+@echo Fetch:  Tools
+pushd tools
+call git fetch --tags origin
+popd
+
+:tools_checkout
+pushd tools
+call git checkout %1
+popd
+
 :: *************************************************************************
 :: ** Report errors
 :: *************************************************************************
@@ -218,6 +262,14 @@ goto install_end
 @echo Unable to clone OAR GIT repository:  %OAR_GIT_REPO%  exiting...
 goto install_end
 
+:dts_error
+@echo Unable to clone DTS GIT repository:  %DTS_GIT_REPO%  exiting...
+goto install_end
+
+:tools_error
+@echo Unable to clone Tools GIT repository:  %TOOLS_GIT_REPO%  exiting...
+goto install_end
+
 :paf_error
 @echo Unable to clone PAF GIT repository:  %PAF_GIT_REPO%  exiting...
 goto install_end
@@ -236,7 +288,9 @@ set DDP_GIT_REPO=
 set INTR_GIT_REPO=
 set MATTHD_GIT_REPO=
 set OAR_GIT_REPO=
+set DTS_GIT_REPO=
 set PAF_GIT_REPO=
+set TOOLS_GIT_REPO=
 set http_proxy=
 
 :end
diff --git a/scripts/install_dhip_pkgs.bat b/scripts/install_dhip_pkgs.bat
index 1ed3b398..d308e8d0 100644
--- a/scripts/install_dhip_pkgs.bat
+++ b/scripts/install_dhip_pkgs.bat
@@ -10,15 +10,15 @@
 :: %1: DH-IP package source directory
 @echo Executing:  %~fn0 %1
 
-if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..\
+if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..
 
 :: Set unzip path
-for %%i in (git.exe) do set GIT_PATH=%DRIVE%%%~sp$PATH:i
+for %%i in (git.exe) do set GIT_PATH=%TOOLS_DRIVE%%%~sp$PATH:i
 set UNZIP_PATH=%GIT_PATH%..\usr\bin
 set GIT_PATH=
 
 :: Set Dolby IP local root directory
-set DOLBY_IP_LROOT=%PASDK_ROOT_DIR%dolby_ip
+set DOLBY_IP_LROOT=%PASDK_ROOT_DIR%\dolby_ip
 :: Set package install directories (location generated packages unziped for ARM/DSP application build)
 set BMDA_PKG_INSTALL_DIR=%DOLBY_IP_LROOT%\dh-ip
 set CAR_PKG_INSTALL_DIR=%DOLBY_IP_LROOT%\dh-ip
diff --git a/scripts/install_dtsxip_pkgs.bat b/scripts/install_dtsxip_pkgs.bat
index 0e4c83fd..4f38edb5 100644
--- a/scripts/install_dtsxip_pkgs.bat
+++ b/scripts/install_dtsxip_pkgs.bat
@@ -10,15 +10,15 @@
 :: %1: DTSX-IP package source directory
 @echo Executing:  %~fn0 %1
 
-if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..\
+if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..
 
 :: Set unzip path
-for %%i in (git.exe) do set GIT_PATH=%DRIVE%%%~sp$PATH:i
+for %%i in (git.exe) do set GIT_PATH=%TOOLS_DRIVE%%%~sp$PATH:i
 set UNZIP_PATH=%GIT_PATH%..\usr\bin
 set GIT_PATH=
 
 :: Set DTS IP local root directory
-set DTS_IP_LROOT=%PASDK_ROOT_DIR%3p-ip-dts
+set DTS_IP_LROOT=%PASDK_ROOT_DIR%\3p-ip-dts
 :: Set package install directories (location generated packages unziped for ARM/DSP application build)
 set DTSXDEC_PKG_INSTALL_DIR=%DTS_IP_LROOT%\dtsx-ip
 set PARMA_PKG_INSTALL_DIR=%DTS_IP_LROOT%\dtsx-ip
diff --git a/scripts/setup_env.bat b/scripts/setup_env.bat
index b2afde70..d9a773ee 100644
--- a/scripts/setup_env.bat
+++ b/scripts/setup_env.bat
@@ -17,12 +17,12 @@
 set TOOLS_DRIVE=C:
 set TI_TOOLS_DIR=%TOOLS_DRIVE%\ti
 set PA_TOOLS_DIR=%TOOLS_DRIVE%\PA_Tools
-:: PASDK location
-set PASDK_DRIVE=T:
-set PASDK_INSTALL_DIR=%~dp0..
-subst %PASDK_DRIVE% /d
-subst %PASDK_DRIVE% %PASDK_INSTALL_DIR%
-%PASDK_DRIVE%
+rem :: PASDK location
+rem set PASDK_DRIVE=T:
+rem set PASDK_INSTALL_DIR=%~dp0..
+rem subst %PASDK_DRIVE% /d
+rem subst %PASDK_DRIVE% %PASDK_INSTALL_DIR%
+rem %PASDK_DRIVE%
 
 :: *************************************************************************
 :: *** Specify tool versions
@@ -83,7 +83,7 @@ rem @echo.
 :: *************************************************************************
 :: ** Set the PATH
 :: *************************************************************************
-for %%i in (git.exe) do set GIT_PATH=%DRIVE%%%~sp$PATH:i
+for %%i in (git.exe) do set GIT_PATH=%TOOLS_DRIVE%%%~sp$PATH:i
 set PATH=%SystemRoot%;%SystemRoot%\system32;%SystemRoot%\system32\Wbem
 set PATH=%XDC_INSTALL_DIR%;%PATH%
 set PATH=%XDC_INSTALL_DIR%\jre\bin;%PATH%