X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FMigrationTools%2Forg%2Ftianocore%2Fmigration%2FModuleInfo.java;h=428f82b659e44b0584f69e44f6b0919499020c81;hp=3fd446433a97d835eb9c10747e6d880529e0a6ac;hb=5f4eb6b6d5eb39012da23c16fdf3f9d988f9db06;hpb=eb8ea8292e05228ff70862996c8897e716013d91

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