V2: Remove nmake -f %BASE_TOOLS_PATH%\Makefile, since it
has been covered by edksetup.bat Rebuild option.

Since Nt32Pkg has been removed from edk2 repo, and
we will also remove the --nt32 flag in edksetup.bat.
So here update platform to pass build.

Cc: Shifei A Lu <shifei.a.lu@intel.com>
Cc: Xiaohu Zhou <bowen.zhou@intel.com>
Cc: Isaac W Oram <isaac.w.oram@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
---
 .../BoardMtOlympus/GitEdk2MinMtOlympus.bat                  | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/GitEdk2MinMtOlympus.bat b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/GitEdk2MinMtOlympus.bat
index 02ed458236..6b4e90294b 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/GitEdk2MinMtOlympus.bat
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/GitEdk2MinMtOlympus.bat
@@ -46,20 +46,16 @@ set EDK_TOOLS_BIN=%WORKSPACE%\edk2-BaseTools-win32
 
 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
+  set EDK_SETUP_OPTION=Rebuild
 )
 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%
 
 popd
-- 
2.18.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#42960): https://edk2.groups.io/g/devel/message/42960
Mute This Topic: https://groups.io/mt/32238555/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Dandan:
  Don't need to add version info in the commit log. And, please also remove pushd %WORKSPACE% & popd. They are not used after nmake is removed. With those changes, Reviewed-by: Liming Gao <liming.gao@intel.com>

Thanks
Liming
>-----Original Message-----
>From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of
>Dandan Bi
>Sent: Friday, June 28, 2019 10:55 AM
>To: devel@edk2.groups.io
>Cc: Lu, Shifei A <shifei.a.lu@intel.com>; Zhou, Bowen
><bowen.zhou@intel.com>; Oram, Isaac W <isaac.w.oram@intel.com>; Gao,
>Liming <liming.gao@intel.com>
>Subject: [edk2-devel] [edk2-platofrms] [patch v2]
>Platform/PurleyOpenBoardPkg: Remove --nt32 flag of edkseup
>
>V2: Remove nmake -f %BASE_TOOLS_PATH%\Makefile, since it
>has been covered by edksetup.bat Rebuild option.
>
>Since Nt32Pkg has been removed from edk2 repo, and
>we will also remove the --nt32 flag in edksetup.bat.
>So here update platform to pass build.
>
>Cc: Shifei A Lu <shifei.a.lu@intel.com>
>Cc: Xiaohu Zhou <bowen.zhou@intel.com>
>Cc: Isaac W Oram <isaac.w.oram@intel.com>
>Cc: Liming Gao <liming.gao@intel.com>
>Signed-off-by: Dandan Bi <dandan.bi@intel.com>
>---
> .../BoardMtOlympus/GitEdk2MinMtOlympus.bat                  | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
>diff --git
>a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/GitEdk2MinMtOly
>mpus.bat
>b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/GitEdk2MinMtOly
>mpus.bat
>index 02ed458236..6b4e90294b 100644
>---
>a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/GitEdk2MinMtOly
>mpus.bat
>+++
>b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/GitEdk2MinMtOly
>mpus.bat
>@@ -46,20 +46,16 @@ set EDK_TOOLS_BIN=%WORKSPACE%\edk2-
>BaseTools-win32
>
> 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
>+  set EDK_SETUP_OPTION=Rebuild
> )
> 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%
>
> popd
>--
>2.18.0.windows.1
>
>
>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#42961): https://edk2.groups.io/g/devel/message/42961
Mute This Topic: https://groups.io/mt/32238555/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-