Add Debug, Release, and SDF build profiles. This allows normal build all and SDF...

diff --git a/build_all.bat b/build_all.bat
index d1c5a4add2ca044f90f40ff21707ee8f2d49e896..f9f1f2ce4ef8c221ce6aeee4d8b1ce7b93c99412 100644 (file)
--- a/build_all.bat
+++ b/build_all.bat
@@ -19,24 +19,30 @@
 :: *** Check command line input
 :: *************************************************************************
 if "%1"=="" goto use_err1
-if "%2"=="" goto cont1
+if "%2"=="" goto use_err1
+goto cont1
+
 
 :use_err1
 :: USAGE ERROR
 echo ERROR: Supplied options are invalid.
 echo .
-echo . Usage: %0 SuperRepo
+echo . Usage: %0 SuperRepo ^<buildProfile^>
 echo . -OR-
-echo . Usage: %0 ^<buildTag^>
+echo . Usage: %0 ^<buildTag^> ^<buildProfile^>
 echo .
 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
 echo .
 goto end
 
 
 :cont1
 set PASDK_ROOT_DIR=%~dp0
+
+
+if "%2" NEQ "SDF" goto install_tools
 :: Set release directory
 set RELEASE_DIR=%PASDK_ROOT_DIR%release
 :: Set DH-IP package directory
@@ -46,9 +52,10 @@ set FD_PKG_DIR=%RELEASE_DIR%\fd_package
 :: Set OS package directory
 set OS_PKG_DIR=%RELEASE_DIR%\os_package
 
-
 if exist %RELEASE_DIR%\nul ( rmdir /S / Q %RELEASE_DIR% )
 
+
+:install_tools
 :: *************************************************************************
 :: *** Install tools
 :: *************************************************************************
@@ -81,16 +88,19 @@ if exist %RELEASE_DIR%\nul ( rmdir /S / Q %RELEASE_DIR% )
 :: FL: brute force reset PDK environment setup. Clean this up later.
 @call scripts\setup_env.bat
 
+if "%2" NEQ "SDF" goto build_ccs_projects
 :: Build DH-IP packages
 @pushd scripts
 @call build_dhip_pkgs %DHIP_PKG_DIR%
 @popd
 
+:build_ccs_projects
 :: Build DSP PDK platform library, ARM/DSP applications
 @pushd scripts
-@call build_ccs_projects.bat %DHIP_PKG_DIR%
+@call build_ccs_projects.bat %DHIP_PKG_DIR% %2
 @popd
 
+if "%2" NEQ "SDF" goto cleanupenv
 :: Build FD package
 @pushd scripts
 @call build_fd_pkg.bat %FD_PKG_DIR%
@@ -101,6 +111,8 @@ if exist %RELEASE_DIR%\nul ( rmdir /S / Q %RELEASE_DIR% )
 @call build_os_pkg.bat %OS_PKG_DIR%
 @popd
 
+
+:cleanupenv
 set PASDK_ROOT_DIR=
 set ARTIFACTS_DIR=
 set DHIP_PKG_DIR=
@@ -109,6 +121,3 @@ set OS_PKG_DIR=
 
 
 :end
-:: *************************************************************************
-:: *** Nothing past this point
-:: *************************************************************************

diff --git a/scripts/build_ccs_projects.bat b/scripts/build_ccs_projects.bat
index 7d04041af82e03799fcedb0f487c6d9e32d77338..abc5f8e029c4ceaff3670cdf201d7dea3c22b091 100644 (file)
--- a/scripts/build_ccs_projects.bat
+++ b/scripts/build_ccs_projects.bat
@@ -10,6 +10,7 @@
 :: *************************************************************************
 
 :: %1: DH-IP package source directory
+:: %2: Build profile: Debug, Release, SDF
 @echo Executing:  %~fn0 %1
 
 if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..\
@@ -20,17 +21,10 @@ goto end
 
 
 :cont1
-:: 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
 :: Set custom Processor SDK local root directory
 set PSDK_CUST_LROOT_DIR=%PASDK_ROOT_DIR%psdk_cust
-:: Set Dolby IP local root directory
-set DOLBY_IP_LROOT=%PASDK_ROOT_DIR%dolby_ip
 
 :: Set custom PDK install directory
 set PDK_VERSION=1_0_1_0_eng
@@ -39,9 +33,48 @@ set PDK_INSTALL_DIR=%PSDK_CUST_LROOT_DIR%\pdk_k2g_%PDK_VERSION%
 :: Set workspace directory
 set CCS_WRKSP_DIR=workspace_v6_1
 
-:: Set package directory (location of generated packages)
-::set DHIP_PKG_DIR=%DOLBY_IP_LROOT%\package
-set DHIP_PKG_DIR=%1
+:: Work-around for bug with generated linker command file being read-only
+set SAVE_CYGWIN=%CYGWIN%
+set CYGWIN=nontsec
+
+if "%2"=="Debug" goto SetBuildProfilesDebug
+if "%2"=="Release" goto SetBuildProfilesRelease
+
+:: Set build profiles for SDF
+set PDK_PLATFORM_LIB_BUILD_PROFILE=Debug
+set ARM_APP_BUILD_PROFILE=Debug_pkgs
+set DSP_APP_BUILD_PROFILE=Debug_pkgs
+goto cont2
+
+:SetBuildProfilesDebug
+:: Set build profiles for debug
+set PDK_PLATFORM_LIB_BUILD_PROFILE=Debug
+set ARM_APP_BUILD_PROFILE=Debug
+set DSP_APP_BUILD_PROFILE=Debug
+goto cont2
+
+:SetBuildProfilesRelease
+:: Set build profiles for release
+set PDK_PLATFORM_LIB_BUILD_PROFILE=Debug
+set ARM_APP_BUILD_PROFILE=Release
+set DSP_APP_BUILD_PROFILE=Release
+goto cont2
+
+
+:cont2
+if "%2" NEQ "SDF" goto init_rtsc
+:: SDF build profiles
+set PDK_PLATFORM_LIB_BUILD_PROFILE=Debug
+set ARM_APP_BUILD_PROFILE=Debug_pkgs
+set DSP_APP_BUILD_PROFILE=Debug_pkgs
+
+:: 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 Dolby IP local root directory
+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
@@ -50,11 +83,12 @@ set DDP_PKG_INSTALL_DIR=%DOLBY_IP_LROOT%\dh-ip
 set MATTHD_PKG_INSTALL_DIR=%DOLBY_IP_LROOT%\dh-ip
 set INTR_PKG_INSTALL_DIR=%DOLBY_IP_LROOT%\dh-ip
 
-:: Work-around for bug with generated linker command file being read-only
-set SAVE_CYGWIN=%CYGWIN%
-set CYGWIN=nontsec
+:: Set package directory (location of generated packages)
+::set DHIP_PKG_DIR=%DOLBY_IP_LROOT%\package
+set DHIP_PKG_DIR=%1
 
 
+:init_rtsc
 :: 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%
@@ -87,6 +121,7 @@ eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.c
 :: ::@call build_dhip_pkg intrinsics %DHIP_PKG_DIR%
 :: @call build_dhip_pkgs %DHIP_PKG_DIR%
 
+if "%2" NEQ "SDF" goto build_projects
 :extract_dhip_pkgs
 :: Install packages at application build locations
 if exist %BMDA_PKG_INSTALL_DIR%\nul     ( rmdir /S / Q %BMDA_PKG_INSTALL_DIR% )
@@ -103,39 +138,36 @@ if exist %INTR_PKG_INSTALL_DIR%\nul     ( rmdir /S / Q %INTR_PKG_INSTALL_DIR% )
 @%UNZIP_PATH%\unzip -o -d %INTR_PKG_INSTALL_DIR% %DHIP_PKG_DIR%\intrinsics.zip
 
 
+:build_projects
 ::
 :: 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 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 ARM application project
-::eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.ccstudio.apps.projectBuild -ccs.projects test_arm -ccs.configuration Debug
-:: Build ARM application project using generated packages
-eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.ccstudio.apps.projectBuild -ccs.projects test_arm -ccs.configuration Debug_pkgs
+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 Debug
-:: Build DSP application project using generated packages
-eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.ccstudio.apps.projectBuild -ccs.projects test_dsp -ccs.configuration Debug_pkgs
+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 UNZIP_PATH=
 set PASDK_LROOT_DIR=
 set PSDK_CUST_LROOT_DIR=
-set PDK_CUST_LROOT_DIR=
 set PDK_VERSION=
 set PDK_INSTALL_DIR=
-set DOLBY_IP_LROOT=
 set CCS_WRKSP_DIR=
-set DHIP_PKG_DIR=
+set SAVE_CYGWIN=
+set CYGWIN=
+set UNZIP_PATH=
+set DOLBY_IP_LROOT=
 set BMDA_PKG_INSTALL_DIR=
 set CAR_PKG_INSTALL_DIR=
 set OAR_PKG_INSTALL_DIR=
 set DDP_PKG_INSTALL_DIR=
 set MATTHD_PKG_INSTALL_DIR=
 set INTR_PKG_INSTALL_DIR=
-set SAVE_CYGWIN=
-set CYGWIN=
+set DHIP_PKG_DIR=
+
 
 :end

diff --git a/scripts/build_os_pkg.bat b/scripts/build_os_pkg.bat
index 84746f65d9b1f788e14a29d37d1348c6bc204ac0..9adaef6e8d903987cc0f27bf1847f3f6f09531e5 100644 (file)
--- a/scripts/build_os_pkg.bat
+++ b/scripts/build_os_pkg.bat
@@ -92,6 +92,5 @@ cd
 
 :end
 
-
 set OS_PKG_FNAME=
 set OS_PKG_DEST_DIR=