Add DTSX to auto build scripts

(cherry picked from commit 8b02cdc62ef37d58da2ffcf5c1391b417bb5f668)

diff --git a/build_all.bat b/build_all.bat
index 71b5bf59ee8bbfccb2587dea13d67659b7ebb462..a0f7684dfc1a28b62eec0774736a9401edce26c2 100644 (file)
--- a/build_all.bat
+++ b/build_all.bat
@@ -3,10 +3,12 @@
 ::  FILE           : build_all.bat
 ::  DESCRIPTION    :
 ::
-::      Builds all for Dolby Harmony project for DA10x. This includes:
-::          (1) ARM/DSP PAF libraries
-::          (2) ARM/DSP Atmos component libraries: BMDA, CAR, DDP, MAT-THD, OAR
-::          (3) DSP PDK LLD libraries: UART, SPI, I2C
+::      Builds all for Dolby Harmony or DTS:X project for DA10x. This includes:
+::          (1) DSP PDK LLD libraries: UART, SPI, I2C
+::          (2) ARM/DSP PAF libraries
+::          (3) ARM/DSP algorithm components libraries, either of:
+::              - Atmos component libraries: BMDA, CAR, DDP, MAT-THD, OAR
+::              - DTS:X component libraries: DTS:X Decoder, PARMA
 ::          (4) DSP PDK platform library
 ::          (5) ARM/DSP applications
 ::      Creates .zip packages for Atmos component libraries.
@@ -20,6 +22,7 @@
 :: *************************************************************************
 if "%1"=="" goto use_err1
 if "%2"=="" goto use_err1
+if "%3"=="" goto use_err1
 goto cont1
 
 
@@ -27,10 +30,11 @@ goto cont1
 :: USAGE ERROR
 echo ERROR: Supplied options are invalid.
 echo .
-echo . Usage: %0 SuperRepo ^<buildProfile^>
+echo . Usage: %0 ^<buildType^> SuperRepo ^<buildProfile^>
 echo . -OR-
-echo . Usage: %0 ^<buildTag^> ^<buildProfile^>
+echo . Usage: %0 ^<buildType^> ^<buildTag^> ^<buildProfile^>
 echo .
+echo .     buildType        : DH or DTSX
 echo .     SuperRepo        : Use Git super-repository to track submodules for build targets
 echo .     buildTag         : Use Git tag to track submodules for build targets 
 echo .     buildProfile     : Debug, Release, or SDF
@@ -42,22 +46,26 @@ goto end
 set PASDK_ROOT_DIR=%~dp0
 
 
-if "%2" NEQ "SDF" goto install_tools
+if "%3" NEQ "SDF" goto install_tools
 :: Set PASDK target and version
-set PASDK_TARGET_PLATFORM=da10x
-set PASDK_VERSION=01_00_00_03
+set PASDK_TARGET_PLATFORM=k2g
+set PASDK_VERSION=01_00_00_04
 :: Set FD package version
-set FD_PKG_VERSION=01_00_00_03
+set FD_PKG_VERSION=01_00_00_04
 
 :: Set release directory
 set RELEASE_DIR=%PASDK_ROOT_DIR%release
-:: Set DH-IP package directory
-set DHIP_PKG_DIR=%RELEASE_DIR%\dhip_package
 :: Set FD package directory
 set FD_PKG_DIR=%RELEASE_DIR%\fd_package
 :: Set OS package directory
 set OS_PKG_DIR=%RELEASE_DIR%\os_package
 
+:: Set DH-IP package directory
+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% )
 
 
@@ -87,24 +95,41 @@ if exist %RELEASE_DIR%\nul ( rmdir /S / Q %RELEASE_DIR% )
 @call build_paf_libs.bat
 @popd
 
-:: Build ARM/DSP Atmos component libraries
+:: Build ARM/DSP component libraries
+if "%2" NEQ "DH" goto build_dtsx_libs
+:: Build Atmos component libraries
 @pushd scripts
-@call build_alg_libs.bat
+@call build_dh_libs.bat
 @popd
 
-if "%2" NEQ "SDF" goto build_ccs_projects
+if "%3" NEQ "SDF" goto build_ccs_projects
 :: Build DH-IP packages
 @pushd scripts
 @call build_dhip_pkgs %DHIP_PKG_DIR%
 @popd
 
+goto build_ccs_projects
+
+:build_dtsx_libs
+:: Build DTS:X component libraries
+@pushd scripts
+@call build_dtsx_libs.bat
+@call build_parma_libs.bat
+@popd
+
+if "%3" NEQ "SDF" goto build_ccs_projects
+:: Build DTSX-IP packages
+@pushd scripts
+@call build_dtsxip_pkgs %DTSXIP_PKG_DIR%
+@popd
+
 :build_ccs_projects
 :: Build DSP PDK platform library, ARM/DSP applications
 @pushd scripts
-@call build_ccs_projects.bat %2 %DHIP_PKG_DIR%
+@call build_ccs_projects.bat %3 %DHIP_PKG_DIR%
 @popd
 
-if "%2" NEQ "SDF" goto cleanupenv
+if "%3" NEQ "SDF" goto cleanupenv
 :: Build FD package
 @pushd scripts
 @call build_fd_pkg.bat %FD_PKG_DIR%
@@ -122,9 +147,9 @@ set PASDK_TARGET_PLATFORM=
 set PASDK_VERSION=
 set FD_PKG_VERSION=
 set RELEASE_DIR=
-set DHIP_PKG_DIR=
 set FD_PKG_DIR=
 set OS_PKG_DIR=
-
+set DHIP_PKG_DIR=
+set DTSXIP_PKG_DIR=
 
 :end

diff --git a/scripts/build_alg_libs.bat b/scripts/build_dh_libs.bat
similarity index 96%
rename from scripts/build_alg_libs.bat
rename to scripts/build_dh_libs.bat
index 32043392d0bcb224ba468cfc5b62f8ddbb4250c5..07e44620b2e5660cfc10bc39c1ff230cf55b1e13 100644 (file)
--- a/scripts/build_alg_libs.bat
+++ b/scripts/build_dh_libs.bat
@@ -97,10 +97,10 @@ popd
 
 
 :cleanupenv
-set PATH_ORG
-set PASDK_LROOT_DIR
-set PAF_ROOT_DIR
-set DOLBY_IP_LROOT
+set PATH_ORG=
+set PASDK_LROOT_DIR=
+set PAF_ROOT_DIR=
+set DOLBY_IP_LROOT=
 
 
 :end

diff --git a/scripts/build_dtsx_libs.bat b/scripts/build_dtsx_libs.bat
new file mode 100644 (file)
index 0000000..062e744
--- /dev/null
+++ b/scripts/build_dtsx_libs.bat
@@ -0,0 +1,51 @@
+@echo off
+
+@echo Executing:  %~fn0
+
+:: Save path
+set PATH_ORG=%PATH%
+set path=c:\cygwin\bin;%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
+gmake clean
+gmake 
+popd
+pushd %DTSX_SOURCE_PATH%\la-strm-reconstruction\misc\build\a15\Release
+gmake clean
+gmake
+popd
+pushd %DTSX_SOURCE_PATH%\lbr\misc\build\a15\lbr\Release
+gmake clean
+gmake 
+popd
+pushd  %DTSX_SOURCE_PATH%\lbr\misc\build\a15\lbrdec\Release
+gmake clean
+gmake
+popd
+pushd %DTSX_SOURCE_PATH%\dts-3d\misc\build\a15\Release
+gmake clean
+gmake 
+popd
+pushd %DTSX_SOURCE_PATH%\dts-base\misc\build\a15\Release
+gmake clean
+gmake 
+popd
+pushd %DTSX_SOURCE_PATH%\common-flib\misc\build\a15\Release
+gmake clean
+gmake 
+popd
+pushd %DTSX_SOURCE_PATH%\dtshd-c-decoder\misc\build\a15\lib\Release
+gmake clean
+gmake 
+popd
+pushd %DTSX_SOURCE_PATH%\alg\misc\build\a15\Release
+gmake clean
+gmake
+popd
+
+set path=%PATH_ORG%
+
+set PATH_ORG=
+set DTSX_SOURCE_PATH=

diff --git a/scripts/build_parma_libs.bat b/scripts/build_parma_libs.bat
new file mode 100644 (file)
index 0000000..d70a04d
--- /dev/null
+++ b/scripts/build_parma_libs.bat
@@ -0,0 +1,44 @@
+@echo off
+
+@echo Executing:  %~fn0
+
+SET DTSX_SOURCE_PATH=..\3p-ip-dts\Source_Code\PARMA
+
+pushd %DTSX_SOURCE_PATH%\parma-dec\misc\build\c66x\Release
+gmake clean
+gmake 
+popd
+pushd %DTSX_SOURCE_PATH%\la-strm-reconstruction\misc\build\c66x\Release
+gmake clean
+gmake
+popd
+pushd %DTSX_SOURCE_PATH%\lbr\misc\build\c66x\lbr\Release
+gmake clean
+gmake 
+popd
+pushd  %DTSX_SOURCE_PATH%\lbr\misc\build\c66x\lbrdec\Release
+gmake clean
+gmake
+popd
+pushd %DTSX_SOURCE_PATH%\dts-3d\misc\build\c66x\Release
+gmake clean
+gmake 
+popd
+pushd %DTSX_SOURCE_PATH%\dts-base\misc\build\c66x\Release
+gmake clean
+gmake 
+popd
+pushd %DTSX_SOURCE_PATH%\common-flib\misc\build\c66x\Release
+gmake clean
+gmake 
+popd
+pushd %DTSX_SOURCE_PATH%\dtshd-c-decoder\misc\build\c66x\lib\Release
+gmake clean
+gmake 
+popd
+pushd %DTSX_SOURCE_PATH%\alg\misc\build\c66x\Release
+gmake clean
+gmake
+popd
+
+set DTSX_SOURCE_PATH=
\ No newline at end of file