From 7fe7d213da6a6556799f41cae14702eb9ccb9fcd Mon Sep 17 00:00:00 2001
From: benyamin-codez <115509179+benyamin-codez@users.noreply.github.com>
Date: Fri, 17 Jan 2025 02:53:54 +1100
Subject: [PATCH] [build] Basic fixes and extentions to build scripting

Addendum to fdf1f44 and 6425be6.

1. Refactor following review: FOR loops

Signed-off-by: benyamin-codez <115509179+benyamin-codez@users.noreply.github.com>
---
 build/build.bat | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/build/build.bat b/build/build.bat
index 27fd845a2..2dc0be4c9 100644
--- a/build/build.bat
+++ b/build/build.bat
@@ -39,6 +39,7 @@ set BUILD_FLAVOR=Release
 set BUILD_COMMAND=/Build
 set BUILD_SPEC=
 set BUILD_ARCH=
+set BUILD_INFO=
 set BUILD_FAILED=
 
 rem Analysis Build specific variables
@@ -139,11 +140,14 @@ goto :eof
 rem Invoke Visual Studio and CodeQL as needed...
 :build_arch
 setlocal
+set BUILD_INFO=%1
 set BUILD_ARCH=%2
 set TAG=
-for /f "tokens=1 delims=_" %%T in ("%1") do @set TARGET_PROJ_CONFIG=%%T
-for /f "tokens=2 delims=_" %%T in ("%1") do @set TARGET_PLATFORM=%%T
-for /f "tokens=3 delims=_" %%T in ("%1") do @set TAG=%%T
+for /f "tokens=1,2,3 delims=_" %%i in ("%BUILD_INFO%") do @(
+  set TARGET_PROJ_CONFIG=%%i
+  set TARGET_PLATFORM=%%j
+  set TAG=%%k
+)
 
 if /I "!TAG!"=="SDV" (
   rem There is no 32-bit SDV build
@@ -331,10 +335,15 @@ IF ERRORLEVEL 1 (
 goto :eof
 
 :split_target_tag
+set BUILD_INFO=%1
 set TARGET=
 set TAG=
-for /f "tokens=1 delims=_" %%T in (%1) do @set TARGET=%%T
-for /f "tokens=2 delims=_" %%T in (%1) do @set TAG=_%%T
+for /f "tokens=1,2 delims=_" %%i in (%BUILD_INFO%) do @(
+  set TARGET=%%i
+  if not "%%j"=="" (
+    set TAG=_%%j
+  )
+)
 goto :eof
 
 :fail