X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FFrameworkTasks%2Forg%2Ftianocore%2Fframework%2Ftasks%2FGuidChkTask.java;h=2f892a7cd4abfd4fa2dffe6752bc5fd53844d708;hp=ebccca46732fd4db92e55ecd8bed89c260f3f8a1;hb=0fdb42ac4675ac888d7cfb3f29f68c342f47b9e9;hpb=2da8968bb588b2bf72501a90597b8de464394024 diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GuidChkTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GuidChkTask.java index ebccca4673..2f892a7cd4 100644 --- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GuidChkTask.java +++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GuidChkTask.java @@ -23,6 +23,8 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; +import org.tianocore.common.logger.EdkLog; + /** GuidChkTask @@ -46,49 +48,53 @@ public class GuidChkTask extends Task implements EfiDefine{ * -fos : out put redirect to this file * */ - /// - /// Directory name of exclusion searching - /// - private String exDir = ""; - /// - /// File name of exclusion searching. - /// - private String exFile = ""; - /// - /// Extension name of exclusion searching. - /// - private String exExt = ""; - /// - /// Extesnion name of sub dir which excluded searching. - /// - private String exSubDir = ""; - /// - /// Out put file wrote internal GUID+basename list - /// - private String outFile = ""; - /// - /// Check for duplicate guids. - /// - private String chkGui = ""; - /// - /// Check for duplicate signatures - /// - private String chkSign = ""; - /// - /// If set will print guid+defined symbol name - /// - private String printGuiDef = ""; - /// - /// If set will print all GUIDS found - /// - private String printAllGuid = ""; - /// - /// redirection file name. - /// + // + // Tool name + // + private static String toolName = "GuidChk"; + // + // Directory name of exclusion searching + // + private FileArg exDir = new FileArg(); + // + // File name of exclusion searching. + // + private FileArg exFile = new FileArg(); + // + // Extension name of exclusion searching. + // + private FileArg exExt = new FileArg(); + // + // Extesnion name of sub dir which excluded searching. + // + private FileArg exSubDir = new FileArg(); + // + // Out put file wrote internal GUID+basename list + // + private FileArg outFile = new FileArg(); + // + // Check for duplicate guids. + // + private ToolArg chkGui = new ToolArg(); + // + // Check for duplicate signatures + // + private ToolArg chkSign = new ToolArg(); + // + // If set will print guid+defined symbol name + // + private ToolArg printGuiDef = new ToolArg(); + // + // If set will print all GUIDS found + // + private ToolArg printAllGuid = new ToolArg(); + // + // redirection file name. + // private String outPut = ""; - /// - /// out put redirect to this file. - /// + // + // out put redirect to this file. + // protected PrintWriter fos = null; // @@ -99,25 +105,25 @@ public class GuidChkTask extends Task implements EfiDefine{ String path = project.getProperty("env.FRAMEWORK_TOOLS_PATH"); String command; if (path == null) { - command = "GuidChk"; + command = toolName; } else { - command = path + File.separatorChar + "GuidChk"; + command = path + File.separatorChar + toolName; } - String argument = exDir + - exFile + - exExt + - exSubDir + - outFile + - chkGui + - chkSign + - printGuiDef + - printAllGuid; + String argument = "" + exDir + + exFile + + exExt + + exSubDir + + outFile + + chkGui + + chkSign + + printGuiDef + + printAllGuid; try { - System.out.println(command + " " + argument); + EdkLog.log(this, EdkLog.EDK_VERBOSE, command + " " + argument); // // execute command line // - Process proc = Runtime.getRuntime().exec(command + "" + argument); + Process proc = Runtime.getRuntime().exec(command + " " + argument); // // if set output, redirect out put to output file, else print output to screen // @@ -126,25 +132,21 @@ public class GuidChkTask extends Task implements EfiDefine{ BufferedReader bin = new BufferedReader(new InputStreamReader(proc.getInputStream())); String line = bin.readLine(); while (line != null ){ - fos.println(line); - line = bin.readLine(); + fos.println(line); + line = bin.readLine(); } fos.close(); } else { BufferedReader bin = new BufferedReader(new InputStreamReader(proc.getInputStream())); String line = bin.readLine(); - System.out.println(line); while (line != null ){ - System.out.print(line); line = bin.readLine(); } } - System.out.println("GuidChkTask Success!"); + EdkLog.log(this, EdkLog.EDK_VERBOSE, toolName + " Succeeded!"); } catch (Exception e) { - System.out.println("GuidChkTask failed!"); - System.out.println(e.getMessage()); - + throw new BuildException(toolName + " failed!"); } } /** @@ -155,7 +157,7 @@ public class GuidChkTask extends Task implements EfiDefine{ @return string of flag of ChkGui **/ public String getChkGui() { - return chkGui; + return chkGui.getValue(); } /** @@ -165,11 +167,10 @@ public class GuidChkTask extends Task implements EfiDefine{ @param chkGui set class member of chkGui **/ - public void setChkGui(String chkGui) { - if (chkGui.equals("on")||(chkGui.equals("ON"))){ - this.chkGui = " -g "; - } - + public void setChkGui(boolean chkGui) { + if (chkGui) { + this.chkGui.setArg(" -", "g"); + } } /** @@ -180,7 +181,7 @@ public class GuidChkTask extends Task implements EfiDefine{ @return chkSign **/ public String getChkSign() { - return chkSign; + return chkSign.getValue(); } /** @@ -189,9 +190,9 @@ public class GuidChkTask extends Task implements EfiDefine{ This function is to set class member of chkSign * @param chkSign */ - public void setChkSign(String chkSign) { - if (chkSign.equals("on")|| chkSign.equals("ON")){ - this.chkSign = " -s "; + public void setChkSign(boolean chkSign) { + if (chkSign){ + this.chkSign.setArg(" -", "s"); } } /** @@ -202,7 +203,7 @@ public class GuidChkTask extends Task implements EfiDefine{ @return exDir **/ public String getExDir() { - return exDir; + return exDir.getValue(); } /** @@ -213,7 +214,7 @@ public class GuidChkTask extends Task implements EfiDefine{ @param exDir **/ public void setExDir(String exDir) { - this.exDir = " -d " + exDir; + this.exDir.setArg(" -d ", exDir); } /** @@ -224,7 +225,7 @@ public class GuidChkTask extends Task implements EfiDefine{ @return exExt **/ public String getExExt() { - return exExt; + return exExt.getValue(); } /** @@ -234,7 +235,7 @@ public class GuidChkTask extends Task implements EfiDefine{ @param exExt **/ public void setExExt(String exExt) { - this.exExt = " -e " + exExt; + this.exExt.setArg(" -e ", exExt); } /** @@ -244,7 +245,7 @@ public class GuidChkTask extends Task implements EfiDefine{ @return exFile **/ public String getExFile() { - return exFile; + return exFile.getValue(); } /** @@ -255,7 +256,7 @@ public class GuidChkTask extends Task implements EfiDefine{ @param exFile **/ public void setExFile(String exFile) { - this.exFile = " -f " + exFile; + this.exFile.setArg(" -f ", exFile); } /** @@ -266,7 +267,7 @@ public class GuidChkTask extends Task implements EfiDefine{ @return exSubDir **/ public String getExSubDir() { - return exSubDir; + return exSubDir.getValue(); } /** @@ -276,7 +277,7 @@ public class GuidChkTask extends Task implements EfiDefine{ @param exSubDir **/ public void setExSubDir(String exSubDir) { - this.exSubDir = " -u " + exSubDir; + this.exSubDir.setArg(" -u ", exSubDir); } /** @@ -287,14 +288,14 @@ public class GuidChkTask extends Task implements EfiDefine{ @return outFile **/ public String getOutFile() { - return outFile; + return outFile.getValue(); } /** * set class member of outFile * @param outFile */ public void setOutFile(String outFile) { - this.outFile = " -b " + outFile; + this.outFile.setArg(" -b ", outFile); } /** getPrintGuidDef @@ -304,7 +305,7 @@ public class GuidChkTask extends Task implements EfiDefine{ @return flage of printing (guid+defined symbol name) **/ public String getPrintGuiDef() { - return printGuiDef; + return printGuiDef.getValue(); } @@ -314,9 +315,9 @@ public class GuidChkTask extends Task implements EfiDefine{ This function is to set class member of printGuiDef. @param printGuiDef **/ - public void setPrintGuiDef(String printGuiDef) { - if (printGuiDef.equals("on")|| printGuiDef.equals("ON")){ - this.printGuiDef = " -x "; + public void setPrintGuiDef(boolean printGuiDef) { + if (printGuiDef){ + this.printGuiDef.setArg(" -", "x"); } } @@ -349,7 +350,7 @@ public class GuidChkTask extends Task implements EfiDefine{ @return printAllGuid **/ public String getPrintAllGuid() { - return printAllGuid; + return printAllGuid.getValue(); } /** @@ -358,9 +359,9 @@ public class GuidChkTask extends Task implements EfiDefine{ This function is to set class member of printAllGuid. @param printAllGuid **/ - public void setPrintAllGuid(String printAllGuid) { - if (printAllGuid.equals("on")||printAllGuid.equals("ON")) { - this.printAllGuid = " -p "; + public void setPrintAllGuid(boolean printAllGuid) { + if (printAllGuid) { + this.printAllGuid.setArg(" -", "p"); } } }