Vlv2TbltDevicePkg: Remove directory assumptions from build scripts

[mirror_edk2.git] / Vlv2TbltDevicePkg / Build_IFWI.bat

diff --git a/Vlv2TbltDevicePkg/Build_IFWI.bat b/Vlv2TbltDevicePkg/Build_IFWI.bat
index 9a3063397ec1f21f0b989e21c63270f9e3eafb88..887206703aeaa05ed997ce8c7617dd03da303a6a 100644 (file)
--- a/Vlv2TbltDevicePkg/Build_IFWI.bat
+++ b/Vlv2TbltDevicePkg/Build_IFWI.bat
@@ -1,7 +1,7 @@
 @REM @file\r
 @REM   Windows batch file to build BIOS ROM\r
 @REM\r
-@REM Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+@REM Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
 @REM SPDX-License-Identifier: BSD-2-Clause-Patent\r
 @REM\r
 \r
@@ -18,11 +18,26 @@ set exitCode=0
 set "Build_Flags= "\r
 set "Stitch_Flags= "\r
 set Arch=X64\r
-set WORKSPACE=%CD%\r
-set CORE_PATH=%WORKSPACE%\edk2\r
-set PLATFORM_PATH=%WORKSPACE%\edk2\r
 set PLATFORM_PACKAGE=Vlv2TbltDevicePkg\r
 \r
+set PLATFORM_PATH=%WORKSPACE%\r
+if not exist %PLATFORM_PATH%\%PLATFORM_PACKAGE% (\r
+  if defined PACKAGES_PATH (\r
+    for %%i IN (%PACKAGES_PATH%) DO (\r
+      if exist %%~fi\%PLATFORM_PACKAGE% (\r
+        set PLATFORM_PATH=%%~fi\r
+        goto PlatformPackageFound\r
+      )\r
+    )\r
+  ) else (\r
+    echo.\r
+    echo !!! ERROR !!! Cannot find %PLATFORM_PACKAGE% !!!\r
+    echo.\r
+    goto Exit\r
+  )\r
+)\r
+:PlatformPackageFound\r
+\r
 :: Parse Optional arguments\r
 :OptLoop\r
 if /i "%~1"=="/?" goto Usage\r
@@ -125,11 +140,11 @@ if %ERRORLEVEL% NEQ 0 (
 echo.\r
 echo Finished Building BIOS.\r
 @REM Set BIOS_ID environment variable here.\r
-call %CORE_PATH%\Conf\BiosId.bat\r
+call %WORKSPACE%\Conf\BiosId.bat\r
 echo BIOS_ID=%BIOS_ID%\r
 \r
 :: Set the Board_Id, Build_Type, Version_Major, and Version_Minor environment variables\r
-find /v "#" %CORE_PATH%\Conf\BiosId.env > ver_strings\r
+find /v "#" %WORKSPACE%\Conf\BiosId.env > ver_strings\r
 for /f "tokens=1,3" %%i in (ver_strings) do set %%i=%%j\r
 del /f/q ver_strings >nul\r
 set BIOS_Name=%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MINOR%.ROM\r
@@ -137,10 +152,10 @@ set BIOS_Name=%BOARD_ID%_%Arch%_%BUILD_TYPE%_%VERSION_MAJOR%_%VERSION_MINOR%.ROM
 :: Start Integration process\r
 echo ======================================================================\r
 echo Build_IFWI:  Calling IFWI Stitching Script...\r
-pushd %CORE_PATH%\%PLATFORM_PACKAGE%\Stitch\r
+pushd %PLATFORM_PATH%\%PLATFORM_PACKAGE%\Stitch\r
 \r
   :: IFWIStitch.bat [/nG] [/nM] [/nB] [/B BIOS.rom] [/C StitchConfig] [/S IFWISuffix]\r
-  call IFWIStitch.bat %Stitch_Flags% /B ..\..\%BIOS_Name% %IFWI_Suffix%\r
+  call IFWIStitch.bat %Stitch_Flags% /B %BIOS_Name% %IFWI_Suffix%\r
    \r
  @echo off\r
 popd\r