Skip to content

Commit

Permalink
ACE+TAO-6_5_18
Browse files Browse the repository at this point in the history
  • Loading branch information
@jwillemsen
jwillemsen committed Aug 10, 2022
1 parent 9c337e8 commit 53d05cb
Show file tree
Hide file tree
Showing 10 changed files with 224 additions and 46 deletions.
82 changes: 82 additions & 0 deletions ACE/ChangeLogs/ACE-6_5_18
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
commit e8adb6ba4621e3eb9b25707c8757ba6a76656ffa
Author: Adam Mitz <mitza@objectcomputing.com>
Date: Fri Aug 5 10:16:59 2022 -0500

NEWS for next ACE6+TAO2 release

commit 77ac4bba5873b30ea47f445262f78aa55985dacd
Author: Son Dinh <dinhs@objectcomputing.com>
Date: Wed Jul 13 10:58:09 2022 -0500

Add header and footer for stuck stacks

commit 50f69436f7a6d656a89ef995a8025e3ad244cff1
Author: Timothy Simpson <simpsont@objectcomputing.com>
Date: Mon Jul 11 18:39:52 2022 -0500

Update ACE/ace/Synch_Options.h

Co-authored-by: Adam Mitz <mitza@objectcomputing.com>

commit 56b5f840e64cb7dce6c4b601386e36a73e49d463
Author: Timothy Simpson <simpsont@objectcomputing.com>
Date: Mon Jul 11 12:55:56 2022 -0500

per review

commit 7f2438525abef7fafb1ef2dabc53d16850c2f7d6
Author: Adam Mitz <mitza@objectcomputing.com>
Date: Mon Jun 27 11:15:20 2022 -0600

Merge pull request #1865 from mitza-oci/no_ifdef_anyops_ns

Removed ACE_ANY_OPS_USE_NAMESPACE as a compile-time option

(cherry picked from commit dbc6154a1b9c2782e78b4d0698364a0780a9a06d)

# Conflicts:
# ACE/ace/config-win32-borland.h
# TAO/NEWS
# TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp
# TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
# TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp
# TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
# TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
# TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
# TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
# TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp
# TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
# TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp
# TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
# TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp
# TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
# TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp
# TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp
# TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp
# TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
# TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp

commit 8dcfa002061c49db6327e3c68fbc587e58bebe05
Author: Adam Mitz <mitza@objectcomputing.com>
Date: Fri Jun 24 15:13:50 2022 -0600

Merge pull request #1864 from mitza-oci/g++12

GCC 12

(cherry picked from commit 94d132b173807bb55f8c7481a57a523b4f07ba7e)

# Conflicts:
# .github/workflows/linux.yml
# .github/workflows/macosx.yml
# TAO/NEWS
# TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp

commit af898a97d578ae2d68e29f064cd317369b0d04c3
Author: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Tue Jun 14 09:11:36 2022 +0200

Prepare for next 6.5.x release

* ACE/NEWS:
* TAO/NEWS:
2 changes: 1 addition & 1 deletion ACE/PROBLEM-REPORT-FORM
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
To: ace-bugs@list.isis.vanderbilt.edu
Subject: [area]: [synopsis]

ACE VERSION: 6.5.17
ACE VERSION: 6.5.18

HOST MACHINE and OPERATING SYSTEM:
If on Windows based OS's, which version of WINSOCK do you
Expand Down
2 changes: 1 addition & 1 deletion ACE/VERSION.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
This is ACE version 6.5.17, released Tue Jun 14 08:43:48 CEST 2022
This is ACE version 6.5.18, released Wed Aug 10 08:40:14 CEST 2022

If you have any problems with or questions about ACE, please send
e-mail to the ACE mailing list (ace-bugs@list.isis.vanderbilt.edu),
Expand Down
8 changes: 4 additions & 4 deletions ACE/ace/Version.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

#define ACE_MAJOR_VERSION 6
#define ACE_MINOR_VERSION 5
#define ACE_MICRO_VERSION 17
#define ACE_BETA_VERSION 17
#define ACE_VERSION "6.5.17"
#define ACE_VERSION_CODE 0x60511
#define ACE_MICRO_VERSION 18
#define ACE_BETA_VERSION 18
#define ACE_VERSION "6.5.18"
#define ACE_VERSION_CODE 0x60512
#define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
62 changes: 31 additions & 31 deletions ACE/debian/control
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Description: makefile, project, and workspace creator
* mpc-ace: generates project files for a single target
* mwc-ace: generates workspace files for a set of projects

Package: libace-6.5.17
Package: libace-6.5.18
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Expand All @@ -45,7 +45,7 @@ Description: C++ network programming framework
Package: libace-dev
Architecture: any
Section: libdevel
Depends: libace-6.5.17 (= ${binary:Version}), ${misc:Depends}
Depends: libace-6.5.18 (= ${binary:Version}), ${misc:Depends}
Suggests: libace-doc, pkg-config
Replaces: mpc-ace (<< 5.6.3-4)
Description: C++ network programming framework - development files
Expand All @@ -62,7 +62,7 @@ Description: C++ network programming framework - documentation
This package contains the ACE overview documentation, tutorials,
examples, and information regarding upstream development.

Package: libace-ssl-6.5.17
Package: libace-ssl-6.5.18
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Expand All @@ -73,12 +73,12 @@ Description: ACE secure socket layer library
Package: libace-ssl-dev
Architecture: any
Section: libdevel
Depends: libace-ssl-6.5.17 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
Depends: libace-ssl-6.5.18 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
Description: ACE secure socket layer library - development files
This package contains the header files and static library for the ACE
SSL library.

Package: libace-rmcast-6.5.17
Package: libace-rmcast-6.5.18
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Expand All @@ -92,12 +92,12 @@ Description: ACE reliable multicast library
Package: libace-rmcast-dev
Architecture: any
Section: libdevel
Depends: libace-rmcast-6.5.17 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
Depends: libace-rmcast-6.5.18 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
Description: ACE reliable multicast library - development files
This package contains the header files and static library for the ACE
reliable multicast library.

Package: libace-tmcast-6.5.17
Package: libace-tmcast-6.5.18
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Expand All @@ -111,12 +111,12 @@ Description: ACE transactional multicast library
Package: libace-tmcast-dev
Architecture: any
Section: libdevel
Depends: libace-tmcast-6.5.17 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
Depends: libace-tmcast-6.5.18 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
Description: ACE transactional multicast library - development files
This package contains the header files and static library for the ACE
transactional multicast library.

Package: libace-htbp-6.5.17
Package: libace-htbp-6.5.18
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Expand All @@ -130,12 +130,12 @@ Description: ACE protocol over HTTP tunneling library
Package: libace-htbp-dev
Architecture: any
Section: libdevel
Depends: libace-htbp-6.5.17 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
Depends: libace-htbp-6.5.18 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
Description: ACE protocol over HTTP tunneling library - development files
This package contains the header files and static library for the ACE
HTBP library.

Package: libace-inet-6.5.17
Package: libace-inet-6.5.18
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Expand All @@ -146,15 +146,15 @@ Description: ACE Inet protocol library
Package: libace-inet-dev
Architecture: any
Section: libdevel
Depends: libace-inet-6.5.17 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
Depends: libace-inet-6.5.18 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
Description: ACE Inet protocol library - development files
This package contains the header files and static library for the ACE
Inet protocol library.

Package: libace-inet-ssl-6.5.17
Package: libace-inet-ssl-6.5.18
Architecture: any
Section: libs
Depends: libace-inet-6.5.17, libace-ssl-6.5.17, ${shlibs:Depends}, ${misc:Depends}
Depends: libace-inet-6.5.18, libace-ssl-6.5.18, ${shlibs:Depends}, ${misc:Depends}
Description: ACE SSL-enabled Inet protocol library
This package provides an ACE addon library for clients (and possibly
servers at some point) using Inet protocols which support SSL, such as
Expand All @@ -163,7 +163,7 @@ Description: ACE SSL-enabled Inet protocol library
Package: libace-inet-ssl-dev
Architecture: any
Section: libdevel
Depends: libace-inet-ssl-6.5.17 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
Depends: libace-inet-ssl-6.5.18 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
Description: ACE SSL-enabled Inet protocol library - development files
This package contains the header files and static library for the ACE
SSL-enabled Inet protocol library.
Expand All @@ -180,7 +180,7 @@ Description: ACE perfect hash function generator
basically the same options and functionality. ace_gperf simply takes
advantage of some of the features provided by the ACE library.

Package: libacexml-6.5.17
Package: libacexml-6.5.18
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Expand All @@ -196,12 +196,12 @@ Package: libacexml-dev
Architecture: any
Section: libdevel
Replaces: libace-dev (<< 5.7.7-4)
Depends: libacexml-6.5.17 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
Depends: libacexml-6.5.18 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
Description: ACE SAX based XML parsing library - development files
This package contains the header files and static library for the ACE
XML parsing library.

Package: libace-xml-utils-6.5.17
Package: libace-xml-utils-6.5.18
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Expand All @@ -215,12 +215,12 @@ Package: libace-xml-utils-dev
Architecture: any
Section: libdevel
Replaces: libace-dev (<< 5.7.7-4)
Depends: libace-xml-utils-6.5.17 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
Depends: libace-xml-utils-6.5.18 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
Description: ACE XML utility classes and methods - development files
This package contains the header files and static library for the ACE XML
Utils library

Package: libkokyu-6.5.17
Package: libkokyu-6.5.18
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Expand All @@ -234,12 +234,12 @@ Description: ACE scheduling and dispatching library
Package: libkokyu-dev
Architecture: any
Section: libdevel
Depends: libkokyu-6.5.17 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
Depends: libkokyu-6.5.18 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
Description: ACE scheduling and dispatching library - development files
This package contains the header files and static library for the ACE
scheduling and dispatching library.

Package: libace-xtreactor-6.5.17
Package: libace-xtreactor-6.5.18
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Expand All @@ -257,12 +257,12 @@ Description: ACE-GUI reactor integration for Xt
Package: libace-xtreactor-dev
Architecture: any
Section: libdevel
Depends: libace-xtreactor-6.5.17 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
Depends: libace-xtreactor-6.5.18 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
Description: ACE-GUI reactor integration for Xt - development files
This package contains header files and static library for the ACE-Xt
reactor integration.

Package: libace-tkreactor-6.5.17
Package: libace-tkreactor-6.5.18
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Expand All @@ -281,12 +281,12 @@ Description: ACE-GUI reactor integration for Tk
Package: libace-tkreactor-dev
Architecture: any
Section: libdevel
Depends: libace-tkreactor-6.5.17 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
Depends: libace-tkreactor-6.5.18 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
Description: ACE-GUI reactor integration for Tk - development files
This package contains header files and static library for the ACE-Tk
reactor integration.

Package: libace-flreactor-6.5.17
Package: libace-flreactor-6.5.18
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Expand All @@ -304,12 +304,12 @@ Description: ACE-GUI reactor integration for FLTK
Package: libace-flreactor-dev
Architecture: any
Section: libdevel
Depends: libace-flreactor-6.5.17 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends}
Depends: libace-flreactor-6.5.18 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends}
Description: ACE-GUI reactor integration for FLTK - development files
This package contains header files and static library for the ACE-FLTK
reactor integration.

Package: libace-foxreactor-6.5.17
Package: libace-foxreactor-6.5.18
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Expand All @@ -326,7 +326,7 @@ Description: ACE-GUI reactor integration for FOX
Package: libace-foxreactor-dev
Architecture: any
Section: libdevel
Depends: libace-foxreactor-6.5.17 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
Depends: libace-foxreactor-6.5.18 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
Description: ACE-GUI reactor integration for FOX - development files
This package contains header files and static library for the ACE-FOX
reactor integration.
Expand All @@ -343,7 +343,7 @@ Description: ACE network service implementations
files to link the various ACE network services together, either
statically or dynamically, and form complete server programs.

Package: libnetsvcs-6.5.17
Package: libnetsvcs-6.5.18
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
Expand All @@ -357,7 +357,7 @@ Description: ACE network service implementations - libraries
Package: libnetsvcs-dev
Architecture: any
Section: libdevel
Depends: libnetsvcs-6.5.17 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
Depends: libnetsvcs-6.5.18 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
Description: ACE network service implementations - development files
ACE network services provide reusable components for common
distributed system tasks such as logging, naming, locking, and time
Expand Down
4 changes: 2 additions & 2 deletions ACE/rpmbuild/ace-tao.spec
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Set the version number here.
%define ACEVER 6.5.17
%define TAOVER 2.5.17
%define ACEVER 6.5.18
%define TAOVER 2.5.18

# Conditional build
# Default values are
Expand Down
Loading

0 comments on commit 53d05cb

Please sign in to comment.