Add OS package creation script

diff --git a/build_all.bat b/build_all.bat
index 068a646408a2bb559868989978e0631bd46f7614..d1c5a4add2ca044f90f40ff21707ee8f2d49e896 100644 (file)
--- a/build_all.bat
+++ b/build_all.bat
@@ -37,9 +37,17 @@ goto end
 
 :cont1
 set PASDK_ROOT_DIR=%~dp0
-set ARTIFACTS_DIR=%PASDK_ROOT_DIR%artifacts
-set DHIP_PKG_DIR=%ARTIFACTS_DIR%\dhip_package
-set FD_PKG_DIR=%ARTIFACTS_DIR%\fd_package
+:: 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
+
+
+if exist %RELEASE_DIR%\nul ( rmdir /S / Q %RELEASE_DIR% )
 
 :: *************************************************************************
 :: *** Install tools
@@ -88,11 +96,16 @@ set FD_PKG_DIR=%ARTIFACTS_DIR%\fd_package
 @call build_fd_pkg.bat %FD_PKG_DIR%
 @popd
 
+:: Build OS package
+@pushd scripts
+@call build_os_pkg.bat %OS_PKG_DIR%
+@popd
 
 set PASDK_ROOT_DIR=
 set ARTIFACTS_DIR=
 set DHIP_PKG_DIR=
 set FD_PKG_DIR=
+set OS_PKG_DIR=
 
 
 :end

diff --git a/scripts/build_ccs_projects.bat b/scripts/build_ccs_projects.bat
index 7c384f34ff7d36695bf51d0b3d5b7ab40eaf7a4a..7d04041af82e03799fcedb0f487c6d9e32d77338 100644 (file)
--- a/scripts/build_ccs_projects.bat
+++ b/scripts/build_ccs_projects.bat
@@ -77,7 +77,7 @@ eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.c
 :: ::
 :: :build_dhip_pkgs
 :: :: Build Atmos component packages
-:: ::if exist %DHIP_PKG_DIR% ( rmdir /S /Q %DHIP_PKG_DIR% )
+:: ::if exist %DHIP_PKG_DIR%\nul ( rmdir /S /Q %DHIP_PKG_DIR% )
 :: ::mkdir %DHIP_PKG_DIR%
 :: ::@call build_dhip_pkg bmda %DHIP_PKG_DIR%
 :: ::@call build_dhip_pkg car %DHIP_PKG_DIR%
@@ -89,12 +89,12 @@ eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.c
 
 :extract_dhip_pkgs
 :: Install packages at application build locations
-if exist %BMDA_PKG_INSTALL_DIR% ( rmdir /S / Q %BMDA_PKG_INSTALL_DIR% )
-if exist %CAR_PKG_INSTALL_DIR% ( rmdir /S / Q %CAR_PKG_INSTALL_DIR% )
-if exist %OAR_PKG_INSTALL_DIR% ( rmdir /S / Q %OAR_PKG_INSTALL_DIR% )
-if exist %DDP_PKG_INSTALL_DIR% ( rmdir /S / Q %DDP_PKG_INSTALL_DIR% )
-if exist %MATTHD_PKG_INSTALL_DIR% ( rmdir /S / Q %MATTHD_PKG_INSTALL_DIR% )
-if exist %INTR_PKG_INSTALL_DIR% ( rmdir /S / Q %INTR_PKG_INSTALL_DIR% )
+if exist %BMDA_PKG_INSTALL_DIR%\nul     ( rmdir /S / Q %BMDA_PKG_INSTALL_DIR% )
+if exist %CAR_PKG_INSTALL_DIR%\nul      ( rmdir /S / Q %CAR_PKG_INSTALL_DIR% )
+if exist %OAR_PKG_INSTALL_DIR%\nul      ( rmdir /S / Q %OAR_PKG_INSTALL_DIR% )
+if exist %DDP_PKG_INSTALL_DIR%\nul      ( rmdir /S / Q %DDP_PKG_INSTALL_DIR% )
+if exist %MATTHD_PKG_INSTALL_DIR%\nul   ( rmdir /S / Q %MATTHD_PKG_INSTALL_DIR% )
+if exist %INTR_PKG_INSTALL_DIR%\nul     ( rmdir /S / Q %INTR_PKG_INSTALL_DIR% )
 @%UNZIP_PATH%\unzip -o -d %BMDA_PKG_INSTALL_DIR% %DHIP_PKG_DIR%\bmda.zip
 @%UNZIP_PATH%\unzip -o -d %CAR_PKG_INSTALL_DIR% %DHIP_PKG_DIR%\car.zip
 @%UNZIP_PATH%\unzip -o -d %OAR_PKG_INSTALL_DIR% %DHIP_PKG_DIR%\oar.zip

diff --git a/scripts/build_dhip_pkg.bat b/scripts/build_dhip_pkg.bat
index 92e5a8fed27b3f07434dfb1002c490cf75c84042..63fead30f04e8cc5017082113dbec93ed39b49be 100644 (file)
--- a/scripts/build_dhip_pkg.bat
+++ b/scripts/build_dhip_pkg.bat
@@ -20,11 +20,11 @@ set DOLBY_IP_LROOT=%PASDK_ROOT_DIR%dolby_ip
 if "%2"=="" goto def_prm_pkg_dest_dir
 
 :prm_pkg_dest_dir
-set PKG_DEST_DIR=%2
+set DHIP_PKG_DEST_DIR=%2
 goto prm_pkg
 
 :def_prm_pkg_dest_dir
-set PKG_DEST_DIR=%~dp0
+set DHIP_PKG_DEST_DIR=%~dp0
 
 :prm_pkg
 if /I "%1" == "bmda" goto build_bmda_pkg
@@ -38,10 +38,10 @@ goto end
 
 
 :build_bmda_pkg
-@echo Build package: %1 %PKG_DEST_DIR%
+@echo Build package: %1 %DHIP_PKG_DEST_DIR%
 set BMDA_ROOT_DIR=%DOLBY_IP_LROOT%\bmda
 if exist Temp\nul ( rmdir /S /Q Temp )
-if NOT exist %PKG_DEST_DIR% ( mkdir %PKG_DEST_DIR% )
+if NOT exist %DHIP_PKG_DEST_DIR%\nul ( mkdir %DHIP_PKG_DEST_DIR% )
 @mkdir Temp
 @pushd Temp
 @mkdir asp\rel\bmda\alg
@@ -56,16 +56,16 @@ if NOT exist %PKG_DEST_DIR% ( mkdir %PKG_DEST_DIR% )
 @copy /Y %BMDA_ROOT_DIR%\doc\BMDAUsersGuide.pdf DOC
 7z a -tzip -r pkg.zip
 @popd
-@copy /Y Temp\pkg.zip %PKG_DEST_DIR%\%1.zip 
+@copy /Y Temp\pkg.zip %DHIP_PKG_DEST_DIR%\%1.zip 
 @rmdir /S /Q Temp
 set BMDA_ROOT_DIR=
 goto end
 
 :build_car_pkg
-@echo Build package: %1 %PKG_DEST_DIR%
+@echo Build package: %1 %DHIP_PKG_DEST_DIR%
 set CAR_ROOT_DIR=%DOLBY_IP_LROOT%\car
 if exist Temp\nul ( rmdir /S /Q Temp )
-if NOT exist %PKG_DEST_DIR% ( mkdir %PKG_DEST_DIR% )
+if NOT exist %DHIP_PKG_DEST_DIR%\nul ( mkdir %DHIP_PKG_DEST_DIR% )
 @mkdir Temp
 @pushd Temp
 @mkdir asp\rel\car\alg
@@ -81,16 +81,16 @@ if NOT exist %PKG_DEST_DIR% ( mkdir %PKG_DEST_DIR% )
 @copy /Y %CAR_ROOT_DIR%\doc\CARUsersGuide.pdf DOC
 7z a -tzip -r pkg.zip
 @popd
-@copy /Y Temp\pkg.zip %PKG_DEST_DIR%\%1.zip 
+@copy /Y Temp\pkg.zip %DHIP_PKG_DEST_DIR%\%1.zip 
 @rmdir /S /Q Temp
 set CAR_ROOT_DIR=
 goto end
 
 :build_ddp_pkg
-@echo Build package: %1 %PKG_DEST_DIR%
+@echo Build package: %1 %DHIP_PKG_DEST_DIR%
 set DDP_ROOT_DIR=%DOLBY_IP_LROOT%\ddp
 if exist Temp\nul ( rmdir /S /Q Temp )
-if NOT exist %PKG_DEST_DIR% ( mkdir %PKG_DEST_DIR% )
+if NOT exist %DHIP_PKG_DEST_DIR%\nul ( mkdir %DHIP_PKG_DEST_DIR% )
 @mkdir Temp
 @pushd Temp
 @mkdir dec\rel\ddp2\alg
@@ -106,16 +106,16 @@ if NOT exist %PKG_DEST_DIR% ( mkdir %PKG_DEST_DIR% )
 @copy /Y %DDP_ROOT_DIR%\Dolby_Digital_Plus_Decoder_Imp\doc\DDPAT_UG.pdf DOC
 7z a -tzip -r pkg.zip
 @popd
-@copy /Y Temp\pkg.zip %PKG_DEST_DIR%\%1.zip 
+@copy /Y Temp\pkg.zip %DHIP_PKG_DEST_DIR%\%1.zip 
 @rmdir /S /Q Temp
 set DDP_ROOT_DIR=
 goto end
 
 :build_matthd_pkg
-@echo Build package: %1 %PKG_DEST_DIR%
+@echo Build package: %1 %DHIP_PKG_DEST_DIR%
 set MATTHD_ROOT_DIR=%DOLBY_IP_LROOT%\mat-thd
 if exist Temp\nul ( rmdir /S /Q Temp )
-if NOT exist %PKG_DEST_DIR% ( mkdir %PKG_DEST_DIR% )
+if NOT exist %DHIP_PKG_DEST_DIR%\nul ( mkdir %DHIP_PKG_DEST_DIR% )
 @mkdir Temp
 @pushd Temp
 @mkdir dec\rel\thd2\alg
@@ -132,17 +132,17 @@ if NOT exist %PKG_DEST_DIR% ( mkdir %PKG_DEST_DIR% )
 @copy /Y %MATTHD_ROOT_DIR%\Dolby_MAT_Decoder_Imp\doc\MATTHD_UG.pdf DOC
 7z a -tzip -r pkg.zip
 @popd
-@copy /Y Temp\pkg.zip %PKG_DEST_DIR%\%1.zip 
+@copy /Y Temp\pkg.zip %DHIP_PKG_DEST_DIR%\%1.zip 
 @rmdir /S /Q Temp
 set MATTHD_ROOT_DIR=
 goto end
 
 :build_oar_pkg
-@echo Build package: %1 %PKG_DEST_DIR%
+@echo Build package: %1 %DHIP_PKG_DEST_DIR%
 set OAR_ROOT_DIR=%DOLBY_IP_LROOT%\oar
 set INTR_ROOT_DIR=%DOLBY_IP_LROOT%\intrinsics
 if exist Temp\nul ( rmdir /S /Q Temp )
-if NOT exist %PKG_DEST_DIR% ( mkdir %PKG_DEST_DIR% )
+if NOT exist %DHIP_PKG_DEST_DIR%\nul ( mkdir %DHIP_PKG_DEST_DIR% )
 @mkdir Temp
 @pushd Temp
 @mkdir asp\rel\oar\alg
@@ -158,17 +158,17 @@ if NOT exist %PKG_DEST_DIR% ( mkdir %PKG_DEST_DIR% )
 @copy /Y %INTR_ROOT_DIR%\Dolby_Intrinsics_Imp\Source_Code\dlb_buffer\include asp\rel\oar\alg
 7z a -tzip -r pkg.zip
 @popd
-@copy /Y Temp\pkg.zip %PKG_DEST_DIR%\%1.zip 
+@copy /Y Temp\pkg.zip %DHIP_PKG_DEST_DIR%\%1.zip 
 @rmdir /S /Q Temp
 set OAR_ROOT_DIR=
 set INTR_ROOT_DIR=
 goto end
 
 :build_intr_pkg
-@echo Build package: %1 %PKG_DEST_DIR%
+@echo Build package: %1 %DHIP_PKG_DEST_DIR%
 set INTR_ROOT_DIR=%DOLBY_IP_LROOT%\intrinsics
 if exist Temp\nul ( rmdir /S /Q Temp )
-if NOT exist %PKG_DEST_DIR% ( mkdir %PKG_DEST_DIR% )
+if NOT exist %DHIP_PKG_DEST_DIR%\nul ( mkdir %DHIP_PKG_DEST_DIR% )
 @mkdir Temp
 @pushd Temp
 @mkdir build\c66x\release
@@ -177,7 +177,7 @@ if NOT exist %PKG_DEST_DIR% ( mkdir %PKG_DEST_DIR% )
 @copy /Y %INTR_ROOT_DIR%\Dolby_Intrinsics_Imp\lib_float_A15\dlb_intrinsics_generic_float32_release.a build\a15\release
 7z a -tzip -r pkg.zip
 @popd
-@copy /Y Temp\pkg.zip %PKG_DEST_DIR%\%1.zip 
+@copy /Y Temp\pkg.zip %DHIP_PKG_DEST_DIR%\%1.zip 
 @rmdir /S /Q Temp
 set INTR_ROOT_DIR=
 goto end
@@ -186,4 +186,4 @@ goto end
 :end
 
 set DOLBY_IP_LROOT=
-set PKG_DEST_DIR=
+set DHIP_PKG_DEST_DIR=

diff --git a/scripts/build_fd_pkg.bat b/scripts/build_fd_pkg.bat
index 6b6fbd0b23e45832e431b6268c378da4f528dcf4..698d6c17005d443eba9b23ae8e410c3ddc0fb763 100644 (file)
--- a/scripts/build_fd_pkg.bat
+++ b/scripts/build_fd_pkg.bat
@@ -18,19 +18,19 @@ set PASDK_LROOT_DIR=%PASDK_ROOT_DIR%pasdk
 :: Set PAF root directory
 set PAF_ROOT_DIR=%PASDK_LROOT_DIR%\paf
 :: Set package name
-set PKG_FNAME=pa_fd
+set FD_PKG_FNAME=pasdk_fd
 
 if "%1"=="" goto def_prm_pkg_dest_dir
 
 :prm_pkg_dest_dir
-set PKG_DEST_DIR=%1
-goto build_libs
+set FD_PKG_DEST_DIR=%1
+goto build_fd_pkg
 
 :def_prm_pkg_dest_dir
-set PKG_DEST_DIR=%~dp0
+set FD_PKG_DEST_DIR=%~dp0
 
-:build_libs
-@echo Build FD package %PKG_DEST_DIR%
+:build_fd_pkg
+@echo Build FD package %FD_PKG_DEST_DIR%
 
 rem
 rem Build libraries
@@ -86,7 +86,7 @@ rem Create package directories, copy files to package directories
 rem
 
 if exist Temp\nul ( rmdir /S /Q Temp )
-if NOT exist %PKG_DEST_DIR% ( mkdir %PKG_DEST_DIR% )
+if NOT exist %FD_PKG_DEST_DIR%\nul ( mkdir %FD_PKG_DEST_DIR% )
 @mkdir Temp
 @pushd Temp
 
@@ -161,9 +161,9 @@ set SNG1_ROOT_DIR=%PAF_ROOT_DIR%\pa\dec\sng1
 set SNG1_ROOT_DIR=
 
 
-7z a -tzip -r %PKG_FNAME%.zip
+7z a -tzip -r %FD_PKG_FNAME%.zip
 @popd
-@copy /Y Temp\%PKG_FNAME%.zip %PKG_DEST_DIR%
+@copy /Y Temp\%FD_PKG_FNAME%.zip %FD_PKG_DEST_DIR%
 @rmdir /S /Q Temp
 
 
@@ -171,5 +171,5 @@ set SNG1_ROOT_DIR=
 
 set PASDK_LROOT_DIR=
 set PAF_ROOT_DIR=
-set PKG_FNAME=
-set PKG_DEST_DIR=
+set FD_PKG_FNAME=
+set FD_PKG_DEST_DIR=

diff --git a/scripts/build_os_pkg.bat b/scripts/build_os_pkg.bat
new file mode 100644 (file)
index 0000000..84746f6
--- /dev/null
+++ b/scripts/build_os_pkg.bat
@@ -0,0 +1,97 @@
+@echo off
+:: *************************************************************************
+::  FILE           : build_os_pkg.bat
+::  DESCRIPTION    :
+::
+::     Builds OS package.
+::     Assumes setup_env.bat has been called.
+::
+:: *************************************************************************
+
+:: %1: package destination directory
+@echo Executing:  %~fn0 %1
+
+if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..\
+
+:: Set package name
+set OS_PKG_FNAME=pasdk_os
+
+if "%1"=="" goto def_prm_pkg_dest_dir
+
+:prm_pkg_dest_dir
+set OS_PKG_DEST_DIR=%1
+goto build_os_pkg
+
+:def_prm_pkg_dest_dir
+set OS_PKG_DEST_DIR=%~dp0
+
+:build_os_pkg
+@echo Build OS package %OS_PKG_DEST_DIR%
+
+rem
+rem Copy files to package directories 
+rem
+
+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%docs Temp\docs
+@xcopy /E /H /I /Q %PASDK_ROOT_DIR%pasdk Temp\pasdk
+@xcopy /E /H /I /Q %PASDK_ROOT_DIR%psdk_cust Temp\psdk_cust
+@xcopy /E /H /I /Q %PASDK_ROOT_DIR%tools Temp\tools
+
+@pushd Temp
+
+:: Clean PAF build artifacts
+@pushd pasdk\paf
+@cd
+@echo call git clean -fdx
+@call git clean -fdx
+@popd
+
+:: Clean custom Processor Audio SDK build artifacts
+@pushd psdk_cust
+@cd
+@echo call git checkout -- ./*
+@call git checkout -- ./*
+@popd
+
+:: Clean PASDK build artifacts
+@cd
+@echo call git clean -fdx -e Temp
+@call git clean -fdx -e Temp
+
+:: Delete FD package (&other) source files from PAF
+@pushd pasdk\paf
+@if exist pa\dec\dsd2\nul   ( rmdir /S /Q pa\dec\dsd2 )
+@if exist pa\dec\sng1\nul   ( rmdir /S /Q pa\dec\sng1 )
+@if exist pa\asp\bm2\nul    ( rmdir /S /Q pa\asp\bm2 )
+@if exist pa\asp\del3\nul   ( rmdir /S /Q pa\asp\del3 )
+@if exist pa\asp\dem\nul    ( rmdir /S /Q pa\asp\dem )
+@if exist pa\asp\dm\nul     ( rmdir /S /Q pa\asp\dm )
+@if exist pa\asp\geq3\nul   ( rmdir /S /Q pa\asp\geq3 )
+@popd
+
+:: Remove git files
+@if exist .git\nul ( rmdir /S /Q .git )
+@echo del /F /Q /S /AH .git*
+@del /F /Q /S /AH .git*
+@echo del /F /Q /S .git*
+@del /F /Q /S .git*
+
+
+:: Prepare package
+7z a -tzip -r %OS_PKG_FNAME%.zip
+@popd
+cd
+@copy /Y Temp\%OS_PKG_FNAME%.zip %OS_PKG_DEST_DIR%
+@rmdir /S /Q Temp
+
+
+:end
+
+
+set OS_PKG_FNAME=
+set OS_PKG_DEST_DIR=

diff --git a/scripts/install_code.bat b/scripts/install_code.bat
index 8695201a4d63da9423eb0bb9a874914c70b9e9ce..da9018d3f247b4f466b13d3a7a06a4ae952aed65 100644 (file)
--- a/scripts/install_code.bat
+++ b/scripts/install_code.bat
@@ -59,7 +59,7 @@ goto install_end
 :: *************************************************************************
 :: ** Install BMDA
 :: *************************************************************************
-if exist dolby_ip\bmda goto bmda_update
+if exist dolby_ip\bmda\nul goto bmda_update
 @echo Clone:  BMDA
 call git clone %BMDA_GIT_REPO% dolby_ip\bmda
 if not exist dolby_ip\bmda goto bmda_error
@@ -78,7 +78,7 @@ popd
 :: *************************************************************************
 :: ** Install CAR
 :: *************************************************************************
-if exist dolby_ip\car goto car_update
+if exist dolby_ip\car\nul goto car_update
 @echo Clone:  CAR
 call git clone %CAR_GIT_REPO% dolby_ip\car
 if not exist dolby_ip\car goto car_error
@@ -97,7 +97,7 @@ popd
 :: *************************************************************************
 :: ** Install DDP
 :: *************************************************************************
-if exist dolby_ip\ddp goto ddp_update
+if exist dolby_ip\ddp\nul goto ddp_update
 @echo Clone:  DDP
 call git clone %DDP_GIT_REPO% dolby_ip\ddp
 if not exist dolby_ip\ddp goto ddp_error
@@ -116,7 +116,7 @@ popd
 :: *************************************************************************
 :: ** Install Intrinsics
 :: *************************************************************************
-if exist dolby_ip\intrinsics goto intr_update
+if exist dolby_ip\intrinsics\nul goto intr_update
 @echo Clone:  Intrinsics
 call git clone %INTR_GIT_REPO% dolby_ip\intrinsics
 if not exist dolby_ip\intrinsics goto intr_error
@@ -135,7 +135,7 @@ popd
 :: *************************************************************************
 :: ** Install MAT-THD
 :: *************************************************************************
-if exist dolby_ip\mat-thd goto matthd_update
+if exist dolby_ip\mat-thd\nul goto matthd_update
 @echo Clone:  mat-thd
 call git clone %MATTHD_GIT_REPO% dolby_ip\mat-thd
 if not exist dolby_ip\mat-thd goto matthd_error
@@ -154,7 +154,7 @@ popd
 :: *************************************************************************
 :: ** Install OAR
 :: *************************************************************************
-if exist dolby_ip\oar goto oar_update
+if exist dolby_ip\oar\nul goto oar_update
 @echo Clone:  OAR
 call git clone %OAR_GIT_REPO% dolby_ip\oar
 if not exist dolby_ip\oar goto oar_error
@@ -173,7 +173,7 @@ popd
 :: *************************************************************************
 :: ** Install PAF
 :: *************************************************************************
-if exist pasdk\paf goto paf_update
+if exist pasdk\paf\nul goto paf_update
 @echo Clone:  PAF
 call git clone %PAF_GIT_REPO% pasdk\paf
 if not exist pasdk\paf goto paf_error