Fix the bug EDKT464. ? and * are regarded as wildcard char by OS. so we have to remove the support of /? and -?

To show the help info, ContextTool only support: -h, /h, --help, /help.  

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1887 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jjin9 2006-11-02 08:55:15 +00:00
parent d73196f329
commit bd23689590
2 changed files with 13 additions and 50 deletions

View File

@ -43,6 +43,6 @@ public class ContextMain {
} }
String workspacePath = System.getenv("WORKSPACE"); String workspacePath = System.getenv("WORKSPACE");
System.out.printf("%n%s%n", workspacePath + "\\Tool\\Conf\\target.txt is generated successfully!"); System.out.printf("%n%s%n", workspacePath + "\\Tool\\Conf\\target.txt is updated successfully!");
} }
} }

View File

@ -29,8 +29,7 @@ public class ParseParameter {
return false; return false;
} else { } else {
if( (args[0].compareToIgnoreCase("-h") == 0) || (args[0].compareToIgnoreCase("/h") == 0) || if( (args[0].compareToIgnoreCase("-h") == 0) || (args[0].compareToIgnoreCase("/h") == 0) ||
(args[0].compareToIgnoreCase("-?") == 0) || (args[0].compareToIgnoreCase("/?") == 0) || (args[0].compareToIgnoreCase("--help") == 0) || (args[0].compareToIgnoreCase("/help") == 0) ){
(args[0].compareToIgnoreCase("-help") == 0) || (args[0].compareToIgnoreCase("/help") == 0) ){
HelpInfo.outputUsageInfo(); HelpInfo.outputUsageInfo();
return false; return false;
} }
@ -209,58 +208,22 @@ public class ParseParameter {
public static boolean outputCurSetting(){ public static boolean outputCurSetting(){
System.out.printf( "%s\n", "The current setting is:" ); System.out.printf( "%s\n", "The current setting is:" );
String[] A = { pstr, tstr, astr, cstr, nstr, mstr, mestr };
String[] B = { curpstr, curtstr, curastr, curcstr, curnstr, curmstr, curmestr };
if(curpstr != null){ for(int i=0; i<A.length; i++){
System.out.printf( "%s\n", curpstr ); if(B[i] != null){
} System.out.printf( "%s\n", B[i] );
else{ }
System.out.printf( "%s\n", pstr ); else{
} System.out.printf( "%s\n", A[i] );
}
if(curtstr != null){
System.out.printf( "%s\n", curtstr );
}
else{
System.out.printf( "%s\n", tstr );
}
if(curastr != null){
System.out.printf( "%s\n", curastr );
}
else{
System.out.printf( "%s\n", astr );
}
if(curcstr != null){
System.out.printf( "%s\n", curcstr );
}
else{
System.out.printf( "%s\n", cstr );
}
if(curnstr != null){
System.out.printf( "%s\n", curnstr );
}
else{
System.out.printf( "%s\n", nstr );
}
if(curmstr != null){
System.out.printf( "%s\n", curmstr );
}
else{
System.out.printf( "%s\n", mstr );
}
if(curmstr != null){
System.out.printf( "%s\n", curmestr );
}
else{
System.out.printf( "%s\n", mestr );
} }
return true; return true;
} }
public static String pstr = new String("ACTIVE_PLATFORM = "); public static String pstr = new String("ACTIVE_PLATFORM = ");
public static String tstr = new String("TARGET = "); public static String tstr = new String("TARGET = ");