- Fixed EDKT240. Now the Blank.pad file for alignment purpose will no longer be needed.

- Fixed EDKT366. For NT32, using "build run" to launch the NT32 emulator. The run.cmd is still be generated in the ${TARGET_DIR}

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2305 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 20 insertions, 17 deletions

diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index f4a6563..5c81986 100644
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -7916,26 +7916,29 @@
     <concat destfile="${FV_DIR}/FV_RECOVERY.fd" binary="true" force="no">

       <fileset dir="${FV_DIR}" includes="*.fv"/>

     </concat>

-    <!--Generate Run.cmd file. This file will call SecMain.exe to start shell.-->

     <pathconvert property="SecMainPath" targetos="windows">

       <path path="${TARGET_DIR}/IA32"/>

     </pathconvert>

-    <echo file="${BUILD_DIR}/run.cmd">@REM
-      @REM Copyright (c) 2006, Intel Corporation
-      @REM All rights reserved. This program and the accompanying materials
-      @REM are licensed and made available under the terms and conditions of the BSD License
-      @REM which accompanies this distribution.  The full text of the license may be found at
-      @REM http://opensource.org/licenses/bsd-license.php
-      @REM 
-      @REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      @REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-      @REM 
-      
-      @echo off 
-      pushd . 
-      cd ${SecMainPath}
-      SecMain.exe
-      popd
+    <echo file="${TARGET_DIR}/run.cmd">@REM

+      @REM Copyright (c) 2006, Intel Corporation

+      @REM All rights reserved. This program and the accompanying materials

+      @REM are licensed and made available under the terms and conditions of the BSD License

+      @REM which accompanies this distribution.  The full text of the license may be found at

+      @REM http://opensource.org/licenses/bsd-license.php

+      @REM 

+      @REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+      @REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+      @REM 

+      

+      @echo off 

+      pushd . 

+      cd ${SecMainPath}

+      SecMain.exe

+      popd

       @echo on</echo>

   </UserExtensions>

+  <UserExtensions UserID="TianoCore" Identifier="run">

+    <!-- execute the NT32 simulator -->

+    <exec executable="${TARGET_DIR}/IA32/SecMain.exe" dir="${TARGET_DIR}/IA32" spawn="false"/>

+  </UserExtensions>

 </PlatformSurfaceArea>
\ No newline at end of file