Add EntryPointLib class once ImageEntryPoint is found in inf file.

[mirror_edk2.git] / Tools / Source / MigrationTools / org / tianocore / migration / ModuleReader.java

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
index a0a53d668cc594acf3c0c91291ac3e97a51a3a39..41c27a680f4cc6dc494d085a02ad374ec7c39983 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
@@ -97,11 +97,12 @@ public final class ModuleReader implements Common.ForDoAll {
                     }\r
                 }\r
             }\r
-            if (mtrsection.group(1).matches("nmake.common")) {\r
+            if (mtrsection.group(1).contains("nmake.")) {\r
                 mtrinfequation = ptninfequation.matcher(mtrsection.group(2));\r
                 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
@@ -130,7 +131,7 @@ public final class ModuleReader implements Common.ForDoAll {
     \r
     private final void preProcessModule() throws Exception {\r
        // according to .inf file, add extraordinary includes and sourcefiles\r
-        Common.dirCopy(mi.modulepath, mi.modulepath + File.separator + "temp");\r
+        Common.dirCopy(mi.modulepath, mi.modulepath + File.separator + "temp");        // collect all Laplace.namechange to here???\r
         \r
        if (!mi.infincludes.isEmpty()) {\r
             Iterator<String> it = mi.infincludes.iterator();\r