add EdkModule Guid

nmake.()

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

3 files changed, 6 insertions, 5 deletions

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java b/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
index 7a37484914..2bb9e2b354 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
@@ -36,6 +36,9 @@ public class MigrationTool {
         //MigrationTool.ui.yesOrNo("go on replace?");

         SourceFileReplacer.fireAt(mi);    // some adding library actions are taken here,so it must be put before "MsaWriter"

 

+        //MigrationTool.ui.yesOrNo("go on delete?");

+        Common.deleteDir(mi.modulepath + File.separator + "temp");

+

         //MigrationTool.ui.yesOrNo("go on show?");

         // show result

         if (MigrationTool.printModuleInfo) {

@@ -60,9 +63,6 @@ public class MigrationTool {
             Critic.fireAt(ModuleInfoMap.get(mi) + File.separator + "Migration_" + mi.modulename);

         }

 

-        //MigrationTool.ui.yesOrNo("go on delete?");

-        Common.deleteDir(mi.modulepath + File.separator + "temp");

-

         MigrationTool.ui.println("Errors Left : " + MigrationTool.db.error);

         MigrationTool.ui.println("Complete!");

         //MigrationTool.ui.println("Your R9 module was placed here: " + mi.modulepath + File.separator + "result");

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
index a0a53d668c..383353c66b 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
@@ -97,7 +97,7 @@ public final class ModuleReader implements Common.ForDoAll {
                     }

                 }

             }

-            if (mtrsection.group(1).matches("nmake.common")) {

+            if (mtrsection.group(1).contains("nmake.")) {

                 mtrinfequation = ptninfequation.matcher(mtrsection.group(2));

                 while (mtrinfequation.find()) {

                     if (mtrinfequation.group(1).matches("IMAGE_ENTRY_POINT")) {

@@ -130,7 +130,7 @@ public final class ModuleReader implements Common.ForDoAll {
     

     private final void preProcessModule() throws Exception {

     	// according to .inf file, add extraordinary includes and sourcefiles

-        Common.dirCopy(mi.modulepath, mi.modulepath + File.separator + "temp");

+        Common.dirCopy(mi.modulepath, mi.modulepath + File.separator + "temp");	// collect all Laplace.namechange to here???

         

     	if (!mi.infincludes.isEmpty()) {

             Iterator<String> it = mi.infincludes.iterator();

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java b/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
index fa9e0074ee..62de225b5c 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
@@ -123,6 +123,7 @@ public class MsaWriter {
         md.setOutputFileBasename(mi.modulename);

         

         pd.addNewPackage().setPackageGuid("5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec");

+        pd.addNewPackage().setPackageGuid("68169ab0-d41b-4009-9060-292c253ac43d");

         externs.addNewSpecification().setStringValue("EFI_SPECIFICATION_VERSION 0x00020000");

         externs.addNewSpecification().setStringValue("EDK_RELEASE_VERSION 0x00020000");

         externs.addNewExtern().setModuleEntryPoint(mi.entrypoint);