::**********************************************************************\r
:: Initial Setup\r
::**********************************************************************\r
-set WORKSPACE=%CD%\r
-if %WORKSPACE:~-1%==\ set WORKSPACE=%WORKSPACE:~0,-1%\r
+REM set WORKSPACE=%CD%\r
+REM if %WORKSPACE:~-1%==\ set WORKSPACE=%WORKSPACE:~0,-1%\r
set /a build_threads=1\r
set "Build_Flags= "\r
set exitCode=0\r
if exist %WORKSPACE%\Conf\tools_def.txt del %WORKSPACE%\Conf\tools_def.txt\r
if exist %WORKSPACE%\Conf\build_rule.txt del %WORKSPACE%\Conf\build_rule.txt\r
if exist %WORKSPACE%\Conf\FrameworkDatabase.db del %WORKSPACE%\Conf\FrameworkDatabase.db\r
-if exist conf\.cache rmdir /q/s conf\.cache\r
+if exist %WORKSPACE%\Conf\.cache rmdir /q/s %WORKSPACE%\Conf\.cache\r
\r
:: Setup EDK environment. Edksetup puts new copies of target.txt, tools_def.txt, build_rule.txt in WorkSpace\Conf\r
:: Also run edksetup as soon as possible to avoid it from changing environment variables we're overriding\r
set config_file=.\%PLATFORM_PACKAGE%\PlatformPkgConfig.dsc\r
set auto_config_inc=.\%PLATFORM_PACKAGE%\AutoPlatformCFG.txt\r
\r
-set EDK_SOURCE=%WORKSPACE%\EdkCompatibilityPkg\r
+REM set EDK_SOURCE=%WORKSPACE%\EdkCompatibilityPkg\r
\r
::create new AutoPlatformCFG.txt file\r
copy /y nul %auto_config_inc% >nul\r
\r
::Remove the values for Platform_Type and Build_Target from BiosIdX.env and stage in Conf\\r
if "%Arch%"=="IA32" (\r
- findstr /b /v "BOARD_ID BUILD_TYPE" %PLATFORM_PACKAGE%\BiosIdR.env > Conf\BiosId.env\r
+ findstr /b /v "BOARD_ID BUILD_TYPE" %PLATFORM_PACKAGE%\BiosIdR.env > %WORKSPACE%\Conf\BiosId.env\r
echo DEFINE X64_CONFIG = FALSE >> %auto_config_inc%\r
) else if "%Arch%"=="X64" (\r
- findstr /b /v "BOARD_ID BUILD_TYPE" %PLATFORM_PACKAGE%\BiosIdx64R.env > Conf\BiosId.env\r
+ findstr /b /v "BOARD_ID BUILD_TYPE" %PLATFORM_PACKAGE%\BiosIdx64R.env > %WORKSPACE%\Conf\BiosId.env\r
echo DEFINE X64_CONFIG = TRUE >> %auto_config_inc%\r
)\r
\r
:: -- Build flags settings for each Platform --\r
echo Setting %1 platform configuration and BIOS ID...\r
if /i "%~1" == "MNW2" (\r
- echo BOARD_ID = MNW2MAX >> %Conf\BiosId.env\r
+ echo BOARD_ID = MNW2MAX >> %WORKSPACE%\Conf\BiosId.env\r
echo DEFINE ENBDT_PF_BUILD = TRUE >> %auto_config_inc%\r
\r
) else (\r
\r
if /i "%~2" == "RELEASE" (\r
set target=RELEASE\r
- echo BUILD_TYPE = R >> Conf\BiosId.env\r
+ echo BUILD_TYPE = R >> %WORKSPACE%\Conf\BiosId.env\r
) else (\r
set target=DEBUG\r
- echo BUILD_TYPE = D >> Conf\BiosId.env\r
+ echo BUILD_TYPE = D >> %WORKSPACE%\Conf\BiosId.env\r
)\r
\r
::**********************************************************************\r
-:: Additional EDK Build Setup/Configuration
-::**********************************************************************
-echo.
+:: Additional EDK Build Setup/Configuration\r
+::**********************************************************************\r
+echo.\r
echo Setting the Build environment for VS2008/VS2010/VS2012/VS2013...\r
-if defined VS90COMNTOOLS (
- if not defined VSINSTALLDIR call "%VS90COMNTOOLS%\vsvars32.bat"
- if /I "%VS90COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 9.0\Common7\Tools\" (
- set TOOL_CHAIN_TAG=VS2008\r
- ) else (\r
- set TOOL_CHAIN_TAG=VS2008x86\r
- )\r
- ) else if defined VS100COMNTOOLS (\r
- if not defined VSINSTALLDIR call "%VS100COMNTOOLS%\vsvars32.bat"\r
- if /I "%VS100COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 10.0\Common7\Tools\" (\r
- set TOOL_CHAIN_TAG=VS2010\r
+if defined VS140COMNTOOLS (\r
+ if not defined VSINSTALLDIR call "%VS140COMNTOOLS%\vsvars32.bat"\r
+ if /I "%VS140COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 14.0\Common7\Tools\" (\r
+ set TOOL_CHAIN_TAG=VS2015\r
) else (\r
- set TOOL_CHAIN_TAG=VS2010x86
+ set TOOL_CHAIN_TAG=VS2015x86\r
+ )\r
+) else if defined VS120COMNTOOLS (\r
+ if not defined VSINSTALLDIR call "%VS120COMNTOOLS%\vsvars32.bat"\r
+ if /I "%VS120COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 12.0\Common7\Tools\" (\r
+ set TOOL_CHAIN_TAG=VS2013\r
+ ) else (\r
+ set TOOL_CHAIN_TAG=VS2013x86\r
)\r
) else if defined VS110COMNTOOLS (\r
if not defined VSINSTALLDIR call "%VS110COMNTOOLS%\vsvars32.bat"\r
) else (\r
set TOOL_CHAIN_TAG=VS2012x86\r
)\r
-) else if defined VS120COMNTOOLS (\r
- if not defined VSINSTALLDIR call "%VS120COMNTOOLS%\vsvars32.bat"\r
- if /I "%VS120COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 12.0\Common7\Tools\" (\r
- set TOOL_CHAIN_TAG=VS2013\r
+) else if defined VS100COMNTOOLS (\r
+ if not defined VSINSTALLDIR call "%VS100COMNTOOLS%\vsvars32.bat"\r
+ if /I "%VS100COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 10.0\Common7\Tools\" (\r
+ set TOOL_CHAIN_TAG=VS2010\r
) else (\r
- set TOOL_CHAIN_TAG=VS2013x86\r
+ set TOOL_CHAIN_TAG=VS2010x86\r
+ )\r
+) else if defined VS90COMNTOOLS (\r
+ if not defined VSINSTALLDIR call "%VS90COMNTOOLS%\vsvars32.bat"\r
+ if /I "%VS90COMNTOOLS%" == "C:\Program Files\Microsoft Visual Studio 9.0\Common7\Tools\" (\r
+ set TOOL_CHAIN_TAG=VS2008\r
+ ) else (\r
+ set TOOL_CHAIN_TAG=VS2008x86\r
)\r
-) else (
- echo --ERROR: VS2008/VS2010/VS2012/VS2013 not installed correctly. VS90COMNTOOLS/VS100COMNTOOLS/VS110COMNTOOLS/VS120COMNTOOLS not defined ^^!\r
+) else (\r
+ echo --ERROR: VS2008/VS2010/VS2012/VS2013/VS2015 not installed correctly. VS90COMNTOOLS/VS100COMNTOOLS/VS110COMNTOOLS/VS120COMNTOOLS/VS140COMMONTOOLS not defined ^^!\r
echo.\r
goto :BldFail\r
-)
+)\r
\r
echo Ensuring correct build directory is present for GenBiosId...\r
-set BUILD_PATH=Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\r
+set BUILD_PATH=%WORKSPACE%\Build\%PLATFORM_PACKAGE%\%TARGET%_%TOOL_CHAIN_TAG%\r
\r
echo Modifing Conf files for this build...\r
:: Remove lines with these tags from target.txt\r
-findstr /V "TARGET TARGET_ARCH TOOL_CHAIN_TAG BUILD_RULE_CONF ACTIVE_PLATFORM MAX_CONCURRENT_THREAD_NUMBER" Conf\target.txt > Conf\target.txt.tmp\r
+findstr /V "TARGET TARGET_ARCH TOOL_CHAIN_TAG BUILD_RULE_CONF ACTIVE_PLATFORM MAX_CONCURRENT_THREAD_NUMBER" %WORKSPACE%\Conf\target.txt > %WORKSPACE%\Conf\target.txt.tmp\r
\r
-echo TARGET = %TARGET% >> Conf\target.txt.tmp\r
+echo TARGET = %TARGET% >> %WORKSPACE%\Conf\target.txt.tmp\r
if "%Arch%"=="IA32" (\r
- echo TARGET_ARCH = IA32 >> Conf\target.txt.tmp\r
+ echo TARGET_ARCH = IA32 >> %WORKSPACE%\Conf\target.txt.tmp\r
) else if "%Arch%"=="X64" (\r
- echo TARGET_ARCH = IA32 X64 >> Conf\target.txt.tmp\r
+ echo TARGET_ARCH = IA32 X64 >> %WORKSPACE%\Conf\target.txt.tmp\r
)\r
-echo TOOL_CHAIN_TAG = %TOOL_CHAIN_TAG% >> Conf\target.txt.tmp\r
-echo BUILD_RULE_CONF = Conf/build_rule.txt >> Conf\target.txt.tmp\r
+echo TOOL_CHAIN_TAG = %TOOL_CHAIN_TAG% >> %WORKSPACE%\Conf\target.txt.tmp\r
+echo BUILD_RULE_CONF = Conf/build_rule.txt >> %WORKSPACE%\Conf\target.txt.tmp\r
if %Source% == 0 (\r
- echo ACTIVE_PLATFORM = %PLATFORM_PACKAGE%/PlatformPkg%Arch%.dsc >> Conf\target.txt.tmp\r
+ echo ACTIVE_PLATFORM = %PLATFORM_PACKAGE%/PlatformPkg%Arch%.dsc >> %WORKSPACE%\Conf\target.txt.tmp\r
) else (\r
- echo ACTIVE_PLATFORM = %PLATFORM_PACKAGE%/PlatformPkg%Arch%Source.dsc >> Conf\target.txt.tmp\r
+ echo ACTIVE_PLATFORM = %PLATFORM_PACKAGE%/PlatformPkg%Arch%Source.dsc >> %WORKSPACE%\Conf\target.txt.tmp\r
)\r
-echo MAX_CONCURRENT_THREAD_NUMBER = %build_threads% >> Conf\target.txt.tmp\r
+echo MAX_CONCURRENT_THREAD_NUMBER = %build_threads% >> %WORKSPACE%\Conf\target.txt.tmp\r
\r
-move /Y Conf\target.txt.tmp Conf\target.txt >nul\r
+move /Y %WORKSPACE%\Conf\target.txt.tmp %WORKSPACE%\Conf\target.txt >nul\r
\r
::**********************************************************************\r
:: Build BIOS\r
\r
echo Creating BiosId...\r
pushd %PLATFORM_PACKAGE%\r
-if not exist ..\%BUILD_PATH%\IA32 mkdir ..\%BUILD_PATH%\IA32\r
- GenBiosId.exe -i ..\Conf\BiosId.env -o ..\%BUILD_PATH%\IA32\BiosId.bin -ob ..\Conf\BiosId.bat\r
+if not exist %BUILD_PATH%\IA32 mkdir %BUILD_PATH%\IA32\r
+ GenBiosId.exe -i %WORKSPACE%\Conf\BiosId.env -o %BUILD_PATH%\IA32\BiosId.bin -ob %WORKSPACE%\Conf\BiosId.bat\r
if "%Arch%"=="X64" (\r
- if not exist ..\%BUILD_PATH%\X64 mkdir ..\%BUILD_PATH%\X64\r
- GenBiosId.exe -i ..\Conf\BiosId.env -o ..\%BUILD_PATH%\X64\BiosId.bin -ob ..\Conf\BiosId.bat\r
+ if not exist %BUILD_PATH%\X64 mkdir %BUILD_PATH%\X64\r
+ GenBiosId.exe -i %WORKSPACE%\Conf\BiosId.env -o %BUILD_PATH%\X64\BiosId.bin -ob %WORKSPACE%\Conf\BiosId.bat\r
)\r
popd\r
\r
\r
pushd %PLATFORM_PACKAGE%\r
:: Extract Hii data from build and store in HiiDefaultData.txt\r
-fce read -i ..\%BUILD_PATH%\FV\Vlv.fd > ..\%BUILD_PATH%\FV\HiiDefaultData.txt\r
+fce read -i %BUILD_PATH%\FV\Vlv.fd > %BUILD_PATH%\FV\HiiDefaultData.txt\r
\r
:: save changes to VlvXXX.fd\r
-fce update -i ..\%BUILD_PATH%\FV\Vlv.fd -s ..\%BUILD_PATH%\FV\HiiDefaultData.txt -o ..\%BUILD_PATH%\FV\Vlv%Arch%.fd\r
+fce update -i %BUILD_PATH%\FV\Vlv.fd -s %BUILD_PATH%\FV\HiiDefaultData.txt -o %BUILD_PATH%\FV\Vlv%Arch%.fd\r
\r
popd\r
\r
::echo FD successfully updated with default Hii values.\r
\r
:: Set the Board_Id, Build_Type, Version_Major, and Version_Minor environment variables\r
-find /v "#" 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
\r
echo.\r
\r
@REM build capsule here\r
-if "%openssl_path%" == "" goto Exit\r
+if "%openssl_path%" == "" (\r
+ echo -- Error: OPENSSL_PATH not set. Capule and Recovery images not generated.\r
+ set exitCode=1\r
+ goto Exit\r
+)\r
echo > %BUILD_PATH%\FV\SYSTEMFIRMWAREUPDATECARGO.Fv\r
build -p %PLATFORM_PACKAGE%\PlatformCapsule.dsc\r
\r