Add dependency for RealAsm file build rules and Use the module name in place of macro...

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

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.c b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.c
index 3d4be68f53c92eb7db979ed8aa616cd245826fc8..05a2eebae307e5e8295443bc0223c7ee16f2d1df 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.c
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.c
@@ -651,7 +651,7 @@ Returns:
       //\r
       // Initialize strings to HII database\r
       //\r
-      PackageList = PreparePackages (1, &gEfiProcessorProducerGuid, STRING_ARRAY_NAME);\r
+      PackageList = PreparePackages (1, &gEfiProcessorProducerGuid, CpuStrings);\r
 \r
       Status      = Hii->NewPack (Hii, PackageList, &StringHandle);\r
       ASSERT (!EFI_ERROR (Status));\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/CpuDriver.h b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/CpuDriver.h
index e5b952f938b921aa53fca3820179e8edea84e8c5..c9f04e1ea1b72fa927b8baaa6067090e77b7e6ee 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/CpuDriver.h
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/CpuDriver.h
@@ -24,7 +24,7 @@ Abstract:
 \r
 \r
 \r
-extern UINT8  STRING_ARRAY_NAME[];\r
+extern UINT8  CpuStrings[];\r
 \r
 //\r
 // Internal Data Structures\r

diff --git a/Tools/Conf/BuildMacro.xml b/Tools/Conf/BuildMacro.xml
index 0442b05b9d228d3b62e3e961ec674648df291f16..a673d00a22c5f98fe49753a2427eabd13568d2d4 100644 (file)
--- a/Tools/Conf/BuildMacro.xml
+++ b/Tools/Conf/BuildMacro.xml
@@ -785,14 +785,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <element name="EXTRA.ARG" optional="yes"/>\r
     \r
     <sequential>\r
-      <!-- Lack Dependency Check -->\r
-      <exec dir="${DEST_DIR_OUTPUT}" executable="${ASM}" failonerror="true">\r
-        <arg line="/nologo /omf ${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT} /Bl${ASMLINK} ${ASMLINK_FLAGS}"/>\r
-      </exec>\r
-      <concat destfile="${DEST_DIR_OUTPUT}/@{FILENAME}.cat" binary="yes">\r
-        <filelist dir="${MODULE_DIR}" files="Blank2.pad"/>\r
-        <filelist dir="${DEST_DIR_OUTPUT}" files="@{FILENAME}.com"/>\r
-      </concat>\r
+      <OnDependency>\r
+        <sourcefiles>\r
+          <file name="${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT}"/>\r
+        </sourcefiles>\r
+        <targetfiles>\r
+          <file name="${DEST_DIR_OUTPUT}/@{FILENAME}.cat"/>\r
+        </targetfiles>\r
+  \r
+        <sequential>\r
+          <exec dir="${DEST_DIR_OUTPUT}" executable="${ASM}" failonerror="true">\r
+            <arg line="/nologo /omf ${MODULE_DIR}/@{FILEPATH}/@{FILENAME}.@{FILEEXT} /Bl${ASMLINK} ${ASMLINK_FLAGS}"/>\r
+          </exec>\r
+          <concat destfile="${DEST_DIR_OUTPUT}/@{FILENAME}.cat" binary="yes">\r
+            <filelist dir="${MODULE_DIR}" files="Blank2.pad"/>\r
+            <filelist dir="${DEST_DIR_OUTPUT}" files="@{FILENAME}.com"/>\r
+          </concat>\r
+        </sequential>\r
+      </OnDependency>\r
     </sequential>\r
   </macrodef>\r
 \r