Modify Autogen.jave to fixed bug: EDKT113.

Modify the COmmonDefinition .java to keep the order of EntryPoint function in autogen.c same with the <ModuleEntryPoint> in MSA.

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

diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
index e36945501b5a7806fb335424910843e9d408b8f3..3547808ccb50fe710d93512e93b56c4e4a759991 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
@@ -1990,14 +1990,12 @@ public class AutoGen {
                        //\r
                        Count = 0;\r
                        if (exitBootList != null) {\r
-                               if (setVirtualList != null) {\r
-                                       for (i = 0; i < exitBootList.length; i++) {\r
-                                               if (exitBootList[i].equalsIgnoreCase("")) {\r
-                                                       break;\r
-                                               }\r
+                               for (i = 0; i < exitBootList.length; i++) {\r
+                                       if (exitBootList[i].equalsIgnoreCase("")) {\r
+                                               break;\r
                                        }\r
-                                       Count = i;\r
                                }\r
+                               Count = i;\r
                        }\r
                        fileBuffer.append(Integer.toString(Count));\r
                        fileBuffer.append(";\r\n\r\n");\r

diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java
index 5f83e4d9dff33e3bc976925daea03ecbbd53b5a6..c6bf678e0b34e84d1cda7b8dc3e830d2d381e84b 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/autogen/CommonDefinition.java
@@ -17,6 +17,7 @@ package org.tianocore.build.autogen;
 \r
 import java.util.HashSet;\r
 import java.util.Iterator;\r
+import java.util.LinkedHashSet;\r
 import java.util.Set;\r
 \r
 /**\r
@@ -332,7 +333,7 @@ public class CommonDefinition {
      * @return String[] String list which remove the duplicate string.\r
      */\r
     public static String[] remDupString (String[] orgList){\r
-        Set<String> strList = new HashSet<String>();\r
+        Set<String> strList = new LinkedHashSet<String>();\r
         String[] desList ;\r
         if (orgList == null){\r
             return new String[0];\r