add ModuleInfo2OutputPath Map

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

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
index 3fd446433a97d835eb9c10747e6d880529e0a6ac..428f82b659e44b0584f69e44f6b0919499020c81 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
@@ -22,22 +22,10 @@ information and all the temporary data.
 public final class ModuleInfo {\r
        ModuleInfo(String modulepath) throws Exception {\r
                this.modulepath = modulepath;\r
-               \r
-               if (MigrationTool.defaultoutput) {\r
-                       this.outputpath = this.modulepath.replaceAll(Common.strseparate, "$1");\r
-               } else {\r
-                       MigrationTool.ui.println("Choose where to place the result");\r
-                       if ((outputpath = MigrationTool.ui.getFilepath("Please choose where to place the output module")) == null) {\r
-                               outputpath = modulepath; \r
-                       }\r
-                       MigrationTool.ui.println("Output to: " + outputpath);\r
-               }\r
        }\r
 \r
        public final String modulepath;\r
        \r
-       public String outputpath = null;\r
-       \r
        public String modulename = null;\r
        public String guidvalue = null;\r
        public String moduletype = null;\r
@@ -60,11 +48,15 @@ public final class ModuleInfo {
        public final Set<String> ppi = new HashSet<String>();\r
 \r
        public final void enroll(String filepath) throws Exception {\r
+               String temp = null;\r
                if (filepath.contains(".c") || filepath.contains(".C") || filepath.contains(".h") || \r
                                filepath.contains(".H") || filepath.contains(".dxs") || filepath.contains(".uni")) {\r
                        localmodulesources.add(filepath.replace(modulepath + "\\", ""));\r
                } else if (filepath.contains(".inf") || filepath.contains(".msa")) {\r
-                       msaorinf.add(filepath.replace(modulepath + "\\", ""));\r
+                       temp = filepath.replace(modulepath + "\\", "");\r
+                       if (!temp.contains(File.separator)) {                                                           // .inf in subdirectory is not regarded\r
+                               msaorinf.add(temp);\r
+                       }\r
                }\r
        }\r
 \r