Fix EDKT138. And add active_platform file info for stand alone module build.

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

diff --git a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
index 286fd69490d5b4bb46d42358552a9cf78e131f0c..c5c51bed6bc2164a49c0d3a674f9c71174a0a05a 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
@@ -153,6 +153,8 @@ public class FrameworkBuildTask extends Task{
         // Build every MSA files (SINGLE MODULE BUILD)\r
         //\r
         else if (buildFile.getName().endsWith(".msa")) {\r
+            File tmpFile = new File(GlobalData.getWorkspacePath() + File.separatorChar + activePlatform);\r
+            System.out.println("Using FPD file [" + tmpFile.getPath() + "] as active platform. ");\r
             System.out.println("Start to build MSA file [" + buildFile.getPath() + "] ..>> ");\r
             GenBuildTask genBuildTask = new GenBuildTask();\r
             genBuildTask.setSingleModuleBuild(true);\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
index 73db7de4f43a6c0e1afd6ebbb96b28e79af48198..c85cda83e2ba662d705faa5798775dc0622a33d8 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
@@ -500,6 +500,9 @@ public class FpdParserTask extends Task {
       @param moduleName current module identification\r
     **/\r
     private void updateFvs(String fvSequence, String fvName, FpdModuleIdentification fpdModuleId) {\r
+        if (fvName == null || fvName.trim().length() == 0) {\r
+            fvName = "NULL";\r
+        }\r
         String upcaseFvName = fvName.toUpperCase();\r
         String[] fvNameArray = upcaseFvName.split("[, \t]+");\r
         for (int i = 0; i < fvNameArray.length; i++) {\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java b/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java
index 19725167c555a342a5480f7cc51c2098c54054c3..101e14f0080b7dfdd55fb321df51c1c5aa9ab925 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/GlobalData.java
@@ -26,13 +26,11 @@ import java.util.Set;
 import java.util.logging.Logger;\r
 \r
 import org.apache.tools.ant.BuildException;\r
-import org.apache.tools.ant.Project;\r
 import org.apache.xmlbeans.XmlObject;\r
 import org.tianocore.DbPathAndFilename;\r
 import org.tianocore.FrameworkDatabaseDocument;\r
 import org.tianocore.ModuleSurfaceAreaDocument;\r
 import org.tianocore.ModuleSurfaceAreaDocument.ModuleSurfaceArea;\r
-import org.tianocore.PcdBuildDefinitionDocument;\r
 import org.tianocore.build.id.FpdModuleIdentification;\r
 import org.tianocore.build.id.ModuleIdentification;\r
 import org.tianocore.build.id.PackageIdentification;\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java b/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
index 0dcc80c92620d5228a5f02e94b6d8421906c0f3e..f795e1e5212d583d6611bcb9f0eb28684324ae11 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/SurfaceAreaQuery.java
@@ -1924,9 +1924,6 @@ public class SurfaceAreaQuery {
     }\r
 \r
        public static boolean isHaveTianoR8FlashMap(){\r
-        PcdCodedDocument.PcdCoded.PcdEntry[] pcdEntries  = null;\r
-        String[]            results;\r
-        int                 index;\r
         String[]            xPath       = new String[] {"/"};\r
         Object[]         returns     = get ("Externs", xPath);\r
 \r