Move ant-related code from ParserFpd function to enable single module debug for PCD...

[mirror_edk2.git] / Tools / Source / GenBuild / org / tianocore / build / fpd / FpdParserTask.java

diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
index 5d829c9f2258d4341a7752a6528c9b6ac235a7f3..ffbd919a728e3328760b2e20385998dd2ac52a3d 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
@@ -147,15 +147,17 @@ public class FpdParserTask extends Task {
         // Parse FPD file\r
         //\r
         parseFpdFile();\r
-        \r
+\r
+        getProject().setProperty("PLATFORM", platformId.getName());\r
+        getProject().setProperty("PLATFORM_DIR", platformId.getFpdFile().getParent().replaceAll("(\\\\)", "/"));\r
+        getProject().setProperty("PLATFORM_RELATIVE_DIR", platformId.getPlatformRelativeDir().replaceAll("(\\\\)", "/"));\r
+\r
         //\r
         // Pcd Collection. Call CollectPCDAction to collect pcd info.\r
         //\r
         try {\r
-            System.out.println("Begin PCD collecttion!");\r
             CollectPCDAction ca = new CollectPCDAction();\r
             ca.perform(GlobalData.getWorkspacePath(),platformId.getFpdFile().getPath(),ActionMessage.NULL_MESSAGE_LEVEL);\r
-            System.out.println("End PCD collection!"); \r
         } catch (Exception e){\r
             throw new BuildException(e.getMessage());\r
         }\r
@@ -363,9 +365,6 @@ public class FpdParserTask extends Task {
             //\r
             platformId = SurfaceAreaQuery.getFpdHeader();\r
             platformId.setFpdFile(fpdFile);\r
-            getProject().setProperty("PLATFORM", platformId.getName());\r
-            getProject().setProperty("PLATFORM_DIR", platformId.getFpdFile().getParent().replaceAll("(\\\\)", "/"));\r
-            getProject().setProperty("PLATFORM_RELATIVE_DIR", platformId.getPlatformRelativeDir().replaceAll("(\\\\)", "/"));\r
 \r
             //\r
             // Build mode. User-defined output dir. \r