diff --git a/build_all.bat b/build_all.bat
index 9124d0dec30b219fc59a0a5ef070799db867be4a..3465786190f6d69f9d2c57acaead2321e7dd4d33 100644 (file)
--- a/build_all.bat
+++ b/build_all.bat
:cont1
:: Set PASDK root directory
-set PASDK_ROOT_DIR=%~dp0
-if "%PASDK_ROOT_DIR:~-1%"=="\" set PASDK_ROOT_DIR=%PASDK_ROOT_DIR:~0,-1%
+set PAROOT_DIR=%~dp0
+if "%PAROOT_DIR:~-1%"=="\" set PAROOT_DIR=%PAROOT_DIR:~0,-1%
if "%3" NEQ "SDF" goto install_tools
:: Set PASDK target and version
set PASDK_TARGET_PLATFORM=k2g
-set PASDK_VERSION=01_01_00_01
+set PASDK_VERSION=01_03_00_00
:: Set FD package version
-set FD_PKG_VERSION=01_01_00_01
+set FD_PKG_VERSION=01_03_00_00
:: Set release directory
-set RELEASE_DIR=%PASDK_ROOT_DIR%\release
+set RELEASE_DIR=%PAROOT_DIR%\release
:: Set FD package directory
set FD_PKG_DIR=%RELEASE_DIR%\fd_package
:: Set OS package directory
set DHIP_PKG_DIR=%RELEASE_DIR%\dhip_package
:: Set DTSX-IP package directory
set DTSXIP_PKG_DIR=%RELEASE_DIR%\dtsxip_package
+:: Set AAC package directory
+set AACIP_PKG_DIR=%RELEASE_DIR%\k2gx_a15_aac
+:: Set AAC testapp package directory
+set AACIPTEST_PKG_DIR=%RELEASE_DIR%\k2gx_a15_aac_test
if exist %RELEASE_DIR%\nul ( rmdir /S / Q %RELEASE_DIR% )
if "%1"=="DH" set TRUE=1
if "%1"=="ALLIP" set TRUE=1
if "%1"=="ALL" set TRUE=1
+if "%1"=="ALLDH" set TRUE=1
if defined TRUE (
rem Build Dolby Harmony component libraries
@pushd scripts
- @call build_dh_libs.bat
+ @call build_dh_libs_prsdk.bat
@popd
if "%3"=="SDF" (
if "%1"=="DTSX" set TRUE=1
if "%1"=="ALLIP" set TRUE=1
if "%1"=="ALL" set TRUE=1
+if "%1"=="ALLDTSX" set TRUE=1
if defined TRUE (
rem Build DTS:X component libraries
@pushd scripts
- @call build_dtsx_libs.bat
- @call build_parma_libs.bat
+ @call build_dtsx_libs_prsdk.bat
+ @call build_parma_libs_prsdk.bat
@popd
if "%3"=="SDF" (
@call build_dtsxip_pkgs %DTSXIP_PKG_DIR%
@popd
- rem Install DH-IP packages
+ rem Install DTSX-IP packages
@pushd scripts
@call install_dtsxip_pkgs %DTSXIP_PKG_DIR%
@popd
@call build_os_pkg.bat %OS_PKG_DIR%
@popd
+:: Build AAC testapp and library
+@pushd scripts
+@call setup_env.bat
+@call build_aac.bat testapp
+@call build_aacip_pkg.bat aactestapp %AACIPTEST_PKG_DIR%
+@call setup_env.bat
+@call build_aac.bat lib
+@call build_aacip_pkg.bat aacdec %AACIP_PKG_DIR%
+@popd
+
+:build_installer_package
+@pushd installer_builder
+python generate_installer.py pasdk
+@popd
+set TRUE=
+if "%1"=="DTSX" set TRUE=1
+if "%1"=="ALLIP" set TRUE=1
+if "%1"=="COMBINEDIP" set TRUE=1
+if "%1"=="ALLDTSX" set TRUE=1
+if defined TRUE (
+ @pushd installer_builder
+ python generate_installer.py dts_withwrappersrc
+ @popd
+)
+
+set TRUE=
+if "%1"=="DH" set TRUE=1
+if "%1"=="ALLIP" set TRUE=1
+if "%1"=="ALL" set TRUE=1
+if "%1"=="ALLDH" set TRUE=1
+if defined TRUE (
+ @pushd installer_builder
+ python generate_installer.py dolby
+ python generate_installer.py dolby_withwrappersrc
+ @popd
+)
+
+@pushd installer_builder
+python generate_installer.py aac
+@popd
:cleanupenv
-set PASDK_ROOT_DIR=
+set PAROOT_DIR=
set PASDK_TARGET_PLATFORM=
set PASDK_VERSION=
set FD_PKG_VERSION=