PASDK-376:Update builds scripts to allow build of DH & DTS:X in single run

diff --git a/build_all.bat b/build_all.bat
index b444b405b7979859872b9dcebf86143a13a9ac8d..57390538a2f8558057390028a0f9cecdc7cdabda 100644 (file)
--- a/build_all.bat
+++ b/build_all.bat
@@ -1,4 +1,5 @@
 @echo off
+
 :: *************************************************************************
 ::  FILE           : build_all.bat
 ::  DESCRIPTION    :
@@ -7,11 +8,11 @@
 ::          (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
+::              - Dolby Harmony 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.
+::      Creates .zip packages for Dolby Harmony component libraries.
 ::
 :: *************************************************************************
 
@@ -34,7 +35,7 @@ echo . Usage: %0 ^<buildType^> SuperRepo ^<buildProfile^>
 echo . -OR-
 echo . Usage: %0 ^<buildType^> ^<buildTag^> ^<buildProfile^>
 echo .
-echo .     buildType        : DH or DTSX
+echo .     buildType        : ALL, 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
@@ -45,7 +46,6 @@ goto end
 :cont1
 set PASDK_ROOT_DIR=%~dp0
 
-
 if "%3" NEQ "SDF" goto install_tools
 :: Set PASDK target and version
 set PASDK_TARGET_PLATFORM=k2g
@@ -80,7 +80,7 @@ if exist %RELEASE_DIR%\nul ( rmdir /S / Q %RELEASE_DIR% )
 :: *************************************************************************
 :: *** Install code
 :: *************************************************************************
-::@call scripts\install_code.bat %1
+@call scripts\install_code.bat %2
 
 :: *************************************************************************
 :: *** Build
@@ -96,43 +96,84 @@ if exist %RELEASE_DIR%\nul ( rmdir /S / Q %RELEASE_DIR% )
 @popd
 
 :: Build ARM/DSP component libraries
-if "%1" NEQ "DH" goto build_dtsx_libs
-:: Build Atmos component libraries
-@pushd scripts
-@call build_dh_libs.bat
-@popd
-
-if "%3" NEQ "SDF" goto build_ccs_projects
-:: Build DH-IP packages
-@pushd scripts
-@call build_dhip_pkgs %DHIP_PKG_DIR%
-@popd
-:: Install DH-IP packages
-@pushd scripts
-@call install_dhip_pkgs %DHIP_PKG_DIR%
-@popd
-
-goto build_ccs_projects
+:build_dh_libs
+rem if "%1" NEQ "DH" goto build_dtsx_libs
+rem @pushd scripts
+rem @call build_dh_libs.bat
+rem @popd
+rem 
+rem if "%3" NEQ "SDF" goto build_ccs_projects
+rem :: Build DH-IP packages
+rem @pushd scripts
+rem @call build_dhip_pkgs %DHIP_PKG_DIR%
+rem @popd
+rem :: Install DH-IP packages
+rem @pushd scripts
+rem @call install_dhip_pkgs %DHIP_PKG_DIR%
+rem @popd
+rem 
+set TRUE=
+if "%1"=="ALL" set TRUE=1
+if "%1"=="DH" set TRUE=1
+if defined TRUE (
+    rem Build Dolby Harmony component libraries
+    @pushd scripts
+    @call build_dh_libs.bat
+    @popd
+
+    if "%3"=="SDF" (
+        rem Build DH-IP packages
+        @pushd scripts
+        @call build_dhip_pkgs %DHIP_PKG_DIR%
+        @popd
+        
+        rem Install DH-IP packages
+        @pushd scripts
+        @call install_dhip_pkgs %DHIP_PKG_DIR%
+        @popd
+    )
+)
 
 :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
-:: Install DTS-IP packages
-@pushd scripts
-@call install_dtsxip_pkgs %DTSXIP_PKG_DIR%
-@popd
+rem @pushd scripts
+rem @call build_dtsx_libs.bat
+rem @call build_parma_libs.bat
+rem @popd
+rem 
+rem if "%3" NEQ "SDF" goto build_ccs_projects
+rem :: Build DTSX-IP packages
+rem @pushd scripts
+rem @call build_dtsxip_pkgs %DTSXIP_PKG_DIR%
+rem @popd
+rem :: Install DTS-IP packages
+rem @pushd scripts
+rem @call install_dtsxip_pkgs %DTSXIP_PKG_DIR%
+rem @popd
+set TRUE=
+if "%1"=="ALL" set TRUE=1
+if "%1"=="DTSX" set TRUE=1
+if defined TRUE (
+    rem Build DTS:X component libraries
+    @pushd scripts
+    @call build_dtsx_libs.bat
+    @call build_parma_libs.bat
+    @popd
+
+    if "%3"=="SDF" (
+        rem Build DTSX-IP packages
+        @pushd scripts
+        @call build_dtsxip_pkgs %DTSXIP_PKG_DIR%
+        @popd
+        
+        rem Install DH-IP packages
+        @pushd scripts
+        @call install_dtsxip_pkgs %DTSXIP_PKG_DIR%
+        @popd
+    )
+)
 
 :build_ccs_projects
-:: Build DSP PDK platform library, ARM/DSP applications
+:: Build CCS projects
 @pushd scripts
 @call build_ccs_projects.bat %1 %3
 @popd
@@ -159,5 +200,6 @@ set FD_PKG_DIR=
 set OS_PKG_DIR=
 set DHIP_PKG_DIR=
 set DTSXIP_PKG_DIR=
+set TRUE=
 
 :end

diff --git a/scripts/build_ccs_projects.bat b/scripts/build_ccs_projects.bat
index aa32cf7fc4c74fcfa3b190924dad22f9c3068221..415c23fec0141646ffee57a48d140d1a40e4a27b 100644 (file)
--- a/scripts/build_ccs_projects.bat
+++ b/scripts/build_ccs_projects.bat
@@ -1,4 +1,6 @@
 @echo off
+@setlocal EnableDelayedExpansion
+
 :: *************************************************************************
 ::  FILE           : build_ccs_projects.bat
 ::  DESCRIPTION    :
@@ -9,7 +11,8 @@
 ::
 :: *************************************************************************
 
-:: %1: Build profile: Debug, Release, SDF
+:: %1: Build type: ALL, DH, or DTSX
+:: %2: Build profile: Debug, Release, or SDF
 @echo Executing:  %~fn0 %1 %2
 
 if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..\
@@ -30,11 +33,44 @@ set CCS_WRKSP_DIR=workspace_v6_1
 set SAVE_CYGWIN=%CYGWIN%
 set CYGWIN=nontsec
 
-:: Default is DH Debug build configuration
-set ARM_APP_BUILD_PROFILE=Debug_DH
-set DSP_APP_BUILD_PROFILE=Debug_DH
 
-if "%1"=="DH" (
+:build_ccs_projects
+
+::
+:: 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%
+
+::
+:: Import projects into workspace
+::
+
+:: Import PDK platform library project into workspace
+::eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.ccstudio.apps.projectImport -ccs.location "%PDK_INSTALL_DIR%\packages\ti\platform\evmk2g\platform_lib"
+
+:: Import ARM and DSP application projects to workspace
+eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.ccstudio.apps.projectImport -ccs.location "%PASDK_LROOT_DIR%\test_arm"
+eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.ccstudio.apps.projectImport -ccs.location "%PASDK_LROOT_DIR%\test_dsp"
+
+::
+:: Build projects
+::
+
+:: Build PDK platform library project
+::set PDK_PLATFORM_LIB_BUILD_PROFILE=Debug
+::eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.ccstudio.apps.projectBuild -ccs.projects platform_lib_evmk2g -ccs.configuration %PDK_PLATFORM_LIB_BUILD_PROFILE%
+
+:: Build Dolby Harmony projects
+set TRUE=
+if "%1"=="ALL" set TRUE=1
+if "%1"=="DH" set TRUE=1
+if defined TRUE (
+    rem Default is Debug build configuration
+    set ARM_APP_BUILD_PROFILE=Debug_DH
+    set DSP_APP_BUILD_PROFILE=Debug_DH
+
     if "%2"=="Debug" (
         set ARM_APP_BUILD_PROFILE=Debug_DH
         set DSP_APP_BUILD_PROFILE=Debug_DH
@@ -48,13 +84,27 @@ if "%1"=="DH" (
     
     if "%2"=="SDF" (
         set ARM_APP_BUILD_PROFILE=Debug_DH_IPPkgs
-        set DSP_APP_BUILD_PROFILE=Debug_DH_IPPkgs        
+        set DSP_APP_BUILD_PROFILE=Debug_DH_IPPkgs
     )
     
-    goto build_ccs_projects
+    rem Build ARM application project
+    echo eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.ccstudio.apps.projectBuild -ccs.projects test_arm -ccs.configuration !ARM_APP_BUILD_PROFILE!
+    eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.ccstudio.apps.projectBuild -ccs.projects test_arm -ccs.configuration !ARM_APP_BUILD_PROFILE!
+
+    rem Build DSP application project
+    echo eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.ccstudio.apps.projectBuild -ccs.projects test_dsp -ccs.configuration !DSP_APP_BUILD_PROFILE!
+    eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.ccstudio.apps.projectBuild -ccs.projects test_dsp -ccs.configuration !DSP_APP_BUILD_PROFILE!
 )
 
-if "%1"=="DTSX" (
+:: Build DTS:X projects
+set TRUE=
+if "%1"=="ALL" set TRUE=1
+if "%1"=="DTSX" set TRUE=1
+if defined TRUE (
+    rem Default is Debug build configuration
+    set ARM_APP_BUILD_PROFILE=Debug_DTSX
+    set DSP_APP_BUILD_PROFILE=Debug_DTSX
+    
     if "%2"=="Debug" (
         set ARM_APP_BUILD_PROFILE=Debug_DTSX
         set DSP_APP_BUILD_PROFILE=Debug_DTSX
@@ -70,81 +120,15 @@ if "%1"=="DTSX" (
         set ARM_APP_BUILD_PROFILE=Debug_DTSX_IPPkgs
         set DSP_APP_BUILD_PROFILE=Debug_DTSX_IPPkgs        
     )
-    
-    goto build_ccs_projects
-)
-
-rem if "%2"=="Debug" goto SetBuildProfilesDebug
-rem if "%2"=="Release" goto SetBuildProfilesRelease
-rem 
-rem :: Set build profiles for SDF
-rem ::set PDK_PLATFORM_LIB_BUILD_PROFILE=Debug
-rem rem <<<<<<< HEAD
-rem rem set ARM_APP_BUILD_PROFILE=Debug_DH_IPPkgs
-rem rem set DSP_APP_BUILD_PROFILE=Debug_DH_IPPkgs
-rem rem =======
-rem set ARM_APP_BUILD_PROFILE=Debug_DTSX_IPPkgs
-rem set DSP_APP_BUILD_PROFILE=Debug_DTSX_IPPkgs
-rem rem >>>>>>> origin/dev_pasdk_frank_pasdk379Beta3Release
-rem goto build_ccs_projects
-rem 
-rem :SetBuildProfilesDebug
-rem :: Set build profiles for debug
-rem ::set PDK_PLATFORM_LIB_BUILD_PROFILE=Debug
-rem rem <<<<<<< HEAD
-rem rem set ARM_APP_BUILD_PROFILE=Debug_DH
-rem rem set DSP_APP_BUILD_PROFILE=Debug_DH
-rem rem =======
-rem set ARM_APP_BUILD_PROFILE=Debug_DTSX
-rem set DSP_APP_BUILD_PROFILE=Debug_DTSX
-rem rem >>>>>>> origin/dev_pasdk_frank_pasdk379Beta3Release
-rem goto build_ccs_projects
-rem 
-rem :SetBuildProfilesRelease
-rem :: Set build profiles for release
-rem :: FL: currently we only have a "Release" profile for the DSP
-rem ::set PDK_PLATFORM_LIB_BUILD_PROFILE=Debug
-rem rem <<<<<<< HEAD
-rem rem set ARM_APP_BUILD_PROFILE=Debug_DH
-rem rem set DSP_APP_BUILD_PROFILE=Release_DH
-rem rem =======
-rem set ARM_APP_BUILD_PROFILE=Debug_DTSX
-rem set DSP_APP_BUILD_PROFILE=Release_DTSX
-rem rem >>>>>>> origin/dev_pasdk_frank_pasdk379Beta3Release
-
-:build_ccs_projects
-
-::
-:: 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%
 
-::
-:: Import projects into workspace
-::
-
-:: Import PDK platform library project into workspace
-::eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.ccstudio.apps.projectImport -ccs.location "%PDK_INSTALL_DIR%\packages\ti\platform\evmk2g\platform_lib"
-
-:: Import ARM and DSP application projects to workspace
-eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.ccstudio.apps.projectImport -ccs.location "%PASDK_LROOT_DIR%\test_arm"
-eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.ccstudio.apps.projectImport -ccs.location "%PASDK_LROOT_DIR%\test_dsp"
-
-::
-:: Build projects
-::
-
-:: Build PDK platform library project
-::eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.ccstudio.apps.projectBuild -ccs.projects platform_lib_evmk2g -ccs.configuration %PDK_PLATFORM_LIB_BUILD_PROFILE%
-
-:: Build ARM application project
-eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.ccstudio.apps.projectBuild -ccs.projects test_arm -ccs.configuration %ARM_APP_BUILD_PROFILE%
-
-:: Build DSP application project
-eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.ccstudio.apps.projectBuild -ccs.projects test_dsp -ccs.configuration %DSP_APP_BUILD_PROFILE%
+    rem Build ARM application project
+    echo eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.ccstudio.apps.projectBuild -ccs.projects test_arm -ccs.configuration !ARM_APP_BUILD_PROFILE!
+    eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.ccstudio.apps.projectBuild -ccs.projects test_arm -ccs.configuration !ARM_APP_BUILD_PROFILE!
 
+    rem Build DSP application project
+    echo eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.ccstudio.apps.projectBuild -ccs.projects test_dsp -ccs.configuration !DSP_APP_BUILD_PROFILE!
+    eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.ccstudio.apps.projectBuild -ccs.projects test_dsp -ccs.configuration !DSP_APP_BUILD_PROFILE!
+)
 
 set CYGWIN=%SAVE_CYGWIN%
 
@@ -158,6 +142,7 @@ set SAVE_CYGWIN=
 ::set PDK_PLATFORM_LIB_BUILD_PROFILE=
 set ARM_APP_BUILD_PROFILE=
 set DSP_APP_BUILD_PROFILE=
+set TRUE=
 
 
 :end

diff --git a/scripts/build_dhip_pkgs.bat b/scripts/build_dhip_pkgs.bat
index 352028c3b9a2a66a660afb7ebbf7b9db6eb30abd..033d7493cb8a678b21137f3057f05097e4ade77b 100644 (file)
--- a/scripts/build_dhip_pkgs.bat
+++ b/scripts/build_dhip_pkgs.bat
@@ -39,7 +39,7 @@ if NOT exist %DHIP_PKGS_DEST_DIR%\nul ( mkdir %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 %DTSXIP_PKGS_DEST_DIR%\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
 )