Merge pull request #2321 from jwillemsen/jwi-PATCHversion

Add PATCH and TAO_PATCH as postfix strings for the versions printed by tao_idl/ifr to let the user set its own patch postfix

Author: jwillemsen

ACE/ace/Version.h

@@ -7,4 +7,7 @@
 #define ACE_MICRO_VERSION 2
 #define ACE_VERSION "8.0.2"
 #define ACE_VERSION_CODE 0x80002
+#if !defined (ACE_PATCH)
+# define ACE_PATCH ""
+#endif
 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))

ACE/bin/make_release.py

@@ -230,6 +230,9 @@ def update_version_files (component):
 #define {comp}_MICRO_VERSION {micro}
 #define {comp}_VERSION \"{version}\"
 #define {comp}_VERSION_CODE 0x{code:x}
+#if !defined ({comp}_PATCH)
+# define {comp}_PATCH \"\"
+#endif
 #define {comp}_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
 """.format(**parts)
 

TAO/TAO_IDL/be/be_helper.cpp

@@ -24,7 +24,7 @@
 static const char copyright[] =
 "// -*- C++ -*-\n"
 "/**\n"
-" * Code generated by the The ACE ORB (TAO) IDL Compiler v" TAO_VERSION "\n"
+" * Code generated by the The ACE ORB (TAO) IDL Compiler v" TAO_VERSION TAO_PATCH "\n"
 " * TAO and the TAO IDL Compiler have been developed by:\n"
 " *       Center for Distributed Object Computing\n"
 " *       Washington University\n"

TAO/TAO_IDL/be/be_init.cpp

@@ -6,7 +6,7 @@ TAO_IDL_BE_Export void
 BE_version ()
 {
   ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("TAO_IDL_BE, version ") ACE_TEXT (TAO_VERSION)
+              ACE_TEXT ("TAO_IDL_BE, version ") ACE_TEXT (TAO_VERSION) ACE_TEXT (TAO_PATCH)
               ACE_TEXT ("\n")));
 }
 

TAO/TAO_IDL/tao_idl.cpp

@@ -100,9 +100,10 @@ DRV_version ()
 {
   ACE_DEBUG ((LM_DEBUG,
               "%C\n"
-              "TAO_IDL_FE, version %s (Based on Sun IDL FE, version %s)\n",
+              "TAO_IDL_FE, version %s%s (Based on Sun IDL FE, version %s)\n",
               idl_global->prog_name (),
               ACE_TEXT (TAO_VERSION),
+              ACE_TEXT (TAO_PATCH),
               ACE_TEXT (SUN_IDL_FE_VERSION)));
 
   BE_version ();

TAO/orbsvcs/IFR_Service/be_init.cpp

@@ -89,9 +89,10 @@ TAO_IFR_BE_Export void
 BE_version ()
 {
   ORBSVCS_DEBUG ((LM_DEBUG,
-              "%s %s\n",
+              "%s %s%s\n",
               ACE_TEXT ("TAO_IFR_BE, version"),
-              ACE_TEXT (TAO_VERSION)));
+              ACE_TEXT (TAO_VERSION),
+              ACE_TEXT (TAO_PATCH)));
 }
 
 TAO_IFR_BE_Export int

TAO/tao/Version.h

@@ -7,4 +7,7 @@
 #define TAO_MICRO_VERSION 2
 #define TAO_VERSION "4.0.2"
 #define TAO_VERSION_CODE 0x40002
+#if !defined (TAO_PATCH)
+# define TAO_PATCH ""
+#endif
 #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))