a) Fixed the issue that the unnecessary build for not specified ARCH in single module build

b) Fixed the issue that mixed case of FV name will cause invalid inf file generation
c) Fixed the issue that not specified outputDir will cause tool (flashmap, efirom) cannot be launched 


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

1 files changed, 4 insertions, 5 deletions

diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
index c85cda8..39d4d6f 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
@@ -220,9 +220,9 @@ public class FpdParserTask extends Task {
                 getProject().setProperty(globalVariables[j][0], globalVariables[j][1]);

             }

 

-            getProject().setProperty("FV_FILENAME", validFv[i].toUpperCase());

+            getProject().setProperty("FV_FILENAME", validFv[i]);

             

-            File fvFile = new File(getProject().replaceProperties( getProject().getProperty("FV_DIR") + File.separatorChar + validFv[i].toUpperCase() + ".inf"));

+            File fvFile = new File(getProject().replaceProperties( getProject().getProperty("FV_DIR") + File.separatorChar + validFv[i] + ".inf"));

             fvFile.getParentFile().mkdirs();

 

             try {

@@ -295,7 +295,7 @@ public class FpdParserTask extends Task {
                 //

                 // Files

                 //

-                Set<FpdModuleIdentification> filesSet = fvs.get(validFv[i].toUpperCase());

+                Set<FpdModuleIdentification> filesSet = fvs.get(validFv[i]);

                 if (filesSet != null) {

                     FpdModuleIdentification[] files = filesSet.toArray(new FpdModuleIdentification[filesSet.size()]);

                     bw.write("[files]");

@@ -503,8 +503,7 @@ public class FpdParserTask extends Task {
         if (fvName == null || fvName.trim().length() == 0) {

             fvName = "NULL";

         }

-        String upcaseFvName = fvName.toUpperCase();

-        String[] fvNameArray = upcaseFvName.split("[, \t]+");

+        String[] fvNameArray = fvName.split("[, \t]+");

         for (int i = 0; i < fvNameArray.length; i++) {

             //

             // Put module to corresponding fvName