X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Tools%2FSource%2FGenBuild%2Forg%2Ftianocore%2Fbuild%2Ffpd%2FFpdParserTask.java;h=b61ad065f137e6b6b5fd1cf6f293f0b2d173ce58;hb=de4bb9f6edc1db82e0616b24e6685b27d2b66061;hp=ffbd919a728e3328760b2e20385998dd2ac52a3d;hpb=c64af698a3b8f8967b0c60b906eabc01b8f19ada;p=mirror_edk2.git

diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
index ffbd919a72..b61ad065f1 100644
--- a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
@@ -139,7 +139,7 @@ public class FpdParserTask extends Task {
             if (platformName == null) {
                 throw new BuildException("FpdParserTask parameter error. Please specify platform name or FPD file. ");
             }
-            platformId = GlobalData.getPlatform(platformName);
+            platformId = GlobalData.getPlatformByName(platformName);
             fpdFile = platformId.getFpdFile();
         }
         
@@ -147,20 +147,6 @@ public class FpdParserTask extends Task {
         // Parse FPD file
         //
         parseFpdFile();
-
-        getProject().setProperty("PLATFORM", platformId.getName());
-        getProject().setProperty("PLATFORM_DIR", platformId.getFpdFile().getParent().replaceAll("(\\\\)", "/"));
-        getProject().setProperty("PLATFORM_RELATIVE_DIR", platformId.getPlatformRelativeDir().replaceAll("(\\\\)", "/"));
-
-        //
-        // Pcd Collection. Call CollectPCDAction to collect pcd info.
-        //
-        try {
-            CollectPCDAction ca = new CollectPCDAction();
-            ca.perform(GlobalData.getWorkspacePath(),platformId.getFpdFile().getPath(),ActionMessage.NULL_MESSAGE_LEVEL);
-        } catch (Exception e){
-            throw new BuildException(e.getMessage());
-        }
         
         //
         // Prepare BUILD_DIR
@@ -359,12 +345,16 @@ public class FpdParserTask extends Task {
             Map<String, XmlObject> map = new HashMap<String, XmlObject>();
             map.put("PlatformSurfaceArea", doc);
             SurfaceAreaQuery.setDoc(map);
-            
+            SurfaceAreaQuery.getFpdUserExtension();
             //
             // Initialize
             //
             platformId = SurfaceAreaQuery.getFpdHeader();
             platformId.setFpdFile(fpdFile);
+            getProject().setProperty("PLATFORM", platformId.getName());
+            getProject().setProperty("PLATFORM_FILE", platformId.getRelativeFpdFile().replaceAll("(\\\\)", "/"));
+            getProject().setProperty("PLATFORM_DIR", platformId.getFpdFile().getParent().replaceAll("(\\\\)", "/"));
+            getProject().setProperty("PLATFORM_RELATIVE_DIR", platformId.getPlatformRelativeDir().replaceAll("(\\\\)", "/"));
 
             //
             // Build mode. User-defined output dir. 
@@ -393,6 +383,16 @@ public class FpdParserTask extends Task {
             parseToolChainOptions();
 
             SurfaceAreaQuery.setDoc(map);
+            
+            //
+            // Pcd Collection. Call CollectPCDAction to collect pcd info.
+            //
+            try {
+                CollectPCDAction ca = new CollectPCDAction();
+                ca.perform(GlobalData.getWorkspacePath(),platformId.getFpdFile().getPath(),ActionMessage.NULL_MESSAGE_LEVEL);
+            } catch (Exception e){
+                throw new BuildException(e.getMessage());
+            }
         } catch (Exception e) {
             e.printStackTrace();
             throw new BuildException("Load FPD file [" + fpdFile.getPath() + "] error. \n" + e.getMessage());