Add EntryPointLib class once ImageEntryPoint is found in inf file.

Enhance to recognize function-invocation to not include protocol calling.

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

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/Func.java b/Tools/Source/MigrationTools/org/tianocore/migration/Func.java
index f00eac4e2aed9c89f34f7fb71d9b3e8bdb5fe2aa..1858066840a5cf34dbacbc0abf6cb7d2b1354490 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/Func.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/Func.java
@@ -33,8 +33,7 @@ public class Func {
     public String r9libname;\r
 \r
     public static Pattern ptnbrace = Pattern.compile("\\{[^\\{\\}]*\\}",Pattern.MULTILINE);\r
-    //public static Pattern ptnfuncc = Pattern.compile("([a-zA-Z_]\\w*)\\s*\\([^\\)\\(]*\\)",Pattern.MULTILINE);\r
-    public static Pattern ptnfuncc = Pattern.compile("([a-zA-Z_]\\w*)\\s*\\(",Pattern.MULTILINE);\r
+    public static Pattern ptnfuncc = Pattern.compile("(?<!->)([a-zA-Z_]\\w*)\\s*\\(",Pattern.MULTILINE);\r
     public static Pattern ptnfuncd = Pattern.compile("([a-zA-Z_]\\w*)\\s*\\([^\\)\\(]*\\)\\s*@",Pattern.MULTILINE);\r
     public static Pattern ptnlowcase = Pattern.compile("[a-z]");                // must be removed\r
     \r

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
index 383353c66bb2385e066d9f93e13408e6fce8d3db..41c27a680f4cc6dc494d085a02ad374ec7c39983 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
@@ -102,6 +102,7 @@ public final class ModuleReader implements Common.ForDoAll {
                 while (mtrinfequation.find()) {\r
                     if (mtrinfequation.group(1).matches("IMAGE_ENTRY_POINT")) {\r
                         mi.entrypoint = mtrinfequation.group(2);\r
+                        mi.hashrequiredr9libs.add("EntryPointLib");\r
                     }\r
                     if (mtrinfequation.group(1).matches("DPX_SOURCE")) {\r
                         if (!mi.localmodulesources.contains(mtrinfequation.group(2))) {\r
@@ -119,7 +120,7 @@ public final class ModuleReader implements Common.ForDoAll {
                     }\r
                 }\r
             }\r
-            if (mtrsection.group(1).matches("includes.common")) {\r
+            if (mtrsection.group(1).matches("includes.")) {\r
                 mtrfilename = ptnfilename.matcher(mtrsection.group(2));\r
                 while (mtrfilename.find()) {\r
                        mi.infincludes.add(mtrfilename.group());\r