Fix several issues:

Misreplace library name
Support commenting out nonlocal header files for dxs FileArg.class
Add a new protocol Guid to database 

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

5 files changed, 9 insertions, 6 deletions

diff --git a/Tools/Conf/Migration/Library.csv b/Tools/Conf/Migration/Library.csv
index e65cee24f0..e6e1563628 100644
--- a/Tools/Conf/Migration/Library.csv
+++ b/Tools/Conf/Migration/Library.csv
@@ -37,7 +37,7 @@ EfiDriverLib,EfiCreateEventReadyToBoot,EfiCreateEventReadyToBootEx,UefiLib,MdePk
 EfiDriverLib,EfiCreateEventLegacyBoot,EfiCreateEventLegacyBootEx,UefiLib,MdePkg

 EfiDriverLib,EfiInitializeFwVolDevicepathNode,EfiInitializeFwVolDevicepathNode,UefiLib,MdePkg

 EfiDriverLib,EfiGetNameGuidFromFwVolDevicePathNode,EfiGetNameGuidFromFwVolDevicePathNode,UefiLib,MdePkg

-EfiDriverLib,EfiLibReportStatusCode,ReportStatusCode,ReportStatusCodeLib,MdePkg

+EfiDriverLib,EfiLibReportStatusCode,gRT->ReportStatusCode,ReportStatusCodeLib,MdePkg

 EfiDriverLib,ReportStatusCodeWithDevicePath,ReportStatusCodeWithDevicePath,ReportStatusCodeLib,MdePkg

 EfiDriverLib,EFI_FIELD_OFFSET,EFI_FIELD_OFFSET,BaseLib,MdePkg

 EfiDriverLib,EFI_LIST,LIST_ENTRY,BaseLib,MdePkg

@@ -71,7 +71,7 @@ EfiCommonLib,BufToHexString,R8_BufToHexString,%,MdePkg
 EfiCommonLib,CHARACTER_NUMBER_FOR_VALUE,MAXIMUM_VALUE_CHARACTERS,PrintLib,MdePkg

 EfiCommonLib,CodeTypeToPostCode,CodeTypeToPostCode,ReportStatusCodeLib,MdePkg

 EfiCommonLib,COMMA_TYPE,COMMA_TYPE,PrintLib,MdePkg

-EfiCommonLib,DivU64x32,DivU64x64Remainder ,BaseLib,MdePkg

+EfiCommonLib,DivU64x32,DivU64x64Remainder,BaseLib,MdePkg

 EfiCommonLib,EfiAsciiStrCpy,AsciiStrCpy,BaseLib,MdePkg

 EfiCommonLib,EfiAsciiStrLen,AsciiStrLen,BaseLib,MdePkg

 EfiCommonLib,EfiCommonIoRead,n/a,n/a,MdePkg

diff --git a/Tools/Conf/Migration/Protocol.csv b/Tools/Conf/Migration/Protocol.csv
index 408650d170..6ca3c33659 100644
--- a/Tools/Conf/Migration/Protocol.csv
+++ b/Tools/Conf/Migration/Protocol.csv
@@ -143,3 +143,4 @@ IsaIo,gEfiIsaIoProtocolGuid,gEfiIsaIoProtocolGuid,7EE2BD44-3DA0-11D4-9A38-009027
 IsaAcpi,gEfiIsaAcpiProtocolGuid,gEfiIsaAcpiProtocolGuid,64A892DC-5561-4536-92C7-799BFC183355,EdkModulePkg

 Performance,gPerformanceProtocolGuid,gPerformanceProtocolGuid,76B6BDFA-2ACD-4462-9E3F-CB58C969D937,EdkModulePkg

 ScsiIo,gEfiScsiIoProtocolGuid,gEfiScsiIoProtocolGuid,403CD195-F233-48EC-8455-B2E52F1D9E02,EdkModulePkg

+ApciSupport,gEfiAcpiSupportGuid,gEfiAcpiSupportProtocolGuid,DBFF9D55-89B7-46DA-BDDF-677D3DC0241D,MdePkg

diff --git a/Tools/Conf/Migration/Symbols.csv b/Tools/Conf/Migration/Symbols.csv
index 37f0887c5b..c9ab937b0f 100644
--- a/Tools/Conf/Migration/Symbols.csv
+++ b/Tools/Conf/Migration/Symbols.csv
@@ -222,7 +222,7 @@ EfiLibAllocateRuntimeZeroPool,AllocateRuntimeZeroPool
 EfiLibAllocateZeroPool,AllocateZeroPool

 EfiCreateEventReadyToBoot,EfiCreateEventReadyToBootEx

 EfiCreateEventLegacyBoot,EfiCreateEventLegacyBootEx

-EfiLibReportStatusCode,ReportStatusCode

+EfiLibReportStatusCode,gRT->ReportStatusCode

 EFI_LIST,LIST_ENTRY

 EFI_LIST_ENTRY,LIST_ENTRY    

 EFI_LIST_NODE,LIST_ENTRY    

@@ -241,7 +241,7 @@ ASPrint,AsciiSPrint
 AvSPrint,AsciiVSPrint

 BufToHexString,R8_BufToHexString

 CHARACTER_NUMBER_FOR_VALUE,MAXIMUM_VALUE_CHARACTERS

-DivU64x32,DivU64x64Remainder 

+DivU64x32,DivU64x64Remainder

 EfiAsciiStrCpy,AsciiStrCpy

 EfiAsciiStrLen,AsciiStrLen

 EfiCommonIoRead,n/a

@@ -319,3 +319,4 @@ PEI_CR,CR
 PEI_DEBUG,DEBUG#

 PEI_DEBUG_CODE,DEBUG_CODE#

 PEI_DEBUG_SET_MEMORY,DEBUG_CLEAR_MEMORY

+gEfiAcpiSupportGuid,gEfiAcpiSupportProtocolGuid

diff --git a/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleReader.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
index f6cfa85582..d6a7ed639e 100644
--- a/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
+++ b/Tools/Java/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
@@ -310,7 +310,7 @@ public final class ModuleReader implements Common.ForDoAll {
         }

         

         public boolean recognize(String filename) {

-            return filename.contains(".c") || filename.contains(".h");

+            return filename.contains(".c") || filename.contains(".h") || filename.contains(".dxs");

         }

         

         public String namechange(String oldname) {

diff --git a/Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
index cdb833db83..b8d37c3bb6 100644
--- a/Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
+++ b/Tools/Java/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
@@ -315,7 +315,8 @@ public final class SourceFileReplacer implements Common.ForDoAll {
             if ((r9thing = MigrationTool.db.getR9Func(r8thing)) != null) {

                 if (!r8thing.equals(r9thing)) {

                     if (wholeline.contains(r8thing)) {

-                        wholeline = wholeline.replaceAll(r8thing, r9thing);

+                    	String findString = "(?<!(?:\\d|\\w))" + r8thing + "(?!(?:\\d|\\w))";

+                        wholeline = wholeline.replaceAll(findString, r9thing);

                         filefunc.add(new r8tor9(r8thing, r9thing));

                         Iterator<r8tor9> rt = filefunc.iterator();

                         while (rt.hasNext()) {