Updated GenBootSector, GenCrc32 and GenPage to remove duplicate “Build” word in the version output, updated the minor number and copyright as needed.

Updated the VolInfo version output to remove the tool description from the --version output string.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lhauch <larry.hauch@intel.com>
Reviewed-by: Gao, Liming <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15924 6f19259b-4bc3-4df7-8a09-765794883524

4 files changed, 12 insertions, 11 deletions

diff --git a/BaseTools/Source/C/GenBootSector/GenBootSector.c b/BaseTools/Source/C/GenBootSector/GenBootSector.c
index 6ca86ae555..c13b57735e 100644
--- a/BaseTools/Source/C/GenBootSector/GenBootSector.c
+++ b/BaseTools/Source/C/GenBootSector/GenBootSector.c
@@ -39,7 +39,7 @@ Abstract:
 // Utility version information

 //

 #define UTILITY_MAJOR_VERSION 0

-#define UTILITY_MINOR_VERSION 1

+#define UTILITY_MINOR_VERSION 2

 

 #define MAX_DRIVE                             26

 #define PARTITION_TABLE_OFFSET                0x1BE

@@ -542,7 +542,7 @@ Returns:
 

 --*/

 {

-  printf ("%s Version %d.%d Build%s\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION, __BUILD_VERSION);

+  printf ("%s Version %d.%d %s\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION, __BUILD_VERSION);

 }

 

 VOID

@@ -551,7 +551,7 @@ PrintUsage (
   )

 {

   printf ("Usage: GenBootSector [options] --cfg-file CFG_FILE\n\n\

-Copyright (c) 2009 - 2013, Intel Corporation.  All rights reserved.\n\n\

+Copyright (c) 2009 - 2014, Intel Corporation.  All rights reserved.\n\n\

   Utility to retrieve and update the boot sector or MBR.\n\n\

 optional arguments:\n\

   -h, --help            Show this help message and exit\n\

diff --git a/BaseTools/Source/C/GenCrc32/GenCrc32.c b/BaseTools/Source/C/GenCrc32/GenCrc32.c
index a2ff5880d5..bc245fc94e 100644
--- a/BaseTools/Source/C/GenCrc32/GenCrc32.c
+++ b/BaseTools/Source/C/GenCrc32/GenCrc32.c
@@ -29,7 +29,7 @@ Abstract:
 

 #define UTILITY_NAME            "GenCrc32"

 #define UTILITY_MAJOR_VERSION   0

-#define UTILITY_MINOR_VERSION   1

+#define UTILITY_MINOR_VERSION   2

 

 #define CRC32_NULL              0

 #define CRC32_ENCODE            1

@@ -55,7 +55,7 @@ Returns:
 

 --*/

 {

-  fprintf (stdout, "%s Version %d.%d Build %s \n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION, __BUILD_VERSION);

+  fprintf (stdout, "%s Version %d.%d %s \n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION, __BUILD_VERSION);

 }

 

 VOID

@@ -86,7 +86,7 @@ Returns:
   //

   // Copyright declaration

   // 

-  fprintf (stdout, "Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.\n\n");

+  fprintf (stdout, "Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.\n\n");

 

   //

   // Details Option

diff --git a/BaseTools/Source/C/GenPage/GenPage.c b/BaseTools/Source/C/GenPage/GenPage.c
index b6a5d01e3e..cb34a0719c 100644
--- a/BaseTools/Source/C/GenPage/GenPage.c
+++ b/BaseTools/Source/C/GenPage/GenPage.c
@@ -69,7 +69,7 @@ UINT32 gPageTableOffsetInFile = EFI_PAGE_BASE_OFFSET_IN_LDR;
 // Utility version information

 //

 #define UTILITY_MAJOR_VERSION 0

-#define UTILITY_MINOR_VERSION 1

+#define UTILITY_MINOR_VERSION 2

 

 void

 Version (

@@ -91,7 +91,7 @@ Returns:
 

 --*/

 {

-  printf ("%s Version %d.%d Build %s\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION, __BUILD_VERSION);

+  printf ("%s Version %d.%d %s\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION, __BUILD_VERSION);

 }

 

 VOID

@@ -100,7 +100,7 @@ Usage (
   )

 {

   printf ("Usage: GenPage.exe [options] EfiLoaderImageName \n\n\

-Copyright (c) 2008 - 2013, Intel Corporation.  All rights reserved.\n\n\

+Copyright (c) 2008 - 2014, Intel Corporation.  All rights reserved.\n\n\

   Utility to generate the EfiLoader image containing a page table.\n\n\

 optional arguments:\n\

   -h, --help            Show this help message and exit\n\

diff --git a/BaseTools/Source/C/VolInfo/VolInfo.c b/BaseTools/Source/C/VolInfo/VolInfo.c
index 537cea3cfe..9962d387a7 100644
--- a/BaseTools/Source/C/VolInfo/VolInfo.c
+++ b/BaseTools/Source/C/VolInfo/VolInfo.c
@@ -51,7 +51,7 @@ Abstract:
 EFI_GUID  gEfiCrc32GuidedSectionExtractionProtocolGuid = EFI_CRC32_GUIDED_SECTION_EXTRACTION_PROTOCOL_GUID;

 

 #define UTILITY_MAJOR_VERSION      0

-#define UTILITY_MINOR_VERSION      82

+#define UTILITY_MINOR_VERSION      83

 

 #define UTILITY_NAME         "VolInfo"

 

@@ -172,7 +172,7 @@ Returns:
   //

   // Print utility header

   //

-  printf ("%s Tiano Firmware Volume FFS image info.  Version %d.%d %s, %s\n",

+  printf ("%s Version %d.%d %s, %s\n",

     UTILITY_NAME,

     UTILITY_MAJOR_VERSION,

     UTILITY_MINOR_VERSION,

@@ -1839,6 +1839,7 @@ Returns:
   // Copyright declaration

   // 

   fprintf (stdout, "Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.\n\n");

+  fprintf (stdout, "  Display Tiano Firmware Volume FFS image information\n\n");

 

   //

   // Details Option