Fixed EDKT147, which will fail the single module build when a module is just defined...

[mirror_edk2.git] / Tools / Source / GenBuild / org / tianocore / build / autogen / AutoGen.java

diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
index 751438c27dc1ad40744d739f75fe74c2166c6990..366e0ac59d98de60400444fce8d63ceff549e82a 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
@@ -25,6 +25,7 @@ import java.io.FileWriter;
 import java.util.ArrayList;\r
 import java.util.HashSet;\r
 import java.util.Iterator;\r
+import java.util.LinkedHashSet;\r
 import java.util.LinkedList;\r
 import java.util.List;\r
 import java.util.Map;\r
@@ -659,7 +660,7 @@ public class AutoGen {
         */\r
        Set<String> LibraryClassToAutogenH(String[] libClassList)\r
                        throws AutoGenException {\r
-               Set<String> includStrList = new HashSet<String>();\r
+               Set<String> includStrList = new LinkedHashSet<String>();\r
                String includerName[];\r
                String str = "";\r
 \r
@@ -1504,6 +1505,7 @@ public class AutoGen {
                        switch (CommonDefinition.getModuleType(moduleType)) {\r
                        case CommonDefinition.ModuleTypeBase:\r
                                fileBuffer.append("RETURN_STATUS\r\n");\r
+                               fileBuffer.append("EFIAPI\r\n");\r
                                fileBuffer.append(libInstanceList.get(i));\r
                                fileBuffer.append(" (\r\n");\r
                                fileBuffer.append("  VOID\r\n");\r
@@ -1513,6 +1515,7 @@ public class AutoGen {
                        case CommonDefinition.ModuleTypePeiCore:\r
                        case CommonDefinition.ModuleTypePeim:\r
                                fileBuffer.append("EFI_STATUS\r\n");\r
+                               fileBuffer.append("EFIAPI\r\n");\r
                                fileBuffer.append(libInstanceList.get(i));\r
                                fileBuffer.append(" (\r\n");\r
                                fileBuffer\r
@@ -1530,6 +1533,7 @@ public class AutoGen {
                        case CommonDefinition.ModuleTypeUefiDriver:\r
                        case CommonDefinition.ModuleTypeUefiApplication:\r
                                fileBuffer.append("EFI_STATUS\r\n");\r
+                               fileBuffer.append("EFIAPI\r\n");\r
                                fileBuffer.append(libInstanceList.get(i));\r
                                fileBuffer.append(" (\r\n");\r
                                fileBuffer.append("  IN EFI_HANDLE        ImageHandle,\r\n");\r
@@ -1543,6 +1547,7 @@ public class AutoGen {
                // Add ProcessLibraryConstructorList in AutoGen.c\r
                //\r
                fileBuffer.append("VOID\r\n");\r
+               fileBuffer.append("EFIAPI\r\n");\r
                fileBuffer.append("ProcessLibraryConstructorList (\r\n");\r
                switch (CommonDefinition.getModuleType(moduleType)) {\r
                case CommonDefinition.ModuleTypeBase:\r
@@ -1635,7 +1640,8 @@ public class AutoGen {
                for (int i = 0; i < libInstanceList.size(); i++) {\r
                        switch (CommonDefinition.getModuleType(moduleType)) {\r
                        case CommonDefinition.ModuleTypeBase:\r
-                               fileBuffer.append("RETURN_STATUS\n");\r
+                               fileBuffer.append("RETURN_STATUS\r\n");\r
+                               fileBuffer.append("EFIAPI\r\n");\r
                                fileBuffer.append(libInstanceList.get(i));\r
                                fileBuffer.append(" (\r\n");\r
                                fileBuffer.append("  VOID\r\n");\r
@@ -1644,6 +1650,7 @@ public class AutoGen {
                        case CommonDefinition.ModuleTypePeiCore:\r
                        case CommonDefinition.ModuleTypePeim:\r
                                fileBuffer.append("EFI_STATUS\r\n");\r
+                               fileBuffer.append("EFIAPI\r\n");\r
                                fileBuffer.append(libInstanceList.get(i));\r
                                fileBuffer.append(" (\r\n");\r
                                fileBuffer\r
@@ -1660,6 +1667,7 @@ public class AutoGen {
                        case CommonDefinition.ModuleTypeUefiDriver:\r
                        case CommonDefinition.ModuleTypeUefiApplication:\r
                                fileBuffer.append("EFI_STATUS\r\n");\r
+                               fileBuffer.append("EFIAPI\r\n");\r
                                fileBuffer.append(libInstanceList.get(i));\r
                                fileBuffer.append(" (\r\n");\r
                                fileBuffer.append("  IN EFI_HANDLE        ImageHandle,\r\n");\r
@@ -1685,6 +1693,7 @@ public class AutoGen {
                case CommonDefinition.ModuleTypeUefiDriver:\r
                case CommonDefinition.ModuleTypeUefiApplication:\r
                        fileBuffer.append("VOID\r\n");\r
+                       fileBuffer.append("EFIAPI\r\n");\r
                        fileBuffer.append("ProcessLibraryDestructorList (\r\n");\r
                        fileBuffer.append("  IN EFI_HANDLE        ImageHandle,\r\n");\r
                        fileBuffer.append("  IN EFI_SYSTEM_TABLE  *SystemTable\r\n");\r