Fixed EDKT482. Added support for multiple msa files in the same directory.

[mirror_edk2.git] / Tools / Java / Source / GenBuild / org / tianocore / build / GenBuildTask.java

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
index 389b8f12b1006d3751c74da1d7b0177f6d855097..249ca8328dc84730a18a06fd70b0d5e32ffd5a74 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
@@ -253,6 +253,10 @@ public class GenBuildTask extends Ant {
             }\r
         }\r
 \r
+        if (archList.length == 0) {\r
+            EdkLog.log(this, EdkLog.EDK_WARNING, "Warning: " + moduleId + " was not found in current platform FPD file!\n");\r
+        }\r
+\r
         for (int k = 0; k < archList.length; k++) {\r
 \r
             getProject().setProperty("ARCH", archList[k]);\r
@@ -422,7 +426,7 @@ public class GenBuildTask extends Ant {
         getProject().setProperty("VERSION", moduleId.getVersion());\r
         getProject().setProperty("MODULE_TYPE", moduleId.getModuleType());\r
         getProject().setProperty("MODULE_DIR", moduleId.getMsaFile().getParent().replaceAll("(\\\\)", "/"));\r
-        getProject().setProperty("MODULE_RELATIVE_DIR", moduleId.getModuleRelativePath().replaceAll("(\\\\)", "/"));\r
+        getProject().setProperty("MODULE_RELATIVE_DIR", moduleId.getModuleRelativePath().replaceAll("(\\\\)", "/") + File.separatorChar + moduleId.getName());\r
 \r
         //\r
         // SUBSYSTEM\r