Fixed EDKT484 and rewrite the output message when no arch is found.

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

1 files changed, 5 insertions, 5 deletions

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java b/Tools/Java/Source/GenBuild/org/tianocore/build/GenBuildTask.java
index 79eeb2757f..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++) {

@@ -429,7 +429,7 @@ public class GenBuildTask extends Ant {
         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.length() - 3));

+            + File.separatorChar + msaFileName.substring(0, msaFileName.lastIndexOf('.')));

 

         //

         // SUBSYSTEM