Add a unified migration database to replace the original Protocol, Ppi, Guid, Library database.

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

1 files changed, 3 insertions, 2 deletions

diff --git a/Tools/Java/Source/MigrationTools/org/tianocore/migration/Database.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/Database.java
index c875cb57d0..5b4701ce92 100644
--- a/Tools/Java/Source/MigrationTools/org/tianocore/migration/Database.java
+++ b/Tools/Java/Source/MigrationTools/org/tianocore/migration/Database.java
@@ -37,7 +37,7 @@ public final class Database {
         DatabasePath = path;

 

         try {

-            collectWorkSpaceDatabase();

+            //collectWorkSpaceDatabase();

             importPkgGuid("PkgGuid.csv");

             importDBLib("Library.csv");

             importDBGuid("Guid.csv", "Guid");

@@ -247,7 +247,8 @@ public final class Database {
                                                       "(\\w[\\w\\d]*)\\s*\\([^)]*\\)\\s*;";

     private static final Pattern    ptnLibFunction  = Pattern.compile(regLibFunction);

 

-    private static final String     regLibExtern    = "extern\\s+" + regLibDataType + "\\s*(\\w[\\w\\d]*)";

+    private static final String     regLibExtern    = "extern\\s+" + regLibDataType + 

+                                                      "\\s*(\\w[\\w\\d]*)";

     private static final Pattern    ptnLibExtern    = Pattern.compile(regLibExtern);

 

     private static final String convertToOsFilePath(String filePath) {