Fix one bug in PeiMain to make it output correct ImageStartAddress. And in DxeIplX64P...

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

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/Database.java b/Tools/Source/MigrationTools/org/tianocore/migration/Database.java
index 69cb62e3723ac9c9699b11259b6ec7a02f280894..a4b0d47872f374c599e8dc69b8eb2b5e6d167fab 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/Database.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/Database.java
@@ -15,13 +15,9 @@ package org.tianocore.migration;
 import java.io.*;\r
 import java.util.*;\r
 \r
-public class Database {\r
-       Database() throws Exception {\r
-               if (System.getenv("WORKSPACE") == null) {\r
-                       DatabasePath = "C:" + File.separator + "tianocore" + File.separator + "edk2" + File.separator + "Tools" + File.separator + "Conf" + File.separator + "Migration";\r
-               } else {\r
-                       DatabasePath = System.getenv("WORKSPACE") + File.separator + "Tools" + File.separator + "Conf" + File.separator + "Migration";\r
-               }\r
+public final class Database {\r
+       Database(String path) throws Exception {\r
+               DatabasePath = path;\r
                \r
                importDBLib("Library.csv");\r
                importDBGuid("Guid.csv", "Guid");\r
@@ -46,7 +42,7 @@ public class Database {
                Func lf;\r
                \r
                if (rd.ready()) {\r
-                       System.out.println("Found " + filename + " , Importing Library Database");\r
+                       System.out.println("Found " + filename + ", Importing Library Database.");\r
                        while ((line = rd.readLine()) != null) {\r
                                if (line.length() != 0) {\r
                                        linecontext = line.split(",");\r
@@ -64,7 +60,7 @@ public class Database {
                Guid gu;\r
                \r
                if (rd.ready()) {\r
-                       System.out.println("Found " + filename + " , Importing " + type + " Database");\r
+                       System.out.println("Found " + filename + ", Importing " + type + " Database.");\r
                        while ((line = rd.readLine()) != null) {\r
                                if (line.length() != 0) {\r
                                        linecontext = line.split(",");\r
@@ -82,7 +78,7 @@ public class Database {
                Macro mc;\r
                \r
                if (rd.ready()) {\r
-                       System.out.println("Found " + filename + " , Importing Macro Database");\r
+                       System.out.println("Found " + filename + ", Importing Macro Database.");\r
                        while ((line = rd.readLine()) != null) {\r
                                if (line.length() != 0) {\r
                                        linecontext = line.split(",");\r
@@ -124,7 +120,7 @@ public class Database {
        public String getR9Macro(String r8macro) {\r
                return hashmacro.get(r8macro).r9name;                   // the verification job of if the macro exists in the database is done when registering it\r
        }\r
-       \r
+\r
        public String getR9Guidname(String r8Guid) {\r
                String temp = null;\r
                try {\r
@@ -134,7 +130,7 @@ public class Database {
                }\r
                return temp;\r
        }\r
-       \r
+\r
        public String getGuidType(String r8Guid) {\r
                String temp = null;\r
                try {\r
@@ -144,4 +140,12 @@ public class Database {
                }\r
                return temp;\r
        }\r
+\r
+       public static Database init() throws Exception {\r
+               if (System.getenv("WORKSPACE") == null) {\r
+                       return new Database("C:" + File.separator + "tianocore" + File.separator + "edk2" + File.separator + "Tools" + File.separator + "Conf" + File.separator + "Migration");\r
+               } else {\r
+                       return new Database(System.getenv("WORKSPACE") + File.separator + "Tools" + File.separator + "Conf" + File.separator + "Migration");\r
+               }\r
+       }\r
 }\r