Update build scripts for package creation

diff --git a/scripts/build_ccs_projects.bat b/scripts/build_ccs_projects.bat
index 9dba43fe94fb72f62f6eab42bdb476251740fbad..c5569653af91f592f926a5317c8b2e33030ce356 100644 (file)
--- a/scripts/build_ccs_projects.bat
+++ b/scripts/build_ccs_projects.bat
@@ -1,10 +1,11 @@
-::@echo off
+@echo off
 :: *************************************************************************
 ::  FILE           : build_ccs_projects.bat
 ::  DESCRIPTION    :
 ::
 ::     Builds DSP PDK platform library.
 ::     Builds ARM/DSP applications.
+::     Assumes setup_env.bat has been called.
 ::
 :: *************************************************************************
 
@@ -27,7 +28,7 @@ set PDK_INSTALL_DIR=%PSDK_CUST_LROOT_DIR%\pdk_k2g_%PDK_VERSION%
 set CCS_WRKSP_DIR=workspace_v6_1
 
 :: Set package directory (location of generated packages)
-set PKG_DIR=%DOLBY_IP_LROOT%package
+set PKG_DIR=%DOLBY_IP_LROOT%\package
 :: 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
@@ -57,35 +58,35 @@ eclipsec -noSplash -data %PASDK_LROOT_DIR%\%CCS_WRKSP_DIR% -application com.ti.c
 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"
 
-rem ::
-rem :: Build ARM/DSP component packages
-rem ::
-rem :build_pkg
-rem :: Build Atmos component packages
-rem if exist %PKG_DIR% ( rmdir /S /Q %PKG_DIR% )
-rem mkdir %PKG_DIR%
-rem @call build_pkg bmda %PKG_DIR%
-rem @call build_pkg car %PKG_DIR%
-rem @call build_pkg ddp %PKG_DIR%
-rem @call build_pkg matthd %PKG_DIR%
-rem @call build_pkg oar %PKG_DIR%
-rem @call build_pkg intrinsics %PKG_DIR%
-rem 
-rem :: Install packages at application build locations
-rem :: No need to remove package installation directories since unzip will overwrite files
-rem ::if exist %BMDA_PKG_INSTALL_DIR% ( rmdir /S / Q %BMDA_PKG_INSTALL_DIR% )
-rem ::if exist %CAR_PKG_INSTALL_DIR% ( rmdir /S / Q %CAR_PKG_INSTALL_DIR% )
-rem ::if exist %OAR_PKG_INSTALL_DIR% ( rmdir /S / Q %OAR_PKG_INSTALL_DIR% )
-rem ::if exist %DDP_PKG_INSTALL_DIR% ( rmdir /S / Q %DDP_PKG_INSTALL_DIR% )
-rem ::if exist %MATTHD_PKG_INSTALL_DIR% ( rmdir /S / Q %MATTHD_PKG_INSTALL_DIR% )
-rem @unzip -o -d %BMDA_PKG_INSTALL_DIR% %PKG_DIR%\bmda.zip
-rem @unzip -o -d %CAR_PKG_INSTALL_DIR% %PKG_DIR%\car.zip
-rem @unzip -o -d %OAR_PKG_INSTALL_DIR% %PKG_DIR%\oar.zip
-rem @unzip -o -d %DDP_PKG_INSTALL_DIR% %PKG_DIR%\ddp.zip
-rem @unzip -o -d %MATTHD_PKG_INSTALL_DIR% %PKG_DIR%\matthd.zip
-rem @unzip -o -d %INTR_PKG_INSTALL_DIR% %PKG_DIR%\intrinsics.zip
-rem 
-rem 
+::
+:: Build ARM/DSP component packages
+::
+:build_pkg
+:: Build Atmos component packages
+if exist %PKG_DIR% ( rmdir /S /Q %PKG_DIR% )
+mkdir %PKG_DIR%
+@call build_pkg bmda %PKG_DIR%
+@call build_pkg car %PKG_DIR%
+@call build_pkg ddp %PKG_DIR%
+@call build_pkg matthd %PKG_DIR%
+@call build_pkg oar %PKG_DIR%
+@call build_pkg intrinsics %PKG_DIR%
+
+:: Install packages at application build locations
+:: No need to remove package installation directories since unzip will overwrite files
+::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% )
+@unzip -o -d %BMDA_PKG_INSTALL_DIR% %PKG_DIR%\bmda.zip
+@unzip -o -d %CAR_PKG_INSTALL_DIR% %PKG_DIR%\car.zip
+@unzip -o -d %OAR_PKG_INSTALL_DIR% %PKG_DIR%\oar.zip
+@unzip -o -d %DDP_PKG_INSTALL_DIR% %PKG_DIR%\ddp.zip
+@unzip -o -d %MATTHD_PKG_INSTALL_DIR% %PKG_DIR%\matthd.zip
+@unzip -o -d %INTR_PKG_INSTALL_DIR% %PKG_DIR%\intrinsics.zip
+
+
 ::
 :: Build projects
 ::

diff --git a/scripts/build_pkg.bat b/scripts/build_pkg.bat
index a2feeb9b03ce42c25bbd0f526b1dbe885cd7a239..cc37830b44886fddc7631dceb898bfcb4e3a001a 100644 (file)
--- a/scripts/build_pkg.bat
+++ b/scripts/build_pkg.bat
@@ -4,6 +4,7 @@
 ::  DESCRIPTION    :
 ::
 ::     Builds package for Atmos component library.
+::     Assumes setup_env.bat has been called.
 ::
 :: *************************************************************************
 

diff --git a/scripts/install_code.bat b/scripts/install_code.bat
index 831546624020ab4ff41074333688fcd44c1a368a..8695201a4d63da9423eb0bb9a874914c70b9e9ce 100644 (file)
--- a/scripts/install_code.bat
+++ b/scripts/install_code.bat
@@ -1,4 +1,4 @@
-::@echo off
+@echo off
 :: *************************************************************************
 ::  FILE           : install_code.bat
 ::  DESCRIPTION    :

diff --git a/scripts/setup_env.bat b/scripts/setup_env.bat
index 11a3ee001a7bf35ce305e45c4e12f80b331acbae..b40773681d30dc6e5830c3305b2c4810e6045362 100644 (file)
--- a/scripts/setup_env.bat
+++ b/scripts/setup_env.bat
@@ -63,7 +63,7 @@ set PATH=%XDC_INSTALL_DIR%\jre\bin;%PATH%
 set PATH=%PATH%;%CCS_INSTALL_DIR%\eclipse
 set PATH=%PATH%;%SED_INSTALL_DIR%\bin
 set PATH=%PATH%;%PYTHON_INSTALL_DIR%;%PYTHON_INSTALL_DIR%\Scripts
-set PATH=%PATH%;%GIT_PATH%
+set PATH=%PATH%;%GIT_PATH%;%GIT_PATH%..\usr\bin
 set PATH=%PATH%;%ZIP_INSTALL_DIR%\7-Zip
 set GIT_PATH=