last

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1351 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 de8e75f14290d504f99118e24f904fda4fa9938f..77162e854a07eb4153ecb1acf931b4ef1aaeb125 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/FirstPanel.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/FirstPanel.java
@@ -88,7 +88,7 @@ public final class FirstPanel extends JPanel implements ActionListener, ItemList
         cst.gridx = 1;\r
         cst.gridy = 0;\r
         gridbag.setConstraints(criticButton, cst);\r
         cst.gridx = 1;\r
         cst.gridy = 0;\r
         gridbag.setConstraints(criticButton, cst);\r

-        add(criticButton);\r
+        //add(criticButton);\r

         \r
         JPanel checkboxPanel = new JPanel();\r
         checkboxPanel.setLayout(new BoxLayout(checkboxPanel, BoxLayout.Y_AXIS));\r
         \r
         JPanel checkboxPanel = new JPanel();\r
         checkboxPanel.setLayout(new BoxLayout(checkboxPanel, BoxLayout.Y_AXIS));\r

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/Func.java b/Tools/Source/MigrationTools/org/tianocore/migration/Func.java
index d51412c970f3fbe11be72d4db5df7763460c3e7b..c311f10b605186ce759ff0e94850d46c3e811f66 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/Func.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/Func.java
@@ -33,7 +33,8 @@ public class Func {
        public String r9libname;\r
 \r
        public static Pattern ptnbrace = Pattern.compile("\\{[^\\{\\}]*\\}",Pattern.MULTILINE);\r
        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
        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/SourceFileReplacer.java b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
index 868509a88b411da0e972907f46b95d2baeaad0c2..fdc8a657a7884f60b320cbfd504e44dfa007b46c 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
@@ -78,7 +78,7 @@ public final class SourceFileReplacer {
        private static final void addr8only() throws Exception {\r
                String paragraph = null;\r
                String line = Common.file2string(MigrationTool.db.DatabasePath + File.separator + "R8Lib.c");\r
        private static final void addr8only() throws Exception {\r
                String paragraph = null;\r
                String line = Common.file2string(MigrationTool.db.DatabasePath + File.separator + "R8Lib.c");\r

-               Common.ensureDir(mi.modulepath + File.separator + "result" + File.separator + "R8Lib.c");\r
+               //Common.ensureDir(mi.modulepath + File.separator + "Migration_" + mi.modulename + File.separator + "R8Lib.c");\r

                PrintWriter outfile1 = new PrintWriter(new BufferedWriter(new FileWriter(mi.outputpath + File.separator + "Migration_" + mi.modulename + File.separator + "R8Lib.c")));\r
                PrintWriter outfile2 = new PrintWriter(new BufferedWriter(new FileWriter(mi.outputpath + File.separator + "Migration_" + mi.modulename + File.separator + "R8Lib.h")));\r
                Pattern ptnr8only = Pattern.compile("////#?(\\w*)?.*?R8_(\\w*).*?////~", Pattern.DOTALL);\r
                PrintWriter outfile1 = new PrintWriter(new BufferedWriter(new FileWriter(mi.outputpath + File.separator + "Migration_" + mi.modulename + File.separator + "R8Lib.c")));\r
                PrintWriter outfile2 = new PrintWriter(new BufferedWriter(new FileWriter(mi.outputpath + File.separator + "Migration_" + mi.modulename + File.separator + "R8Lib.h")));\r
                Pattern ptnr8only = Pattern.compile("////#?(\\w*)?.*?R8_(\\w*).*?////~", Pattern.DOTALL);\r