Added or modified utility version and usage display.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2162 6f19259b-4bc3-4df7-8a09-765794883524

4 files changed, 111 insertions, 22 deletions

diff --git a/Tools/CCode/Source/GenBsfImage/GenBsfImage.c b/Tools/CCode/Source/GenBsfImage/GenBsfImage.c
index 1c9dff9..bc3ae9f 100644
--- a/Tools/CCode/Source/GenBsfImage/GenBsfImage.c
+++ b/Tools/CCode/Source/GenBsfImage/GenBsfImage.c
@@ -2561,18 +2561,18 @@ Returns:
   //

   if (argc < 1) {

     Usage();

-    return -1;

+    return 1;

   }

   

   if ((strcmp(argv[1], "-h") == 0) || (strcmp(argv[1], "--help") == 0) ||

       (strcmp(argv[1], "-?") == 0) || (strcmp(argv[1], "/?") == 0)) {

     Usage();

-    return -1;

+    return 1;

   }

   

   if ((strcmp(argv[1], "-V") == 0) || (strcmp(argv[1], "--version") == 0)) {

     Version();

-    return -1;

+    return 1;

   }

  

   if (argc != ONE_BSF_ARGS && argc != TWO_BSF_ARGS) {

diff --git a/Tools/CCode/Source/GenCRC32Section/GenCRC32Section.c b/Tools/CCode/Source/GenCRC32Section/GenCRC32Section.c
index b99cf2f..5c9af78 100644
--- a/Tools/CCode/Source/GenCRC32Section/GenCRC32Section.c
+++ b/Tools/CCode/Source/GenCRC32Section/GenCRC32Section.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2004, Intel Corporation                                                         

+Copyright (c) 2004-2007, Intel Corporation                                                         

 All rights reserved. This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -22,9 +22,9 @@ Abstract:
 

 #include "GenCRC32Section.h"

 

-#define TOOLVERSION   "0.2"

-

-#define UTILITY_NAME  "GenCrc32Section"

+#define UTILITY_NAME           "GenCrc32Section"

+#define UTILITY_MAJOR_VERSION  0

+#define UTILITY_MINOR_VERSION  2

 

 EFI_GUID  gEfiCrc32SectionGuid = EFI_CRC32_GUIDED_SECTION_EXTRACTION_PROTOCOL_GUID;

 

@@ -117,16 +117,45 @@ Returns:
 }

 

 VOID

-PrintUsage (

+Version (

   VOID

   )

+/*++

+

+Routine Description:

+

+  Displays the standard utility information to SDTOUT

+

+Arguments:

+

+  None

+

+Returns:

+

+  None

+

+--*/

 {

-  printf ("Usage:\n");

-  printf (UTILITY_NAME " -i \"inputfile1\" \"inputfile2\" -o \"outputfile\" \n");

-  printf ("   -i \"inputfile\":\n ");

-  printf ("       specifies the input files that would be signed to CRC32 Guided section.\n");

-  printf ("   -o \"outputfile\":\n");

-  printf ("       specifies the output file that is a CRC32 Guided section.\n");

+  printf (

+    "%s v%d.%d -Utility for generating Firmware File System files.\n",

+    UTILITY_NAME,

+    UTILITY_MAJOR_VERSION,

+    UTILITY_MINOR_VERSION

+    );

+}

+

+

+VOID

+Usage (

+  VOID

+  )

+{

+  Version();

+  

+  printf ("\nUsage:\n");

+  printf (UTILITY_NAME " -i Inputfile1 Inputfile2 -o Outputfile\n");

+  printf ("   -i Inputfile: specifies the input files signed to CRC32 Guided section.\n");

+  printf ("   -o Outputfile: specifies the output file that is a CRC32 Guided section.\n");

 }

 

 INT32

@@ -211,8 +240,19 @@ main (
 

   SetUtilityName (UTILITY_NAME);

 

+  if ((strcmp(argv[1], "-h") == 0) || (strcmp(argv[1], "--help") == 0) ||

+      (strcmp(argv[1], "-?") == 0) || (strcmp(argv[1], "/?") == 0)) {

+    Usage();

+    return -1;

+  }

+  

+  if ((strcmp(argv[1], "-V") == 0) || (strcmp(argv[1], "--version") == 0)) {

+    Version();

+    return -1;

+  }

+  

   if (argc == 1) {

-    PrintUsage ();

+    Usage ();

     return -1;

   }

 

diff --git a/Tools/CCode/Source/GenCapsuleHdr/GenCapsuleHdr.c b/Tools/CCode/Source/GenCapsuleHdr/GenCapsuleHdr.c
index d1f55b9..97482f2 100644
--- a/Tools/CCode/Source/GenCapsuleHdr/GenCapsuleHdr.c
+++ b/Tools/CCode/Source/GenCapsuleHdr/GenCapsuleHdr.c
@@ -41,7 +41,10 @@ Abstract:
 #include "EfiUtilityMsgs.h"

 

 #define MAX_PATH                  256

-#define PROGRAM_NAME              "GenCapsuleHdr"

+

+#define UTILITY_NAME              "GenCapsuleHdr"

+#define UTILITY_MAJOR_VERSION     1

+#define UTILITY_MINOR_VERSION     0

 

 #define UNICODE_BACKSLASH         L'\\'

 #define UNICODE_FILE_START        0xFEFF

@@ -160,6 +163,12 @@ SplitCapsule (
 

 static

 void

+Version (

+  VOID

+  );

+

+static

+void

 Usage (

   VOID

   );

@@ -273,7 +282,7 @@ Returns:
   //

   // Specify our program name to the error printing routines.

   //

-  SetUtilityName (PROGRAM_NAME);

+  SetUtilityName (UTILITY_NAME);

   //

   // Process the command-line arguments

   //

@@ -2355,10 +2364,22 @@ Returns:
   Argc--;

   Argv++;

 

-  if (Argc == 0) {

+  if (Argc < 1) {

     Usage ();

     return STATUS_ERROR;

   }

+  

+  if ((strcmp(Argv[0], "-h") == 0) || (strcmp(Argv[0], "--help") == 0) ||

+      (strcmp(Argv[0], "-?") == 0) || (strcmp(Argv[0], "/?") == 0)) {

+    Usage();

+    return STATUS_ERROR;

+  }

+  

+  if ((strcmp(Argv[0], "-V") == 0) || (strcmp(Argv[0], "--version") == 0)) {

+    Version();

+    return STATUS_ERROR;

+  }

+ 

   //

   // Process until no more options

   //

@@ -2623,6 +2644,31 @@ Returns:
 }

 

 static

+void 

+Version(

+  void

+  )

+/*++

+

+Routine Description:

+

+  Print out version information for this utility.

+

+Arguments:

+

+  None

+  

+Returns:

+

+  None

+  

+--*/ 

+{

+  printf ("%s v%d.%d -EDK utility to create a capsule header.\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION);

+  printf ("Copyright (c) 1999-2006 Intel Corporation. All rights reserved.\n");

+}

+

+static

 void

 Usage (

   VOID

@@ -2645,13 +2691,13 @@ Returns:
 {

   int               Index;

   static const char *Str[] = {

-    PROGRAM_NAME " -- create a capsule header",

-    "  Usage: "PROGRAM_NAME " {options} [CapsuleFV]",

+    "\nUsage: "UTILITY_NAME " {options} [CapsuleFV]",

     //

     // {FfsFileNames}",

     //

     "    Options include:",

-    "      -h or -?         for this help information",

+    "      -h,--help,-?,/?  to display help messages",

+    "      -V,--version     to display version information",

     "      -script fname    to take capsule header info from unicode script",

     "                       file fname",

     "      -o fname         write output to file fname (required)",

@@ -2668,6 +2714,9 @@ Returns:
     //

     NULL

   };

+  

+  Version();

+  

   for (Index = 0; Str[Index] != NULL; Index++) {

     fprintf (stdout, "%s\n", Str[Index]);

   }

diff --git a/Tools/CCode/Source/Strip/Strip.c b/Tools/CCode/Source/Strip/Strip.c
index 6215ca8..f7820bc 100644
--- a/Tools/CCode/Source/Strip/Strip.c
+++ b/Tools/CCode/Source/Strip/Strip.c
@@ -50,7 +50,7 @@ Returns:
   

 --*/ 

 {

-  printf ("%s v%d.%d -EDK Convert EXE to BIN\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION);

+  printf ("%s v%d.%d -EDK Utility to Convert EXE to BIN\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION);

   printf ("Copyright (c) 2005-2006 Intel Corporation. All rights reserved.\n");

 }