Standardized the command line options.

[people/mcb30/basetools.git] / Source / C / VfrCompile / VfrCompiler.cpp

diff --git a/Source/C/VfrCompile/VfrCompiler.cpp b/Source/C/VfrCompile/VfrCompiler.cpp
index 5ce9858..cf14faf 100644 (file)
--- a/Source/C/VfrCompile/VfrCompiler.cpp
+++ b/Source/C/VfrCompile/VfrCompiler.cpp
@@ -42,7 +42,7 @@ CVfrCompiler::OptionInitialization (
   mOptions.CPreprocessorOptions          = NULL;\r
 \r
   for (Index = 1; (Index < Argc) && (Argv[Index][0] == '-'); Index++) {\r
-    if ((_stricmp(Argv[Index], "-?") == 0) || (_stricmp(Argv[Index], "-h") == 0)) {\r
+    if ((_stricmp(Argv[Index], "-h") == 0) || (_stricmp(Argv[Index], "--help") == 0)) {\r
       Usage ();\r
       SET_RUN_STATUS (STATUS_DEAD);\r
       return;\r
@@ -57,7 +57,7 @@ CVfrCompiler::OptionInitialization (
       }\r
 \r
       AppendIncludePath(Argv[Index]);\r
-    } else if (_stricmp(Argv[Index], "-od") == 0) {\r
+    } else if (_stricmp(Argv[Index], "-o") == 0 || _stricmp(Argv[Index], "--output-directory") == 0) {\r
       Index++;\r
       if ((Index >= Argc) || (Argv[Index][0] == '-')) {\r
         printf ("%s -od - missing output directory name\n", PROGRAM_NAME);\r
@@ -65,12 +65,12 @@ CVfrCompiler::OptionInitialization (
       }\r
       strcpy (mOptions.OutputDirectory, Argv[Index]);\r
       strcat (mOptions.OutputDirectory, "\\");\r
-    } else if (_stricmp(Argv[Index], "-ibin") == 0) {\r
+    } else if (_stricmp(Argv[Index], "-b") == 0 || _stricmp(Argv[Index], "--create-ifr-package") == 0) {\r
       mOptions.CreateIfrPkgFile = TRUE;\r
-    } else if (_stricmp(Argv[Index], "-nostrings") == 0) {\r
-    } else if (_stricmp(Argv[Index], "-nopp") == 0) {\r
+    } else if (_stricmp(Argv[Index], "--no-strings") == 0) {\r
+    } else if (_stricmp(Argv[Index], "-n") == 0 || _stricmp(Argv[Index], "--no-preprocessing") == 0) {\r
       mOptions.SkipCPreprocessor = TRUE;\r
-    } else if (_stricmp(Argv[Index], "-ppflag") == 0) {\r
+    } else if (_stricmp(Argv[Index], "-f") == 0 || _stricmp(Argv[Index], "--preprocessing-flag") == 0) {\r
       Index++;\r
       if ((Index >= Argc) || (Argv[Index][0] == '-')) {\r
         printf ("%s -od - missing C-preprocessor argument\n", PROGRAM_NAME);\r
@@ -328,18 +328,20 @@ CVfrCompiler::Usage (
     " ", \r
     "VfrCompile version " VFR_COMPILER_VERSION,\r
     " ",\r
-    "  Usage: VfrCompile {options} [VfrFile]",\r
+    "Usage: VfrCompile [options] VfrFile",\r
     " ",\r
-    "    where options include:",\r
-    "      -? or -h       prints this help",\r
-    "      -l             create an output IFR listing file",\r
-    "      -i IncPath     add IncPath to the search path for VFR included files",\r
-    "      -od OutputDir  deposit all output files to directory OutputDir (default=cwd)",\r
-    "      -ibin          create an IFR HII pack file",\r
-    "      -nopp          do not preprocess",\r
-    "      -ppflag        C-preprocessor argument",\r
-    "    where parameters include:",\r
-    "      VfrFile        name of the input VFR script file",\r
+    "Options:",\r
+    "  -h, --help     prints this help",\r
+    "  -l             create an output IFR listing file",\r
+    "  -i IncPath     add IncPath to the search path for VFR included files",\r
+    "  -o DIR, --output-directory DIR",\r
+    "                 deposit all output files to directory OutputDir (default=cwd)",\r
+    "  -b, --create-ifr-package",\r
+    "                 create an IFR HII pack file",\r
+    "  -n, --no-pre-processing",\r
+    "                 do not preprocessing input file",\r
+    "  -f, --pre-processing-flag",\r
+    "                 Preprocessing flags",\r
     " ",\r
     NULL\r
     };\r