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

3 files changed, 11 insertions, 39 deletions

diff --git a/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java b/Tools/Source/GenBuild/org/tianocore/build/fpd/FpdParserTask.java
index 5d829c9f22..3788d239c7 100644
--- 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.

         //

         try {

-            System.out.println("Begin PCD collecttion!");

             CollectPCDAction ca = new CollectPCDAction();

             ca.perform(GlobalData.getWorkspacePath(),platformId.getFpdFile().getPath(),ActionMessage.NULL_MESSAGE_LEVEL);

-            System.out.println("End PCD collection!"); 

         } catch (Exception e){

             throw new BuildException(e.getMessage());

         }

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 8c91b2fe16..37f74713d6 100644
--- 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 {
 

         }

 

-        //map.put("FrameworkPlatformDescription", fpdDocInstance);

-        //SurfaceAreaQuery.setDoc(map); 

         Map<FpdModuleIdentification,XmlObject>pcdBuildDef = GlobalData.getFpdModuleSaXmlObject(CollectPCDAction.xmlObjectName);

         Set<FpdModuleIdentification> pcdBuildKeySet = pcdBuildDef.keySet();

         Iterator item = pcdBuildKeySet.iterator();

         while (item.hasNext()){

-        	FpdModuleIdentification id = (FpdModuleIdentification)item.next();

-            try {

-                allModules.add(new ModuleInfo(id, id.getModule().getModuleType(),pcdBuildDef.get(id)));    

-            } catch (Exception e){

-                System.out.println(e.getMessage());

-                //EdkLog.log(EdkLog.EDK_INFO,e.getMessage());

-            }

-        	

-        	

-        }

-//        //modules = SurfaceAreaQuery.getFpdModuleSAs();

-//        for (index = 0; index < modules.length; index ++) {

-//            //SurfaceAreaQuery.setDoc(GlobalData.getDoc(modules[index].getModuleName()));

-//            allModules.add(new ModuleInfo(modules[index], 

-//                                          ModuleTypeDef.Enum.forString(SurfaceAreaQuery.getModuleType())));

-//        }

+            FpdModuleIdentification id = (FpdModuleIdentification)item.next();

+            allModules.add(new ModuleInfo(id, id.getModule().getModuleType(),pcdBuildDef.get(id)));    

+        }

         

         return allModules;

     }

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 7365345c39..f567cccc67 100644
--- 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  = "";

       cAutoGenString  = "";

       try {

-      setModuleName(moduleName);

-      setModuleGuid(translateSchemaStringToUUID(moduleGuidString));

-      setPackageName(packageName);

-      setPackageGuid(translateSchemaStringToUUID(packageGuidString));

-      setPcdNameArray(pcdNameArray);

-      setArch(arch);

-      setVersion(version);

-      setIsBuildUsedLibrary(isBuildUsedLibrary);

-      

-      if (isBuildUsedLibrary) {

-          System.out.println("Build for library");

-          for (int index = 0; index < pcdNameArray.length; index ++) {

-              System.out.println(pcdNameArray[index]);

-          }

-      }

+          setModuleName(moduleName);

+          setModuleGuid(translateSchemaStringToUUID(moduleGuidString));

+          setPackageName(packageName);

+          setPackageGuid(translateSchemaStringToUUID(packageGuidString));

+          setPcdNameArray(pcdNameArray);

+          setArch(arch);

+          setVersion(version);

+          setIsBuildUsedLibrary(isBuildUsedLibrary);

       } catch (EntityException e){

     	  throw new BuildActionException(e.getMessage());

       }

@@ -400,14 +393,12 @@ private UUID translateSchemaStringToUUID(String uuidString)
             dbManager.UsageInstanceContext = usageInstanceArray;

             dbManager.CurrentModuleName    = moduleName; 

         } else {

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

             usageContext = dbManager.UsageInstanceContext;

             //

             // For building MDE package, although all module are library, but PCD entries of 

             // these library should be used to autogen.

             // 

             if (usageContext == null) {

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

                 usageInstanceArray  = dbManager.getUsageInstanceArrayByModuleName(moduleName,

                                                                                   moduleGuid,

                                                                                   packageName,

@@ -416,7 +407,6 @@ private UUID translateSchemaStringToUUID(String uuidString)
                                                                                   version);

             } else {

                 usageInstanceArray = new ArrayList<UsageInstance>();

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

                 //

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

                 // 

@@ -427,7 +417,6 @@ private UUID translateSchemaStringToUUID(String uuidString)
 

                     for (index2 = 0; index2 < pcdNameArray.length; index2 ++) {

                         if (pcdNameArray[index2].equalsIgnoreCase(usageContext.get(index).parentToken.cName)) {

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

                             usageInstanceArray.add(usageContext.get(index));

                             break;

                         }