X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FMigrationTools%2Forg%2Ftianocore%2Fmigration%2FModuleInfo.java;h=5e3bbb50d02878f0ae17f47918d825942ebcb21c;hp=220b3e8d4064485e8e3302c74a914c4b21db565d;hb=90503bad37fea5edf22531754c203f77268dfa36;hpb=9dc7af1e05a9c2fe96ce897c94b39b6385cb7966

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
index 220b3e8d40..5e3bbb50d0 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
@@ -86,7 +86,7 @@ public class ModuleInfo {
 		} else {
 			filename = ui.choose("Found .inf or .msa file in the module\nChoose one Please", msaorinf.toArray());
 		}
-		ModuleReader mr = new ModuleReader(modulepath, this, db);
+		ModuleReader mr = new ModuleReader(modulepath, this, db, ui);
 		if (filename.contains(".inf")) {
 			mr.readInf(filename);
 		} else if (filename.contains(".msa")) {
@@ -130,19 +130,6 @@ public class ModuleInfo {
 		ui.println(show + hash.size());
 		ui.println(hash);
 	}
-
-	public void ensureDir(String objFileWhole) {
-		Pattern ptnseparate = Pattern.compile("(.*)\\\\[^\\\\]*");
-		Matcher mtrseparate;
-		File tempdir;
-
-		mtrseparate = ptnseparate.matcher(objFileWhole);
-		if (mtrseparate.find()) {
-			tempdir = new File(mtrseparate.group(1));
-			if (!tempdir.exists()) tempdir.mkdirs();
-		}
-		
-	}
 	
 	// add '//' to all non-local include lines
 	private void CommentOutNonLocalHFile() throws IOException {
@@ -158,7 +145,7 @@ public class ModuleInfo {
 		while ( ii.hasNext() ) {
 			curFile = ii.next();
 			rd = new BufferedReader(new FileReader(modulepath + File.separator + curFile));
-			ensureDir(modulepath + File.separator + "temp" + File.separator + curFile);
+			Common.ensureDir(modulepath + File.separator + "temp" + File.separator + curFile);
 			outfile = new PrintWriter(new BufferedWriter(new FileWriter(modulepath + File.separator + "temp" + File.separator + curFile)));
 			while ((line = rd.readLine()) != null) {
 				if (line.contains("#include")) {