diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-01-23 10:12:32 +0100 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-01-23 10:12:32 +0100 |
commit | bd5237f6a74f8fce82cbc8d01bcddfffb1c24db8 (patch) | |
tree | 2d0b86093869711e42b48fc9c7f0172512276c5e /ACE | |
parent | 9db0e672b8ba899b66722f89200152402418c5f1 (diff) | |
download | ATCD-bd5237f6a74f8fce82cbc8d01bcddfffb1c24db8.tar.gz |
Use micro version instead of beta version
* ACE/ace/ACE.cpp:
* ACE/ace/ace.rc:
* ACE/bin/generate_doxygen.pl:
* ACE/tests/CDR_Array_Test.cpp:
* ACE/tests/CDR_File_Test.cpp:
* ACE/tests/CDR_Test.cpp:
* ACE/tests/Codecs_Test.cpp:
* TAO/orbsvcs/orbsvcs/AV.rc:
* TAO/orbsvcs/orbsvcs/CosConcurrency.rc:
* TAO/orbsvcs/orbsvcs/CosEvent.rc:
* TAO/orbsvcs/orbsvcs/CosEvent_Serv.rc:
* TAO/orbsvcs/orbsvcs/CosEvent_Skel.rc:
* TAO/orbsvcs/orbsvcs/CosLifeCycle.rc:
* TAO/orbsvcs/orbsvcs/CosLoadBalancing.rc:
* TAO/orbsvcs/orbsvcs/CosNaming.rc:
* TAO/orbsvcs/orbsvcs/CosNaming_Serv.rc:
* TAO/orbsvcs/orbsvcs/CosNaming_Skel.rc:
* TAO/orbsvcs/orbsvcs/CosNotification.rc:
* TAO/orbsvcs/orbsvcs/CosNotification_Serv.rc:
* TAO/orbsvcs/orbsvcs/CosNotification_Skel.rc:
* TAO/orbsvcs/orbsvcs/CosProperty.rc:
* TAO/orbsvcs/orbsvcs/CosTime.rc:
* TAO/orbsvcs/orbsvcs/CosTrading.rc:
* TAO/orbsvcs/orbsvcs/CosTrading_Serv.rc:
* TAO/orbsvcs/orbsvcs/CosTrading_Skel.rc:
* TAO/orbsvcs/orbsvcs/DsEventLogAdmin.rc:
* TAO/orbsvcs/orbsvcs/DsLogAdmin.rc:
* TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.rc:
* TAO/orbsvcs/orbsvcs/FaultTolerance.rc:
* TAO/orbsvcs/orbsvcs/IFRService.rc:
* TAO/orbsvcs/orbsvcs/PortableGroup.rc:
* TAO/orbsvcs/orbsvcs/RTEvent.rc:
* TAO/orbsvcs/orbsvcs/RTEvent_Serv.rc:
* TAO/orbsvcs/orbsvcs/RTEvent_Skel.rc:
* TAO/orbsvcs/orbsvcs/RTSched.rc:
* TAO/orbsvcs/orbsvcs/RTSchedEvent.rc:
* TAO/orbsvcs/orbsvcs/RT_Notification.rc:
* TAO/orbsvcs/orbsvcs/SSLIOP.rc:
* TAO/orbsvcs/orbsvcs/Security.rc:
* TAO/orbsvcs/orbsvcs/Svc_Utils.rc:
* TAO/tao/AnyTypeCode/TAO_AnyTypeCode.rc:
* TAO/tao/BiDir_GIOP/TAO_BiDir_GIOP.rc:
* TAO/tao/CodecFactory/TAO_CodecFactory.rc:
* TAO/tao/Codeset/TAO_Codeset.rc:
* TAO/tao/Compression/TAO_Compression.rc:
* TAO/tao/Compression/bzip2/TAO_Bzip2Compressor.rc:
* TAO/tao/Compression/lzo/TAO_LzoCompressor.rc:
* TAO/tao/Compression/rle/TAO_RLECompressor.rc:
* TAO/tao/Compression/zlib/TAO_ZlibCompressor.rc:
* TAO/tao/DynamicAny/TAO_DynamicAny.rc:
* TAO/tao/DynamicInterface/TAO_DynamicInterface.rc:
* TAO/tao/IFR_Client/TAO_IFR_Client.rc:
* TAO/tao/IORInterceptor/TAO_IORInterceptor.rc:
* TAO/tao/IORManipulation/TAO_IORManip.rc:
* TAO/tao/IORTable/TAO_Async_IORTable.rc:
* TAO/tao/IORTable/TAO_IORTable.rc:
* TAO/tao/ImR_Client/TAO_IMR_Client.rc:
* TAO/tao/Messaging/TAO_Messaging.rc:
* TAO/tao/ObjRefTemplate/TAO_ObjRefTemplate.rc:
* TAO/tao/PI/TAO_PI.rc:
* TAO/tao/PI_Server/TAO_PI_Server.rc:
* TAO/tao/PortableServer/TAO_PortableServer.rc:
* TAO/tao/RTCORBA/TAO_RTCORBA.rc:
* TAO/tao/RTPortableServer/TAO_RTPortableServer.rc:
* TAO/tao/RTScheduling/TAO_RTScheduler.rc:
* TAO/tao/SmartProxies/SmartProxies.rc:
* TAO/tao/Strategies/TAO_Strategies.rc:
* TAO/tao/TypeCodeFactory/TypeCodeFactory.rc:
* TAO/tao/Utils/TAO_Utils.rc:
* TAO/tao/Valuetype/TAO_Valuetype.rc:
* TAO/tao/ZIOP/TAO_ZIOP.rc:
* TAO/tao/tao.rc:
* TAO/tests/ZIOP/TestCompressor/TAO_TestCompressor.rc:
Diffstat (limited to 'ACE')
-rw-r--r-- | ACE/ace/ACE.cpp | 2 | ||||
-rw-r--r-- | ACE/ace/ace.rc | 4 | ||||
-rwxr-xr-x | ACE/bin/generate_doxygen.pl | 10 | ||||
-rw-r--r-- | ACE/tests/CDR_Array_Test.cpp | 2 | ||||
-rw-r--r-- | ACE/tests/CDR_File_Test.cpp | 2 | ||||
-rw-r--r-- | ACE/tests/CDR_Test.cpp | 2 | ||||
-rw-r--r-- | ACE/tests/Codecs_Test.cpp | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp index 7a1b38b2bf0..c684ce76153 100644 --- a/ACE/ace/ACE.cpp +++ b/ACE/ace/ACE.cpp @@ -105,7 +105,7 @@ ACE::minor_version () u_int ACE::beta_version () { - return ACE_BETA_VERSION; + return ACE_MICRO_VERSION; } u_int diff --git a/ACE/ace/ace.rc b/ACE/ace/ace.rc index 54792491900..00a332dbe37 100644 --- a/ACE/ace/ace.rc +++ b/ACE/ace/ace.rc @@ -1,8 +1,8 @@ #include "Version.h" 1 VERSIONINFO - FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_BETA_VERSION,0 - PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_BETA_VERSION,0 + FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0 + PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0 FILEFLAGSMASK 0x3fL FILEFLAGS 0x0L FILEOS 0x4L diff --git a/ACE/bin/generate_doxygen.pl b/ACE/bin/generate_doxygen.pl index 679c6fcf85c..3827290f7d2 100755 --- a/ACE/bin/generate_doxygen.pl +++ b/ACE/bin/generate_doxygen.pl @@ -300,7 +300,7 @@ sub run_doxy { sub get_versions () { my $KIT = shift; my $VERSION_FILE = shift; - my ($major_version, $minor_version, $beta_version); + my ($major_version, $minor_version, $micro_version); open (VERSION, '<'.$VERSION_FILE) || die "$0: unable to open $VERSION_FILE\n"; @@ -309,23 +309,23 @@ sub get_versions () { if (/$KIT version (\d+)\.(\d+)\.(\d+)/) { $major_version = $1; $minor_version = $2; - $beta_version = $3; + $micro_version = $3; last; } elsif (/$KIT version (\d+)\.(\d+)[^\.]/) { #### Previous release was a minor. $major_version = $1; $minor_version = $2; - $beta_version = '0'; + $micro_version = '0'; last; } elsif (/$KIT version (\d+)[^\.]/) { #### Previous release was a major. $major_version = $1; $minor_version = '0'; - $beta_version = '0'; + $micro_version = '0'; last; } } close VERSION; - return ($major_version, $minor_version, $beta_version); + return ($major_version, $minor_version, $micro_version); } diff --git a/ACE/tests/CDR_Array_Test.cpp b/ACE/tests/CDR_Array_Test.cpp index ed088cf2c29..d20d9b9123d 100644 --- a/ACE/tests/CDR_Array_Test.cpp +++ b/ACE/tests/CDR_Array_Test.cpp @@ -893,7 +893,7 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_TEXT ("This is ACE Version %u.%u.%u\n\n"), ACE::major_version (), ACE::minor_version(), - ACE::beta_version())); + ACE::micro_version())); ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("d:f:q:w:h:c:t:n:")); int dtotal = 0; diff --git a/ACE/tests/CDR_File_Test.cpp b/ACE/tests/CDR_File_Test.cpp index c10f0c2323a..edc6c8d8fd8 100644 --- a/ACE/tests/CDR_File_Test.cpp +++ b/ACE/tests/CDR_File_Test.cpp @@ -338,7 +338,7 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_TEXT ("This is ACE Version %u.%u.%u\n\n"), ACE::major_version (), ACE::minor_version (), - ACE::beta_version ())); + ACE::micro_version ())); ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("f:rw")); int opt; diff --git a/ACE/tests/CDR_Test.cpp b/ACE/tests/CDR_Test.cpp index 283f5a9e1ae..fa140dc5c65 100644 --- a/ACE/tests/CDR_Test.cpp +++ b/ACE/tests/CDR_Test.cpp @@ -852,7 +852,7 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_TEXT ("This is ACE Version %u.%u.%u\n\n"), ACE::major_version (), ACE::minor_version(), - ACE::beta_version())); + ACE::micro_version())); ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("dn:l:")); int opt; diff --git a/ACE/tests/Codecs_Test.cpp b/ACE/tests/Codecs_Test.cpp index 0bbcb4ce81c..c851b26c08e 100644 --- a/ACE/tests/Codecs_Test.cpp +++ b/ACE/tests/Codecs_Test.cpp @@ -88,7 +88,7 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_TEXT ("This is ACE Version %u.%u.%u\n\n"), ACE::major_version (), ACE::minor_version(), - ACE::beta_version())); + ACE::micro_version())); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Testing ACE Base64 - normal stream\n\n"))); |