From 758b97decf5cb605d4a7cc293bb46f48b3e1a38f Mon Sep 17 00:00:00 2001
From: Frank Livingston <frank-livingston@ti.com>
Date: Tue, 6 Dec 2016 14:17:30 -0600
Subject: [PATCH] Reverse order of parameters to build_ccs_projects.bat

---
 build_all.bat                  |  2 +-
 scripts/build_ccs_projects.bat | 27 ++++++++++-----------------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/build_all.bat b/build_all.bat
index f9f1f2ce..1b7e45a5 100644
--- a/build_all.bat
+++ b/build_all.bat
@@ -97,7 +97,7 @@ if "%2" NEQ "SDF" goto build_ccs_projects
 :build_ccs_projects
 :: Build DSP PDK platform library, ARM/DSP applications
 @pushd scripts
-@call build_ccs_projects.bat %DHIP_PKG_DIR% %2
+@call build_ccs_projects.bat %2 %DHIP_PKG_DIR%
 @popd
 
 if "%2" NEQ "SDF" goto cleanupenv
diff --git a/scripts/build_ccs_projects.bat b/scripts/build_ccs_projects.bat
index 7d394046..2d0b5efd 100644
--- a/scripts/build_ccs_projects.bat
+++ b/scripts/build_ccs_projects.bat
@@ -9,18 +9,12 @@
 ::
 :: *************************************************************************
 
-:: %1: DH-IP package source directory
-:: %2: Build profile: Debug, Release, SDF
+:: %1: Build profile: Debug, Release, SDF
+:: %2: DH-IP package source directory
 @echo Executing:  %~fn0 %1 %2
 
 if "%PASDK_ROOT_DIR%" == "" set PASDK_ROOT_DIR=%~dp0..\
 
-if "%1" NEQ "" goto cont1
-@echo "Invalid DH-IP source directory"
-goto end
-
-
-:cont1
 :: Set PASDK local root directory
 set PASDK_LROOT_DIR=%PASDK_ROOT_DIR%pasdk
 :: Set custom Processor SDK local root directory
@@ -37,32 +31,31 @@ set CCS_WRKSP_DIR=workspace_v6_1
 set SAVE_CYGWIN=%CYGWIN%
 set CYGWIN=nontsec
 
-if "%2"=="Debug" goto SetBuildProfilesDebug
-if "%2"=="Release" goto SetBuildProfilesRelease
+if "%1"=="Debug" goto SetBuildProfilesDebug
+if "%1"=="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
+goto cont1
 
 :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
+goto cont1
 
 :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
+:cont1
+if "%1" NEQ "SDF" goto init_rtsc
 :: Set unzip path
 for %%i in (git.exe) do set GIT_PATH=%DRIVE%%%~sp$PATH:i
 set UNZIP_PATH=%GIT_PATH%..\usr\bin
@@ -80,7 +73,7 @@ set INTR_PKG_INSTALL_DIR=%DOLBY_IP_LROOT%\dh-ip
 
 :: Set package directory (location of generated packages)
 ::set DHIP_PKG_DIR=%DOLBY_IP_LROOT%\package
-set DHIP_PKG_DIR=%1
+set DHIP_PKG_DIR=%2
 
 
 :init_rtsc
@@ -116,7 +109,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
+if "%1" 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% )
-- 
2.39.2