From: alfred <alfred@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 21 Sep 2006 05:29:00 +0000 (+0000)
Subject: + n/a
X-Git-Tag: edk2-stable201903~24288
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=55bfa0f1aea986c67ba87905ccbb2df8b69fad0b

+ n/a

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

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/FirstPanel.java b/Tools/Source/MigrationTools/org/tianocore/migration/FirstPanel.java
index 5acf56f60f..6b899c89d0 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/FirstPanel.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/FirstPanel.java
@@ -26,7 +26,7 @@ public final class FirstPanel extends JPanel implements ActionListener, ItemList
     
     private static final FirstPanel INSTANCE = FirstPanel.init();
     
-    private String startpath;
+    private String startpath = null;
     
     private JButton moduleButton, goButton, msaEditorButton, criticButton, specifyCommentButton;
     private JTextField moduletext;
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java b/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
index 2bb9e2b354..fea4f8b9b0 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
@@ -73,7 +73,11 @@ public class MigrationTool {
         MigrationTool.ui.println(show + hash.size());
         MigrationTool.ui.println(hash);
     }
-
+/*
+    public static final String getTempDir(String modulepath) {
+    	return "C:" + File.separator + "MigrationTool_Temp" + File.separator + modulepath.replaceAll(ui., arg1);
+    }
+*/
     private static final String assignOutPutPath(String inputpath) {
         if (MigrationTool.defaultoutput) {
             return inputpath.replaceAll(Common.STRSEPARATER, "$1");
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
index dc32fb9fc0..64958108cc 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
@@ -193,13 +193,11 @@ public final class ModuleReader implements Common.ForDoAll {
         ii = mi.preprocessedccodes.iterator();
         
         Pattern patefifuncc = Pattern.compile("g?(BS|RT)\\s*->\\s*([a-zA-Z_]\\w*)",Pattern.MULTILINE);
-        Pattern patentrypoint = Pattern.compile("EFI_([A-Z]*)_ENTRY_POINT\\s*\\(([^\\(\\)]*)\\)",Pattern.MULTILINE);
         Matcher matguid;
         Matcher matfuncc;
         Matcher matfuncd;
         Matcher matenclosereplace;
         Matcher matefifuncc;
-        Matcher matentrypoint;
         Matcher matmacro;
         
         while (ii.hasNext()) {
@@ -211,17 +209,6 @@ public final class ModuleReader implements Common.ForDoAll {
             }
             line = wholefile.toString();
             
-            // if this is a Pei phase module , add these library class to .msa
-            matentrypoint = patentrypoint.matcher(line);
-            if (matentrypoint.find()) {
-                mi.entrypoint = matentrypoint.group(2);
-                if (matentrypoint.group(1).matches("PEIM")) {
-                    mi.hashrequiredr9libs.add("PeimEntryPoint");
-                } else {
-                    mi.hashrequiredr9libs.add("UefiDriverEntryPoint");
-                }
-            }
-            
             // find guid
             matguid = Guid.ptnguid.matcher(line);                                        // several ways to implement this , which one is faster ? :
             while (matguid.find()) {                                                    // 1.currently , find once , then call to identify which is it
diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java b/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
index 23ea8b27f6..7db15dc92c 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
@@ -168,7 +168,7 @@ public class MsaWriter {
         }
         it = mi.hashrequiredr9libs.iterator();
         while (it.hasNext()) {
-            if ((temp = it.next()) != null && !temp.matches("%")) {
+            if ((temp = it.next()) != null && !temp.matches("%") && !temp.matches("n/a")) {
                 LibraryClassDocument.LibraryClass lc = libclassdefs.addNewLibraryClass();
                 lc.setKeyword(temp);
                 lc.setUsage(UsageTypes.ALWAYS_CONSUMED);