X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FJava%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2FGenBuildTask.java;h=9d7eb6d09403842ee19d66794b1ba8ec08b9eb51;hp=249ca8328dc84730a18a06fd70b0d5e32ffd5a74;hb=bc022470e469566d807cf39b9e03cccc3b7e8685;hpb=c340a28e277f524698ff42ce631f277583772b65

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
index 249ca8328d..9d7eb6d094 100644
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
@@ -226,9 +226,9 @@ public class GenBuildTask extends Ant {
         }
 
         Set<String> archSet = new LinkedHashSet<String>();
-
-        if ( getProject().getProperty("ARCH") != null) {
-            String[] fpdArchList = getProject().getProperty("ARCH").split(" ");
+        String archString = getProject().getProperty("ARCH");
+        if (archString != null) {
+            String[] fpdArchList = archString.split(" ");
 
             for (int i = 0; i < fpdArchList.length; i++) {
                 if (archListSupByToolChain.contains(fpdArchList[i])) {
@@ -254,7 +254,7 @@ public class GenBuildTask extends Ant {
         }
 
         if (archList.length == 0) {
-            EdkLog.log(this, EdkLog.EDK_WARNING, "Warning: " + moduleId + " was not found in current platform FPD file!\n");
+            EdkLog.log(this, EdkLog.EDK_WARNING, "Warning: " + "[" + archString + "] is not supported for " + moduleId + " in this build!\n");
         }
 
         for (int k = 0; k < archList.length; k++) {
@@ -425,8 +425,11 @@ public class GenBuildTask extends Ant {
         getProject().setProperty("FILE_GUID", moduleId.getGuid());
         getProject().setProperty("VERSION", moduleId.getVersion());
         getProject().setProperty("MODULE_TYPE", moduleId.getModuleType());
-        getProject().setProperty("MODULE_DIR", moduleId.getMsaFile().getParent().replaceAll("(\\\\)", "/"));
-        getProject().setProperty("MODULE_RELATIVE_DIR", moduleId.getModuleRelativePath().replaceAll("(\\\\)", "/") + File.separatorChar + moduleId.getName());
+        File msaFile = moduleId.getMsaFile();
+        String msaFileName = msaFile.getName();
+        getProject().setProperty("MODULE_DIR", msaFile.getParent().replaceAll("(\\\\)", "/"));
+        getProject().setProperty("MODULE_RELATIVE_DIR", moduleId.getModuleRelativePath().replaceAll("(\\\\)", "/") 
+            + File.separatorChar + msaFileName.substring(0, msaFileName.lastIndexOf('.')));
 
         //
         // SUBSYSTEM