Re: [edk2-devel] [PATCH 2/2] PurleyOpenBoardPkg/BoardMtOlympus: Extend build to support Binary Cache
Reviewed-by: Lu, shifei > -Original Message- > From: Shi, Steven > Sent: Thursday, May 9, 2019 11:21 AM > To: devel@edk2.groups.io > Cc: Chiu, Chasel ; Lu, Shifei A > ; Gao, Liming ; Bi, Dandan > ; Kubacki, Michael A > Subject: [PATCH 2/2] PurleyOpenBoardPkg/BoardMtOlympus: Extend build > to support Binary Cache > > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1785 > > Extend the options in the Purley build batch file to support > Binary Cache produce and consume switch. > --- > .../PurleyOpenBoardPkg/BoardMtOlympus/bld.bat | 18 > -- > .../BoardMtOlympus/prebuild.bat| 4 ++-- > 2 files changed, 18 insertions(+), 4 deletions(-) > > diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/bld.bat > b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/bld.bat > index a66d19e66e..eda749af36 100644 > --- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/bld.bat > +++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/bld.bat > @@ -16,6 +16,11 @@ REM Run setlocal to take a snapshot of the > environment variables. endlocal is c > setlocal > set SCRIPT_ERROR=0 > > +@if not defined BINARY_CACHE_PATH ( > + echo Info: BINARY_CACHE_PATH is empty, use BinCache as default > + SET BINARY_CACHE_PATH=BinCache > +) > + > REM Do NOT use :: for comments Inside of code blocks() > > ::* > * > @@ -34,6 +39,15 @@ if /I "%1"=="clean" ( >goto :EOF > ) > > +if /I "%1"=="cache-produce" ( > + set BINARY_CACHE_CMD_LINE= --hash --binary- > destination=%BINARY_CACHE_PATH% > +) > + > +if /I "%1"=="cache-consume" ( > + set BINARY_CACHE_CMD_LINE= --hash --binary- > source=%BINARY_CACHE_PATH% > +) > + > + > shift > GOTO :parseCmdLine > > @@ -92,8 +106,8 @@ echo Build Start > echo. > echo > echo. > -echo build %BUILD_CMD_LINE% -- > log=%BUILD_LOG% %BUILD_REPORT_FLAGS% > -call build %BUILD_CMD_LINE% -- > log=%BUILD_LOG% %BUILD_REPORT_FLAGS% > +echo build %BUILD_CMD_LINE% -- > log=%BUILD_LOG% %BUILD_REPORT_FLAGS% %BINARY_CACHE_CMD_LINE% > +call build %BUILD_CMD_LINE% -- > log=%BUILD_LOG% %BUILD_REPORT_FLAGS% %BINARY_CACHE_CMD_LINE% > echo > echo. > echo Build End > diff --git > a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat > b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat > index 81a9634d51..880e6417ac 100644 > --- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat > +++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat > @@ -188,8 +188,8 @@ set PRE_BUILD_CMD_LINE=%BUILD_CMD_LINE% -D > MAX_SOCKET=%MAX_SOCKET% > set PRE_BUILD_LOG=%WORKSPACE%\Build\prebuild.log > set PRE_BUILD_REPORT=%WORKSPACE%\Build\preBuildReport.txt > > -echo build %PRE_BUILD_CMD_LINE% - > m %BOARD_PKG%\Acpi\BoardAcpiDxe\Dsdt.inf -y %PRE_BUILD_REPORT% -- > log=%PRE_BUILD_LOG% > -call build %PRE_BUILD_CMD_LINE% - > m %BOARD_PKG%\Acpi\BoardAcpiDxe\Dsdt.inf -y %PRE_BUILD_REPORT% -- > log=%PRE_BUILD_LOG% > +echo build %PRE_BUILD_CMD_LINE% - > m %BOARD_PKG%\Acpi\BoardAcpiDxe\Dsdt.inf -y %PRE_BUILD_REPORT% -- > log=%PRE_BUILD_LOG% %BINARY_CACHE_CMD_LINE% > +call build %PRE_BUILD_CMD_LINE% - > m %BOARD_PKG%\Acpi\BoardAcpiDxe\Dsdt.inf -y %PRE_BUILD_REPORT% -- > log=%PRE_BUILD_LOG% %BINARY_CACHE_CMD_LINE% > if %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL% > > @REM PSYS == FIX0 > -- > 2.17.1.windows.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40431): https://edk2.groups.io/g/devel/message/40431 Mute This Topic: https://groups.io/mt/31551303/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH 2/2] PurleyOpenBoardPkg/BoardMtOlympus: Extend build to support Binary Cache
Reviewed-by: Chasel Chiu > -Original Message- > From: Shi, Steven > Sent: Thursday, May 9, 2019 11:21 AM > To: devel@edk2.groups.io > Cc: Chiu, Chasel ; Lu, Shifei A > ; > Gao, Liming ; Bi, Dandan ; > Kubacki, Michael A > Subject: [PATCH 2/2] PurleyOpenBoardPkg/BoardMtOlympus: Extend build to > support Binary Cache > > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1785 > > Extend the options in the Purley build batch file to support Binary Cache > produce > and consume switch. > --- > .../PurleyOpenBoardPkg/BoardMtOlympus/bld.bat | 18 > -- > .../BoardMtOlympus/prebuild.bat| 4 ++-- > 2 files changed, 18 insertions(+), 4 deletions(-) > > diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/bld.bat > b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/bld.bat > index a66d19e66e..eda749af36 100644 > --- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/bld.bat > +++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/bld.bat > @@ -16,6 +16,11 @@ REM Run setlocal to take a snapshot of the environment > variables. endlocal is c setlocal set SCRIPT_ERROR=0 > > +@if not defined BINARY_CACHE_PATH ( > + echo Info: BINARY_CACHE_PATH is empty, use BinCache as default > + SET BINARY_CACHE_PATH=BinCache > +) > + > REM Do NOT use :: for comments Inside of code blocks() > > ::** > > @@ -34,6 +39,15 @@ if /I "%1"=="clean" ( >goto :EOF > ) > > +if /I "%1"=="cache-produce" ( > + set BINARY_CACHE_CMD_LINE= --hash > +--binary-destination=%BINARY_CACHE_PATH% > +) > + > +if /I "%1"=="cache-consume" ( > + set BINARY_CACHE_CMD_LINE= --hash > --binary-source=%BINARY_CACHE_PATH% > +) > + > + > shift > GOTO :parseCmdLine > > @@ -92,8 +106,8 @@ echo Build Start > echo. > echo > echo. > -echo build %BUILD_CMD_LINE% --log=%BUILD_LOG% > %BUILD_REPORT_FLAGS% -call build %BUILD_CMD_LINE% > --log=%BUILD_LOG% %BUILD_REPORT_FLAGS% > +echo build %BUILD_CMD_LINE% --log=%BUILD_LOG% > %BUILD_REPORT_FLAGS% > +%BINARY_CACHE_CMD_LINE% call build %BUILD_CMD_LINE% > --log=%BUILD_LOG% > +%BUILD_REPORT_FLAGS% %BINARY_CACHE_CMD_LINE% > echo > echo. > echo Build End > diff --git > a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat > b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat > index 81a9634d51..880e6417ac 100644 > --- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat > +++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat > @@ -188,8 +188,8 @@ set PRE_BUILD_CMD_LINE=%BUILD_CMD_LINE% -D > MAX_SOCKET=%MAX_SOCKET% set > PRE_BUILD_LOG=%WORKSPACE%\Build\prebuild.log > set PRE_BUILD_REPORT=%WORKSPACE%\Build\preBuildReport.txt > > -echo build %PRE_BUILD_CMD_LINE% -m > %BOARD_PKG%\Acpi\BoardAcpiDxe\Dsdt.inf -y %PRE_BUILD_REPORT% > --log=%PRE_BUILD_LOG% -call build %PRE_BUILD_CMD_LINE% -m > %BOARD_PKG%\Acpi\BoardAcpiDxe\Dsdt.inf -y %PRE_BUILD_REPORT% > --log=%PRE_BUILD_LOG% > +echo build %PRE_BUILD_CMD_LINE% -m > +%BOARD_PKG%\Acpi\BoardAcpiDxe\Dsdt.inf -y %PRE_BUILD_REPORT% > +--log=%PRE_BUILD_LOG% %BINARY_CACHE_CMD_LINE% call build > +%PRE_BUILD_CMD_LINE% -m %BOARD_PKG%\Acpi\BoardAcpiDxe\Dsdt.inf -y > +%PRE_BUILD_REPORT% --log=%PRE_BUILD_LOG% > %BINARY_CACHE_CMD_LINE% > if %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL% > > @REM PSYS == FIX0 > -- > 2.17.1.windows.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40409): https://edk2.groups.io/g/devel/message/40409 Mute This Topic: https://groups.io/mt/31551303/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [PATCH 2/2] PurleyOpenBoardPkg/BoardMtOlympus: Extend build to support Binary Cache
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1785 Extend the options in the Purley build batch file to support Binary Cache produce and consume switch. --- .../PurleyOpenBoardPkg/BoardMtOlympus/bld.bat | 18 -- .../BoardMtOlympus/prebuild.bat| 4 ++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/bld.bat b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/bld.bat index a66d19e66e..eda749af36 100644 --- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/bld.bat +++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/bld.bat @@ -16,6 +16,11 @@ REM Run setlocal to take a snapshot of the environment variables. endlocal is c setlocal set SCRIPT_ERROR=0 +@if not defined BINARY_CACHE_PATH ( + echo Info: BINARY_CACHE_PATH is empty, use BinCache as default + SET BINARY_CACHE_PATH=BinCache +) + REM Do NOT use :: for comments Inside of code blocks() ::** @@ -34,6 +39,15 @@ if /I "%1"=="clean" ( goto :EOF ) +if /I "%1"=="cache-produce" ( + set BINARY_CACHE_CMD_LINE= --hash --binary-destination=%BINARY_CACHE_PATH% +) + +if /I "%1"=="cache-consume" ( + set BINARY_CACHE_CMD_LINE= --hash --binary-source=%BINARY_CACHE_PATH% +) + + shift GOTO :parseCmdLine @@ -92,8 +106,8 @@ echo Build Start echo. echo echo. -echo build %BUILD_CMD_LINE% --log=%BUILD_LOG% %BUILD_REPORT_FLAGS% -call build %BUILD_CMD_LINE% --log=%BUILD_LOG% %BUILD_REPORT_FLAGS% +echo build %BUILD_CMD_LINE% --log=%BUILD_LOG% %BUILD_REPORT_FLAGS% %BINARY_CACHE_CMD_LINE% +call build %BUILD_CMD_LINE% --log=%BUILD_LOG% %BUILD_REPORT_FLAGS% %BINARY_CACHE_CMD_LINE% echo echo. echo Build End diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat index 81a9634d51..880e6417ac 100644 --- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat +++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/prebuild.bat @@ -188,8 +188,8 @@ set PRE_BUILD_CMD_LINE=%BUILD_CMD_LINE% -D MAX_SOCKET=%MAX_SOCKET% set PRE_BUILD_LOG=%WORKSPACE%\Build\prebuild.log set PRE_BUILD_REPORT=%WORKSPACE%\Build\preBuildReport.txt -echo build %PRE_BUILD_CMD_LINE% -m %BOARD_PKG%\Acpi\BoardAcpiDxe\Dsdt.inf -y %PRE_BUILD_REPORT% --log=%PRE_BUILD_LOG% -call build %PRE_BUILD_CMD_LINE% -m %BOARD_PKG%\Acpi\BoardAcpiDxe\Dsdt.inf -y %PRE_BUILD_REPORT% --log=%PRE_BUILD_LOG% +echo build %PRE_BUILD_CMD_LINE% -m %BOARD_PKG%\Acpi\BoardAcpiDxe\Dsdt.inf -y %PRE_BUILD_REPORT% --log=%PRE_BUILD_LOG% %BINARY_CACHE_CMD_LINE% +call build %PRE_BUILD_CMD_LINE% -m %BOARD_PKG%\Acpi\BoardAcpiDxe\Dsdt.inf -y %PRE_BUILD_REPORT% --log=%PRE_BUILD_LOG% %BINARY_CACHE_CMD_LINE% if %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL% @REM PSYS == FIX0 -- 2.17.1.windows.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40233): https://edk2.groups.io/g/devel/message/40233 Mute This Topic: https://groups.io/mt/31551303/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
