From bc49e1314404cf67cd189ef056e49b75e5106aef Mon Sep 17 00:00:00 2001 From: Jiewen Yao Date: Sun, 11 Feb 2018 09:09:19 +0800 Subject: Enable tool source build. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jiewen Yao --- .../KabylakeRvp3/GitEdk2MinKabylake.bat | 23 ++++++++++++++++++++-- .../KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat | 4 ++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/GitEdk2MinKabylake.bat b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/GitEdk2MinKabylake.bat index ec14a53e80..4e13ed18e5 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/GitEdk2MinKabylake.bat +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/GitEdk2MinKabylake.bat @@ -43,8 +43,27 @@ if not exist %WORKSPACE%\Conf ( set PACKAGES_PATH=%WORKSPACE%\edk2-platforms\Platform\Intel;%WORKSPACE%\edk2-platforms\Silicon\Intel;%WORKSPACE%\edk2-non-osi\Silicon\Intel;%WORKSPACE%\FSP;%WORKSPACE%\edk2;%WORKSPACE% set EDK_TOOLS_BIN=%WORKSPACE%\edk2-BaseTools-win32 -@REM Call edksetup.bat in the edk2 repository. -call %WORKSPACE%\edk2\edksetup.bat +@if not defined PYTHON_HOME ( + @if exist C:\Python27 ( + set PYTHON_HOME=C:\Python27 + ) +) + +set EDK_SETUP_OPTION= +@rem if python is installed, disable the binary base tools. +if defined PYTHON_HOME ( + set EDK_TOOLS_BIN= + set EDK_SETUP_OPTION=--nt32 +) +pushd %WORKSPACE%\edk2 +call edksetup.bat %EDK_SETUP_OPTION% +popd +pushd %WORKSPACE% +@rem if python is installed, nmake BaseTools source and enable BaseTools source build +@if defined PYTHON_HOME ( + nmake -f %BASE_TOOLS_PATH%\Makefile +) +popd set openssl_path=%WORKSPACE% diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat index 5e7b7d6790..6b0918c5f5 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/bld.bat @@ -109,7 +109,7 @@ goto BUILD_FLAGS_LOOP @if %SILENT_MODE% EQU TRUE goto BldSilent -build -n %NUMBER_OF_PROCESSORS% %REBUILD_MODE% %EXT_BUILD_FLAGS% +call build -n %NUMBER_OF_PROCESSORS% %REBUILD_MODE% %EXT_BUILD_FLAGS% @if %ERRORLEVEL% NEQ 0 goto BldFail @echo. @@ -128,7 +128,7 @@ call %WORKSPACE_PLATFORM%\%PROJECT%\postbuild.bat %BUILD_ROM_ONLY% @echo ************************************************************************ >> Build.log @echo. >> Build.log -build -n %NUMBER_OF_PROCESSORS% %REBUILD_MODE% %EXT_BUILD_FLAGS% 1>>Build.log 2>&1 +call build -n %NUMBER_OF_PROCESSORS% %REBUILD_MODE% %EXT_BUILD_FLAGS% 1>>Build.log 2>&1 @if %ERRORLEVEL% NEQ 0 goto BldFail @echo. >> Build.log -- cgit v1.2.3