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=fa1843f15ea2bea95a6cdb4c6f4261ae4832bc48;hb=90503bad37fea5edf22531754c203f77268dfa36;hpb=e6a5df3bbd1d371ce18eebd0a692a50298cb31f3

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
index fa1843f15e..5e3bbb50d0 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
@@ -81,12 +81,12 @@ public class ModuleInfo {
 		dirScan("");
 		String filename = null;
 		if (msaorinf.isEmpty()) {
-			ui.println("No .inf nor .msa file found! Tool Halt!");
+			ui.println("No INF nor MSA file found!");
 			System.exit(0);
 		} 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")) {
@@ -99,7 +99,7 @@ public class ModuleInfo {
 		new SourceFileReplacer(modulepath, this, db, ui).flush();	// some adding library actions are taken here,so it must be put before "MsaWriter"
 		
 		// show result
-		if (ui.yesOrNo("Parse Module Information Complete . See details ?")) {
+		if (ui.yesOrNo("Parse of the Module Information has completed. View details?")) {
 			ui.println("\nModule Information : ");
 			ui.println("Entrypoint : " + entrypoint);
 			show(protocol, "Protocol : ");
@@ -122,27 +122,14 @@ public class ModuleInfo {
 		
 		ui.println("Errors Left : " + db.error);
 		ui.println("Complete!");
-		ui.println("Your R9 module is placed at " + modulepath + File.separator + "result");
-		ui.println("Your logfile is placed at " + modulepath);
+		ui.println("Your R9 module was placed here: " + modulepath + File.separator + "result");
+		ui.println("Your logfile was placed here: " + modulepath);
 	}
 	
 	private void show(Set<String> hash, String show) {
 		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")) {