Clean up for debug message of PCD tools.

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

diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
index 5d829c9f2258d4341a7752a6528c9b6ac235a7f3..3788d239c735667334deb243d0a3fbbc12aa1c84 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
@@ -152,10 +152,8 @@ public class FpdParserTask extends Task {
         // Pcd Collection. Call CollectPCDAction to collect pcd info.\r
         //\r
         try {\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
             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
         } catch (Exception e){\r
             throw new BuildException(e.getMessage());\r
         }\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java
index 8c91b2fe16372b64e9a6612d6ae0cb793770809c..37f74713d6a8241348049a3a3b9837d46f62c565 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/CollectPCDAction.java
@@ -2037,28 +2037,13 @@ public class CollectPCDAction {
 \r
         }\r
 \r
 \r
         }\r
 \r

-        //map.put("FrameworkPlatformDescription", fpdDocInstance);\r
-        //SurfaceAreaQuery.setDoc(map); \r

         Map<FpdModuleIdentification,XmlObject>pcdBuildDef = GlobalData.getFpdModuleSaXmlObject(CollectPCDAction.xmlObjectName);\r
         Set<FpdModuleIdentification> pcdBuildKeySet = pcdBuildDef.keySet();\r
         Iterator item = pcdBuildKeySet.iterator();\r
         while (item.hasNext()){\r
         Map<FpdModuleIdentification,XmlObject>pcdBuildDef = GlobalData.getFpdModuleSaXmlObject(CollectPCDAction.xmlObjectName);\r
         Set<FpdModuleIdentification> pcdBuildKeySet = pcdBuildDef.keySet();\r
         Iterator item = pcdBuildKeySet.iterator();\r
         while (item.hasNext()){\r

-               FpdModuleIdentification id = (FpdModuleIdentification)item.next();\r
-            try {\r
-                allModules.add(new ModuleInfo(id, id.getModule().getModuleType(),pcdBuildDef.get(id)));    \r
-            } catch (Exception e){\r
-                System.out.println(e.getMessage());\r
-                //EdkLog.log(EdkLog.EDK_INFO,e.getMessage());\r
-            }\r
-               \r
-               \r
-        }\r
-//        //modules = SurfaceAreaQuery.getFpdModuleSAs();\r
-//        for (index = 0; index < modules.length; index ++) {\r
-//            //SurfaceAreaQuery.setDoc(GlobalData.getDoc(modules[index].getModuleName()));\r
-//            allModules.add(new ModuleInfo(modules[index], \r
-//                                          ModuleTypeDef.Enum.forString(SurfaceAreaQuery.getModuleType())));\r
-//        }\r
+            FpdModuleIdentification id = (FpdModuleIdentification)item.next();\r
+            allModules.add(new ModuleInfo(id, id.getModule().getModuleType(),pcdBuildDef.get(id)));    \r
+        }\r

         \r
         return allModules;\r
     }\r
         \r
         return allModules;\r
     }\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java
index 7365345c39c131b1da72f9404060bc5cf5b16f01..f567cccc671c13cf7e62b6f8347f0ca2926a86c7 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/pcd/action/PCDAutoGenAction.java
@@ -223,21 +223,14 @@ public class PCDAutoGenAction extends BuildAction {
       hAutoGenString  = "";\r
       cAutoGenString  = "";\r
       try {\r
       hAutoGenString  = "";\r
       cAutoGenString  = "";\r
       try {\r

-      setModuleName(moduleName);\r
-      setModuleGuid(translateSchemaStringToUUID(moduleGuidString));\r
-      setPackageName(packageName);\r
-      setPackageGuid(translateSchemaStringToUUID(packageGuidString));\r
-      setPcdNameArray(pcdNameArray);\r
-      setArch(arch);\r
-      setVersion(version);\r
-      setIsBuildUsedLibrary(isBuildUsedLibrary);\r
-      \r
-      if (isBuildUsedLibrary) {\r
-          System.out.println("Build for library");\r
-          for (int index = 0; index < pcdNameArray.length; index ++) {\r
-              System.out.println(pcdNameArray[index]);\r
-          }\r
-      }\r
+          setModuleName(moduleName);\r
+          setModuleGuid(translateSchemaStringToUUID(moduleGuidString));\r
+          setPackageName(packageName);\r
+          setPackageGuid(translateSchemaStringToUUID(packageGuidString));\r
+          setPcdNameArray(pcdNameArray);\r
+          setArch(arch);\r
+          setVersion(version);\r
+          setIsBuildUsedLibrary(isBuildUsedLibrary);\r

       } catch (EntityException e){\r
          throw new BuildActionException(e.getMessage());\r
       }\r
       } catch (EntityException e){\r
          throw new BuildActionException(e.getMessage());\r
       }\r


@@ -400,14 +393,12 @@ private UUID translateSchemaStringToUUID(String uuidString)
             dbManager.UsageInstanceContext = usageInstanceArray;\r
             dbManager.CurrentModuleName    = moduleName; \r
         } else {\r
             dbManager.UsageInstanceContext = usageInstanceArray;\r
             dbManager.CurrentModuleName    = moduleName; \r
         } else {\r

-            System.out.println(String.format("Generate %s 's library", dbManager.CurrentModuleName));\r

             usageContext = dbManager.UsageInstanceContext;\r
             //\r
             // For building MDE package, although all module are library, but PCD entries of \r
             // these library should be used to autogen.\r
             // \r
             if (usageContext == null) {\r
             usageContext = dbManager.UsageInstanceContext;\r
             //\r
             // For building MDE package, although all module are library, but PCD entries of \r
             // these library should be used to autogen.\r
             // \r
             if (usageContext == null) {\r

-                System.out.println("context is null");\r

                 usageInstanceArray  = dbManager.getUsageInstanceArrayByModuleName(moduleName,\r
                                                                                   moduleGuid,\r
                                                                                   packageName,\r
                 usageInstanceArray  = dbManager.getUsageInstanceArrayByModuleName(moduleName,\r
                                                                                   moduleGuid,\r
                                                                                   packageName,\r


@@ -416,7 +407,6 @@ private UUID translateSchemaStringToUUID(String uuidString)
                                                                                   version);\r
             } else {\r
                 usageInstanceArray = new ArrayList<UsageInstance>();\r
                                                                                   version);\r
             } else {\r
                 usageInstanceArray = new ArrayList<UsageInstance>();\r

-                System.out.println("context is not null!");\r

                 //\r
                 // Remove PCD entries which are not belong to this library.\r
                 // \r
                 //\r
                 // Remove PCD entries which are not belong to this library.\r
                 // \r


@@ -427,7 +417,6 @@ private UUID translateSchemaStringToUUID(String uuidString)
 \r
                     for (index2 = 0; index2 < pcdNameArray.length; index2 ++) {\r
                         if (pcdNameArray[index2].equalsIgnoreCase(usageContext.get(index).parentToken.cName)) {\r
 \r
                     for (index2 = 0; index2 < pcdNameArray.length; index2 ++) {\r
                         if (pcdNameArray[index2].equalsIgnoreCase(usageContext.get(index).parentToken.cName)) {\r

-                            System.out.println("Found! for PCD entry " + pcdNameArray[index2]);\r

                             usageInstanceArray.add(usageContext.get(index));\r
                             break;\r
                         }\r
                             usageInstanceArray.add(usageContext.get(index));\r
                             break;\r
                         }\r