Output more descriptive information when there's no TARGET, TARGET_ARCH, etc defined...

[mirror_edk2.git] / Tools / Java / Source / ContextTool / org / tianocore / context / ParseParameter.java

diff --git a/Tools/Java/Source/ContextTool/org/tianocore/context/ParseParameter.java b/Tools/Java/Source/ContextTool/org/tianocore/context/ParseParameter.java
index d58d28b01087103bf5961c638df294766dd91aef..4d9c6de3a07c1f014f451f325e288a7b2e150793 100644 (file)
--- a/Tools/Java/Source/ContextTool/org/tianocore/context/ParseParameter.java
+++ b/Tools/Java/Source/ContextTool/org/tianocore/context/ParseParameter.java
@@ -29,8 +29,7 @@ public class ParseParameter {
             return false;\r
         } else {\r
             if( (args[0].compareToIgnoreCase("-h") == 0) || (args[0].compareToIgnoreCase("/h") == 0) || \r
-                (args[0].compareToIgnoreCase("-?") == 0) || (args[0].compareToIgnoreCase("/?") == 0) || \r
-                (args[0].compareToIgnoreCase("-help") == 0) || (args[0].compareToIgnoreCase("/help") == 0) ){\r
+                (args[0].compareToIgnoreCase("--help") == 0) || (args[0].compareToIgnoreCase("/help") == 0) ){\r
                 HelpInfo.outputUsageInfo();\r
                 return false;\r
             }\r
@@ -79,7 +78,11 @@ public class ParseParameter {
                 // argstr is "-p ", display current setting\r
                 //\r
                 if(argstr.length() < 4 && argstr.charAt(2) == ' '){\r
-                    System.out.printf("%s\n", curpstr);\r
+                    if (curpstr != null) {\r
+                        System.out.printf("%s\n", curpstr);\r
+                    } else {\r
+                        System.out.printf("No ACTIVE_PLATFORM defined \n");\r
+                    }\r
                     return 1;\r
                 }\r
                 //\r
@@ -107,7 +110,11 @@ public class ParseParameter {
                 npflag = true;\r
             } else if (argstr.charAt(1) == 't') {\r
                 if(argstr.length() < 4 && argstr.charAt(2) == ' '){\r
-                    System.out.printf("%s\n", curtstr);\r
+                    if (curtstr != null) {\r
+                        System.out.printf("%s\n", curtstr);\r
+                    } else {\r
+                        System.out.printf("No TARGET defined\n");\r
+                    }\r
                     return 1;\r
                 }\r
                 if(argstr.length() < 6 && argstr.charAt(3) == '?'){\r
@@ -123,7 +130,11 @@ public class ParseParameter {
                 ntflag = true;\r
             } else if (argstr.charAt(1) == 'a') {\r
                 if(argstr.length() < 4 && argstr.charAt(2) == ' '){\r
-                    System.out.printf("%s\n", curastr);\r
+                    if (curastr != null) {\r
+                        System.out.printf("%s\n", curastr);\r
+                    } else {\r
+                        System.out.printf("No TARGET_ARCH defined\n");\r
+                    }\r
                     return 1;\r
                 }\r
                 if(argstr.length() < 6 && argstr.charAt(3) == '?'){\r
@@ -139,7 +150,11 @@ public class ParseParameter {
                 naflag = true;\r
             } else if (argstr.charAt(1) == 'c') {\r
                 if(argstr.length() < 4 && argstr.charAt(2) == ' '){\r
-                    System.out.printf("%s\n", curcstr);\r
+                    if (curcstr != null) {\r
+                        System.out.printf("%s\n", curcstr);\r
+                    } else {\r
+                        System.out.printf("No TOOL_CHAIN_CONF defined\n");\r
+                    }\r
                     return 1;\r
                 }\r
                 if(argstr.length() < 6 && argstr.charAt(3) == '?'){\r
@@ -161,7 +176,11 @@ public class ParseParameter {
                 ncflag = true;\r
             } else if (argstr.charAt(1) == 'n') {\r
                 if(argstr.length() < 4 && argstr.charAt(2) == ' '){\r
-                    System.out.printf("%s\n", curnstr);\r
+                    if (curnstr != null) {\r
+                        System.out.printf("%s\n", curnstr);\r
+                    } else {\r
+                        System.out.printf("No TOOL_CHAIN_TAG defined\n");\r
+                    }\r
                     return 1;\r
                 }\r
                 if(argstr.length() < 6 && argstr.charAt(3) == '?'){\r
@@ -177,7 +196,11 @@ public class ParseParameter {
                 nnflag = true;\r
             } else if (argstr.charAt(1) == 'm') {\r
                 if(argstr.length() < 4 && argstr.charAt(2) == ' '){\r
-                    System.out.printf("%s\n", curmstr);\r
+                    if (curmstr != null) {\r
+                        System.out.printf("%s\n", curmstr);\r
+                    } else {\r
+                        System.out.printf("No MAX_CONCURRENT_THREAD_NUMBER defined\n");\r
+                    }\r
                     return 1;\r
                 }\r
                 if(argstr.length() < 6 && argstr.charAt(3) == '?'){\r
@@ -209,58 +232,22 @@ public class ParseParameter {
     public static boolean outputCurSetting(){\r
         \r
         System.out.printf( "%s\n", "The current setting is:" );\r
+        String[] A = { pstr, tstr, astr, cstr, nstr, mstr, mestr };\r
+        String[] B = { curpstr, curtstr, curastr, curcstr, curnstr, curmstr, curmestr };\r
         \r
-        if(curpstr != null){\r
-            System.out.printf( "%s\n", curpstr );\r
-        }\r
-        else{\r
-            System.out.printf( "%s\n", pstr );\r
-        }\r
-        \r
-        if(curtstr != null){\r
-            System.out.printf( "%s\n", curtstr );\r
-        }\r
-        else{\r
-            System.out.printf( "%s\n", tstr );\r
-        }\r
-        \r
-        if(curastr != null){\r
-            System.out.printf( "%s\n", curastr );\r
-        }\r
-        else{\r
-            System.out.printf( "%s\n", astr );\r
-        }\r
-        \r
-        if(curcstr != null){\r
-            System.out.printf( "%s\n", curcstr );\r
-        }\r
-        else{\r
-            System.out.printf( "%s\n", cstr );\r
-        }\r
-        \r
-        if(curnstr != null){\r
-            System.out.printf( "%s\n", curnstr );\r
-        }\r
-        else{\r
-            System.out.printf( "%s\n", nstr );\r
-        }\r
-        \r
-        if(curmstr != null){\r
-            System.out.printf( "%s\n", curmstr );\r
-        }\r
-        else{\r
-            System.out.printf( "%s\n", mstr );\r
-        }\r
-        \r
-        if(curmstr != null){\r
-            System.out.printf( "%s\n", curmestr );\r
-        }\r
-        else{\r
-            System.out.printf( "%s\n", mestr );\r
+        for(int i=0; i<A.length; i++){\r
+            if(B[i] != null){\r
+                System.out.printf( "%s\n", B[i] );\r
+            }\r
+            else{\r
+                System.out.printf( "%s\n", A[i] );\r
+            }\r
+            \r
         }\r
         \r
         return true;\r
     }\r
+\r
     \r
     public static String pstr = new String("ACTIVE_PLATFORM                     = ");\r
     public static String tstr = new String("TARGET                              = ");\r