diff options
104 files changed, 169 insertions, 437 deletions
diff --git a/ACE/Kokyu/docs/Kokyu.html b/ACE/Kokyu/docs/Kokyu.html index fb1b0905e3a..e785f949859 100644 --- a/ACE/Kokyu/docs/Kokyu.html +++ b/ACE/Kokyu/docs/Kokyu.html @@ -357,7 +357,7 @@ interface is in <tt>Kokyu::DSRT_Dispatcher (Kokyu_dsrt.h)</tt> <h3> <a NAME="Status"></a>Current status</h3> Kokyu dispatching framework is available as a separate module under <tt><font size=+1>ACE_wrappers/Kokyu</font></tt> -as part of the <a href="http://download.dre.vanderbilt.edu">ACE/TAO +as part of the <a href="https://download.dre.vanderbilt.edu">ACE/TAO distribution</a>. Note that this module is not dependent on TAO, though it is built on top of ACE. The TAO Event Channel uses the Strategy and Service Configurator patterns to use configurable dispatching modules. @@ -1,6 +1,12 @@ USER VISIBLE CHANGES BETWEEN ACE-6.5.8 and ACE-6.5.9 ==================================================== +. On Windows, ACE no longer defines _WIN32_WINNT. ACE wrappers for + if_nametoindex and if_indextoname are available if the version of the + Windows SDK supports them. + +. IPv6 extended datagram receive info now supported on macOS. + USER VISIBLE CHANGES BETWEEN ACE-6.5.7 and ACE-6.5.8 ==================================================== diff --git a/ACE/README b/ACE/README index b068df84d95..cf0a7af3e21 100644 --- a/ACE/README +++ b/ACE/README @@ -148,7 +148,7 @@ applications provided with the ACE release include: OBTAINING ACE ACE may be obtained electronically from -http://download.dre.vanderbilt.edu. This release contains the source +https://download.dre.vanderbilt.edu. This release contains the source code, test drivers, and example applications (including JAWS) for C++ wrapper libraries and the higher-level ACE network programming framework developed as part of the ADAPTIVE project at the University diff --git a/ACE/ace/DLL_Manager.h b/ACE/ace/DLL_Manager.h index 66ca5f09911..3a98d2200be 100644 --- a/ACE/ace/DLL_Manager.h +++ b/ACE/ace/DLL_Manager.h @@ -28,7 +28,6 @@ #define ACE_DEFAULT_DLL_MANAGER_SIZE 1024 - ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** @@ -267,7 +266,6 @@ public: ACE_ALLOC_HOOK_DECLARE; protected: - /// Default constructor. ACE_DLL_Manager (int size = ACE_DLL_Manager::DEFAULT_SIZE); diff --git a/ACE/ace/FIFO_Send.h b/ACE/ace/FIFO_Send.h index 37580662b02..4c885df4be8 100644 --- a/ACE/ace/FIFO_Send.h +++ b/ACE/ace/FIFO_Send.h @@ -8,7 +8,6 @@ */ //========================================================================== - #ifndef ACE_FIFO_SEND_H #define ACE_FIFO_SEND_H diff --git a/ACE/ace/Malloc.cpp b/ACE/ace/Malloc.cpp index 0984ac100a4..874b7b75bc0 100644 --- a/ACE/ace/Malloc.cpp +++ b/ACE/ace/Malloc.cpp @@ -14,11 +14,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Process-wide ACE_Allocator. ACE_Allocator *ACE_Allocator::allocator_ = 0; -// Controls whether the Allocator is deleted when we shut down (we can -// only delete it safely if we created it!) This is no longer used; -// see ACE_Allocator::instance (void). -int ACE_Allocator::delete_allocator_ = 0; - void ACE_Control_Block::ACE_Malloc_Header::dump (void) const { diff --git a/ACE/ace/Malloc_Allocator.cpp b/ACE/ace/Malloc_Allocator.cpp index 31834e3c8fa..58543303d9b 100644 --- a/ACE/ace/Malloc_Allocator.cpp +++ b/ACE/ace/Malloc_Allocator.cpp @@ -68,10 +68,8 @@ ACE_Allocator::instance (ACE_Allocator *r) *ACE_Static_Object_Lock::instance (), 0)); ACE_Allocator *t = ACE_Allocator::allocator_; - // We can't safely delete it since we don't know who created it! - ACE_Allocator::delete_allocator_ = 0; - ACE_Allocator::allocator_ = r; + return t; } @@ -79,18 +77,6 @@ void ACE_Allocator::close_singleton (void) { ACE_TRACE ("ACE_Allocator::close_singleton"); - - ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, - *ACE_Static_Object_Lock::instance ())); - - if (ACE_Allocator::delete_allocator_) - { - // This should never be executed.... See the - // ACE_Allocator::instance (void) method for an explanation. - delete ACE_Allocator::allocator_; - ACE_Allocator::allocator_ = 0; - ACE_Allocator::delete_allocator_ = 0; - } } ACE_Allocator::~ACE_Allocator (void) diff --git a/ACE/ace/Malloc_Base.h b/ACE/ace/Malloc_Base.h index b2690699226..69bcf14268a 100644 --- a/ACE/ace/Malloc_Base.h +++ b/ACE/ace/Malloc_Base.h @@ -67,7 +67,7 @@ public: /// Allocate @a nbytes, giving them @a initial_value. virtual void *calloc (size_type nbytes, char initial_value = '\0') = 0; - /// Allocate <n_elem> each of size @a elem_size, giving them + /// Allocate @a n_elem each of size @a elem_size, giving them /// @a initial_value. virtual void *calloc (size_type n_elem, size_type elem_size, @@ -157,9 +157,6 @@ private: /// Pointer to a process-wide ACE_Allocator instance. static ACE_Allocator *allocator_; - - /// Must delete the <allocator_> if non-0. - static int delete_allocator_; }; /** diff --git a/ACE/ace/Managed_Object.h b/ACE/ace/Managed_Object.h index 48292bb5509..207c0abfc35 100644 --- a/ACE/ace/Managed_Object.h +++ b/ACE/ace/Managed_Object.h @@ -137,12 +137,10 @@ public: // on AIX 4.1 w/xlC v. 3.01. protected: - // Disallow instantiation of this class. ACE_UNIMPLEMENTED_FUNC (ACE_Managed_Object (void)) private: - ACE_UNIMPLEMENTED_FUNC (ACE_Managed_Object (const ACE_Managed_Object<TYPE> &)) ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Managed_Object<TYPE> &)) }; diff --git a/ACE/ace/OS_NS_sys_socket.h b/ACE/ace/OS_NS_sys_socket.h index d7e7524a6ad..faa6cd9bdfb 100644 --- a/ACE/ace/OS_NS_sys_socket.h +++ b/ACE/ace/OS_NS_sys_socket.h @@ -65,9 +65,7 @@ #endif #if defined (ACE_HAS_IPV6) -#if defined (IPV6_PKTINFO) -#define ACE_RECVPKTINFO6 IPV6_PKTINFO -#elif defined (IPV6_RECVPKTINFO) +#if defined (IPV6_RECVPKTINFO) #define ACE_RECVPKTINFO6 IPV6_RECVPKTINFO #endif #endif @@ -276,7 +274,6 @@ namespace ACE_OS int shutdown (ACE_HANDLE handle, int how); -#if defined (ACE_LINUX) && defined (ACE_HAS_IPV6) ACE_NAMESPACE_INLINE_FUNCTION unsigned int if_nametoindex (const char *ifname); @@ -288,7 +285,6 @@ namespace ACE_OS ACE_NAMESPACE_INLINE_FUNCTION void if_freenameindex (struct if_nameindex *ptr); -#endif /* ACE_LINUX && ACE_HAS_IPV6 */ /// Initialize WinSock before first use (e.g., when a DLL is first /// loaded or the first use of a socket() call. diff --git a/ACE/ace/OS_NS_sys_socket.inl b/ACE/ace/OS_NS_sys_socket.inl index 484e1f4ff00..3da4104198e 100644 --- a/ACE/ace/OS_NS_sys_socket.inl +++ b/ACE/ace/OS_NS_sys_socket.inl @@ -1020,54 +1020,52 @@ ACE_OS::socketpair (int domain, int type, #endif /* ACE_LACKS_SOCKETPAIR */ } -#if defined (ACE_LINUX) && defined (ACE_HAS_IPV6) ACE_INLINE unsigned int ACE_OS::if_nametoindex (const char *ifname) { ACE_OS_TRACE ("ACE_OS::if_nametoindex"); -#if defined (ACE_LACKS_IF_NAME_INDEX) +#ifdef ACE_LACKS_IF_NAMETOINDEX ACE_UNUSED_ARG (ifname); ACE_NOTSUP_RETURN (0); #else ACE_OSCALL_RETURN (::if_nametoindex (ifname), int, 0); -#endif /* ACE_LACKS_IF_NAME_INDEX */ +#endif /* ACE_LACKS_IF_NAMETOINDEX */ } ACE_INLINE char * ACE_OS::if_indextoname (unsigned int ifindex, char *ifname) { ACE_OS_TRACE ("ACE_OS::if_indextoname"); -#if defined (ACE_LACKS_IF_NAME_INDEX) +#ifdef ACE_LACKS_IF_NAMETOINDEX ACE_UNUSED_ARG (ifindex); ACE_UNUSED_ARG (ifname); ACE_NOTSUP_RETURN (0); #else ACE_OSCALL_RETURN (::if_indextoname (ifindex, ifname), char *, 0); -#endif /* ACE_LACKS_IF_NAME_INDEX */ +#endif /* ACE_LACKS_IF_NAMETOINDEX */ } ACE_INLINE struct if_nameindex * ACE_OS::if_nameindex (void) { ACE_OS_TRACE ("ACE_OS::if_nameindex"); -#if defined (ACE_LACKS_IF_NAME_INDEX) +#ifdef ACE_LACKS_IF_NAMEINDEX ACE_NOTSUP_RETURN (0); #else ACE_OSCALL_RETURN (::if_nameindex (), struct if_nameindex *, 0); -#endif /* ACE_LACKS_IF_NAME_INDEX */ +#endif /* ACE_LACKS_IF_NAMEINDEX */ } ACE_INLINE void ACE_OS::if_freenameindex (struct if_nameindex *ptr) { ACE_OS_TRACE ("ACE_OS::if_freenameindex"); -#if defined (ACE_LACKS_IF_NAME_INDEX) +#ifdef ACE_LACKS_IF_NAMEINDEX ACE_UNUSED_ARG (ptr); #else if (ptr != 0) ::if_freenameindex (ptr); -#endif /* ACE_LACKS_IF_NAME_INDEX */ +#endif /* ACE_LACKS_IF_NAMEINDEX */ } -#endif /* ACE_LINUX && ACE_HAS_IPV6 */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/SOCK_Dgram.cpp b/ACE/ace/SOCK_Dgram.cpp index d70d8a84b78..17b00ad015e 100644 --- a/ACE/ace/SOCK_Dgram.cpp +++ b/ACE/ace/SOCK_Dgram.cpp @@ -729,12 +729,11 @@ ACE_SOCK_Dgram::make_multicast_ifaddr6 (ipv6_mreq *ret_mreq, 0, sizeof (lmreq)); -#if defined(ACE_LINUX) +#ifndef ACE_LACKS_IF_NAMETOINDEX if (net_if != 0) { - lmreq.ipv6mr_interface = ACE_OS::if_nametoindex (ACE_TEXT_ALWAYS_CHAR(net_if)); + lmreq.ipv6mr_interface = ACE_OS::if_nametoindex (ACE_TEXT_ALWAYS_CHAR (net_if)); } - else #elif defined (ACE_WIN32) if (net_if != 0) { @@ -790,11 +789,9 @@ ACE_SOCK_Dgram::make_multicast_ifaddr6 (ipv6_mreq *ret_mreq, delete[] buf; // clean up } - else #else /* ACE_WIN32 */ ACE_UNUSED_ARG(net_if); #endif /* ACE_WIN32 */ - lmreq.ipv6mr_interface = 0; // now set the multicast address ACE_OS::memcpy (&lmreq.ipv6mr_multiaddr, @@ -807,6 +804,6 @@ ACE_SOCK_Dgram::make_multicast_ifaddr6 (ipv6_mreq *ret_mreq, return 0; } -#endif /* ACE_LINUX && ACE_HAS_IPV6 */ +#endif /* ACE_HAS_IPV6 */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/config-face-safety.h b/ACE/ace/config-face-safety.h index adfb8ca6630..b06fed1e5b0 100644 --- a/ACE/ace/config-face-safety.h +++ b/ACE/ace/config-face-safety.h @@ -305,7 +305,8 @@ # define ACE_LACKS_FSETPOS # define ACE_LACKS_GETC # define ACE_LACKS_GETTIMEOFDAY -# define ACE_LACKS_IF_NAME_INDEX +# define ACE_LACKS_IF_NAMEINDEX +# define ACE_LACKS_IF_NAMETOINDEX # define ACE_LACKS_IOCTL # define ACE_LACKS_LOCALECONV # define ACE_LACKS_MUNMAP diff --git a/ACE/ace/config-macosx-mojave.h b/ACE/ace/config-macosx-mojave.h index 6b0164b9e33..49bea758a61 100644 --- a/ACE/ace/config-macosx-mojave.h +++ b/ACE/ace/config-macosx-mojave.h @@ -1,6 +1,12 @@ #ifndef ACE_CONFIG_MACOSX_MOJAVE_H #define ACE_CONFIG_MACOSX_MOJAVE_H +// Get access to IPV6_RECVPKTINFO +// See http://lxr.nginx.org/ident?_i=__APPLE_USE_RFC_3542 +#ifndef __APPLE_USE_RFC_3542 +#define __APPLE_USE_RFC_3542 +#endif + #include "ace/config-macosx-highsierra.h" #endif // ACE_CONFIG_MACOSX_MOJAVE_H diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h index c9a4cf6abb2..30f06adb140 100644 --- a/ACE/ace/config-win32-common.h +++ b/ACE/ace/config-win32-common.h @@ -55,10 +55,6 @@ # endif /* !_FILE_OFFSET_BITS */ #endif /* _WIN64 || WIN64 */ -#if !defined (_WIN32_WINNT) -# define _WIN32_WINNT 0x0501 // pretend it's at least Windows XP or Win2003 -#endif - // If the invoking procedure turned off debugging by setting NDEBUG, then // also set ACE_NDEBUG, unless the user has already set it. #if defined (NDEBUG) @@ -71,7 +67,7 @@ // be defined, if your application uses MFC. // Setting applies to : building ACE // Runtime restrictions: MFC DLLs must be installed -// Additonal notes : If both ACE_HAS_MFC and ACE_MT_SAFE are +// Additional notes : If both ACE_HAS_MFC and ACE_MT_SAFE are // defined, the MFC DLL (not the static lib) // will be used from ACE. #if !defined (ACE_HAS_MFC) @@ -566,6 +562,14 @@ # define ACE_WSOCK_VERSION 1, 1 #endif /* ACE_HAS_WINSOCK2 */ +#if _WIN32_WINNT >= 0x400 +# define ACE_HAS_WIN32_TRYLOCK +#endif +#if _WIN32_WINNT < 0x600 +# define ACE_LACKS_IF_NAMETOINDEX +#endif +#define ACE_LACKS_IF_NAMEINDEX + // Platform supports IP multicast on Winsock 2 #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) # define ACE_HAS_IP_MULTICAST @@ -574,10 +578,12 @@ #if !defined (ACE_HAS_WINCE) # define ACE_HAS_INTERLOCKED_EXCHANGEADD #endif -#define ACE_HAS_WIN32_TRYLOCK #if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_PHARLAP) -# define ACE_HAS_SIGNAL_OBJECT_AND_WAIT + +# if _WIN32_WINNT >= 0x400 +# define ACE_HAS_SIGNAL_OBJECT_AND_WAIT +# endif // If CancelIO is undefined get the updated sp2-sdk from MS # define ACE_HAS_CANCEL_IO diff --git a/ACE/ace/os_include/net/os_if.h b/ACE/ace/os_include/net/os_if.h index e3cb6842340..ed85fa93d4d 100644 --- a/ACE/ace/os_include/net/os_if.h +++ b/ACE/ace/os_include/net/os_if.h @@ -40,6 +40,7 @@ #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) # include /**/ <ws2tcpip.h> +# include /**/ <iphlpapi.h> #endif /* ACE_HAS_WINSOCK2 */ // Place all additions (especially function declarations) within extern "C" {} @@ -101,6 +102,10 @@ struct ifconf { # define IFF_BROADCAST 0x2 #endif /* IFF_BROADCAST */ +#if defined ACE_HAS_WINSOCK2 && defined ACE_LACKS_IF_NAMEINDEX +struct if_nameindex {}; +#endif + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/ACE/debian/README.source b/ACE/debian/README.source index 744eb818d06..3493f77f589 100644 --- a/ACE/debian/README.source +++ b/ACE/debian/README.source @@ -8,7 +8,7 @@ and repackaged as using uscan: $ uscan --force-download --repack --verbose --watchfile debian/watch * ACE-src-<version>.tar.gz is retrieved from: - http://download.dre.vanderbilt.edu/previous_versions/ + https://download.dre.vanderbilt.edu/previous_versions/ The -src version does not contain pre-generated Makefiles. They are regenerated in the build process. diff --git a/ACE/debian/compat b/ACE/debian/compat deleted file mode 100644 index ec635144f60..00000000000 --- a/ACE/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/ACE/debian/control b/ACE/debian/control index 57bbcd77226..6a3370f491d 100644 --- a/ACE/debian/control +++ b/ACE/debian/control @@ -1,14 +1,14 @@ Source: ace Section: devel Priority: optional -Maintainer: Debian ACE+TAO maintainers <pkg-ace-devel@lists.alioth.debian.org> +Maintainer: Debian ACE maintainers <team+ace@tracker.debian.org> Uploaders: Thomas Girard <thomas.g.girard@free.fr>, Johnny Willemsen <jwillemsen@remedy.nl> -Build-Depends: debhelper, libssl-dev, libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), tk-dev (>= 8.5), libfox-1.6-dev, docbook-to-man, libxerces-c-dev +Build-Depends: debhelper-compat (=12), libssl-dev, libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), tk-dev (>= 8.5), libfox-1.6-dev, docbook-to-man, libxerces-c-dev Build-Depends-Indep: doxygen, graphviz -Standards-Version: 4.1.1 -Vcs-Git: git://anonscm.debian.org/pkg-ace/pkg-ace.git -Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-ace/pkg-ace.git;a=summary -Homepage: http://www.dre.vanderbilt.edu/~schmidt/ACE.html +Standards-Version: 4.5.0 +Vcs-Git: https://salsa.debian.org/debian/ace.git +Vcs-Browser: https://salsa.debian.org/debian/ace +Homepage: https://www.dre.vanderbilt.edu/~schmidt/ACE.html Package: mpc-ace Architecture: all diff --git a/ACE/debian/libace-6.5.8.install b/ACE/debian/libace-6.5.8.install deleted file mode 100644 index 182a5eda411..00000000000 --- a/ACE/debian/libace-6.5.8.install +++ /dev/null @@ -1,6 +0,0 @@ -usr/lib/libACE-*.so -usr/lib/libACE_ETCL-*.so -usr/lib/libACE_Monitor_Control-*.so -usr/lib/libACE_ETCL_Parser-*.so -usr/lib/libACE_RLECompression-*.so -usr/lib/libACE_Compression-*.so diff --git a/ACE/debian/libace-6.5.8.install.in b/ACE/debian/libace-6.5.8.install.in new file mode 100644 index 00000000000..b47b7240eaf --- /dev/null +++ b/ACE/debian/libace-6.5.8.install.in @@ -0,0 +1,6 @@ +usr/lib/libACE-*.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/libACE_ETCL-*.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/libACE_Monitor_Control-*.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/libACE_ETCL_Parser-*.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/libACE_RLECompression-*.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/libACE_Compression-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libace-6.5.8.lintian-overrides b/ACE/debian/libace-6.5.8.lintian-overrides deleted file mode 100644 index ccc1f750517..00000000000 --- a/ACE/debian/libace-6.5.8.lintian-overrides +++ /dev/null @@ -1,6 +0,0 @@ -libace-6.5.8: no-symbols-control-file usr/lib/libACE-6.5.8.so -libace-6.5.8: no-symbols-control-file usr/lib/libACE_ETCL_Parser-6.5.8.so -libace-6.5.8: no-symbols-control-file usr/lib/libACE_Monitor_Control-6.5.8.so -libace-6.5.8: no-symbols-control-file usr/lib/libACE_ETCL-6.5.8.so -libace-6.5.8: no-symbols-control-file usr/lib/libACE_RLECompression-6.5.8.so -libace-6.5.8: no-symbols-control-file usr/lib/libACE_Compression-6.5.8.so diff --git a/ACE/debian/libace-dev.install b/ACE/debian/libace-dev.install.in index aede4930d69..389465719b1 100644 --- a/ACE/debian/libace-dev.install +++ b/ACE/debian/libace-dev.install.in @@ -11,15 +11,15 @@ usr/include/ace/*.inl usr/include/ace/*.cpp usr/include/ace/os_include usr/include/ace/Compression -usr/lib/libACE.so +usr/lib/libACE.so usr/lib/@DEB_HOST_MULTIARCH@/ usr/include/ace/ETCL/*.h usr/include/ace/ETCL/*.inl usr/include/ace/Monitor_Control/*.h -usr/lib/libACE_ETCL_Parser.so -usr/lib/libACE_Monitor_Control.so -usr/lib/libACE_ETCL.so -usr/lib/libACE_Compression.so -usr/lib/libACE_RLECompression.so -usr/lib/pkgconfig/ACE.pc -usr/lib/pkgconfig/ACE_ETCL.pc -usr/lib/pkgconfig/ACE_ETCL_Parser.pc +usr/lib/libACE_ETCL_Parser.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/libACE_Monitor_Control.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/libACE_ETCL.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/libACE_Compression.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/libACE_RLECompression.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/pkgconfig/ACE.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ +usr/lib/pkgconfig/ACE_ETCL.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ +usr/lib/pkgconfig/ACE_ETCL_Parser.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ diff --git a/ACE/debian/libace-doc.doc-base.reference b/ACE/debian/libace-doc.doc-base.reference index ec00934fb7d..b20834cb4f2 100644 --- a/ACE/debian/libace-doc.doc-base.reference +++ b/ACE/debian/libace-doc.doc-base.reference @@ -6,5 +6,5 @@ Abstract: This set of documents provides help for developing applications Section: Programming/C++ Format: html -Index: /usr/share/doc/libace-doc/index.html -Files: /usr/share/doc/libace-doc/*.html +Index: /usr/share/doc/libace-dev/index.html +Files: /usr/share/doc/libace-dev/*.html diff --git a/ACE/debian/libace-flreactor-6.5.8.install b/ACE/debian/libace-flreactor-6.5.8.install deleted file mode 100644 index 528836aacee..00000000000 --- a/ACE/debian/libace-flreactor-6.5.8.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_FlReactor-*.so diff --git a/ACE/debian/libace-flreactor-6.5.8.install.in b/ACE/debian/libace-flreactor-6.5.8.install.in new file mode 100644 index 00000000000..c49638be388 --- /dev/null +++ b/ACE/debian/libace-flreactor-6.5.8.install.in @@ -0,0 +1 @@ +usr/lib/libACE_FlReactor-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libace-flreactor-6.5.8.lintian-overrides b/ACE/debian/libace-flreactor-6.5.8.lintian-overrides deleted file mode 100644 index 65de8107df3..00000000000 --- a/ACE/debian/libace-flreactor-6.5.8.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-flreactor-6.5.8: no-symbols-control-file usr/lib/libACE_FlReactor-6.5.8.so diff --git a/ACE/debian/libace-flreactor-dev.install b/ACE/debian/libace-flreactor-dev.install deleted file mode 100644 index 4de36ed5380..00000000000 --- a/ACE/debian/libace-flreactor-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/libACE_FlReactor.so -usr/include/ace/FlReactor -usr/lib/pkgconfig/ACE_FlReactor.pc diff --git a/ACE/debian/libace-flreactor-dev.install.in b/ACE/debian/libace-flreactor-dev.install.in new file mode 100644 index 00000000000..29974e46bcd --- /dev/null +++ b/ACE/debian/libace-flreactor-dev.install.in @@ -0,0 +1,3 @@ +usr/lib/libACE_FlReactor.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/include/ace/FlReactor +usr/lib/pkgconfig/ACE_FlReactor.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ diff --git a/ACE/debian/libace-foxreactor-6.5.8.install b/ACE/debian/libace-foxreactor-6.5.8.install deleted file mode 100644 index e360f29f5af..00000000000 --- a/ACE/debian/libace-foxreactor-6.5.8.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_FoxReactor-*.so diff --git a/ACE/debian/libace-foxreactor-6.5.8.install.in b/ACE/debian/libace-foxreactor-6.5.8.install.in new file mode 100644 index 00000000000..b2f7852a85e --- /dev/null +++ b/ACE/debian/libace-foxreactor-6.5.8.install.in @@ -0,0 +1 @@ +usr/lib/libACE_FoxReactor-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libace-foxreactor-6.5.8.lintian-overrides b/ACE/debian/libace-foxreactor-6.5.8.lintian-overrides deleted file mode 100644 index 1366abe881b..00000000000 --- a/ACE/debian/libace-foxreactor-6.5.8.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-foxreactor-6.5.8: no-symbols-control-file usr/lib/libACE_FoxReactor-6.5.8.so diff --git a/ACE/debian/libace-foxreactor-dev.install b/ACE/debian/libace-foxreactor-dev.install deleted file mode 100644 index 610f74fa297..00000000000 --- a/ACE/debian/libace-foxreactor-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/libACE_FoxReactor.so -usr/include/ace/FoxReactor -usr/lib/pkgconfig/ACE_FoxReactor.pc diff --git a/ACE/debian/libace-foxreactor-dev.install.in b/ACE/debian/libace-foxreactor-dev.install.in new file mode 100644 index 00000000000..2444a2ee96b --- /dev/null +++ b/ACE/debian/libace-foxreactor-dev.install.in @@ -0,0 +1,3 @@ +usr/lib/libACE_FoxReactor.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/include/ace/FoxReactor +usr/lib/pkgconfig/ACE_FoxReactor.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ diff --git a/ACE/debian/libace-htbp-6.5.8.install b/ACE/debian/libace-htbp-6.5.8.install deleted file mode 100644 index 08103fd5cad..00000000000 --- a/ACE/debian/libace-htbp-6.5.8.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_HTBP-*.so diff --git a/ACE/debian/libace-htbp-6.5.8.install.in b/ACE/debian/libace-htbp-6.5.8.install.in new file mode 100644 index 00000000000..c0661044fd6 --- /dev/null +++ b/ACE/debian/libace-htbp-6.5.8.install.in @@ -0,0 +1 @@ +usr/lib/libACE_HTBP-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libace-htbp-6.5.8.lintian-overrides b/ACE/debian/libace-htbp-6.5.8.lintian-overrides deleted file mode 100644 index 30f4ac9d32e..00000000000 --- a/ACE/debian/libace-htbp-6.5.8.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-htbp-6.5.8: no-symbols-control-file usr/lib/libACE_HTBP-6.5.8.so diff --git a/ACE/debian/libace-htbp-dev.install b/ACE/debian/libace-htbp-dev.install deleted file mode 100644 index 4f12cdbf717..00000000000 --- a/ACE/debian/libace-htbp-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/include/ace/HTBP -usr/lib/libACE_HTBP.so -usr/lib/pkgconfig/ACE_HTBP.pc diff --git a/ACE/debian/libace-htbp-dev.install.in b/ACE/debian/libace-htbp-dev.install.in new file mode 100644 index 00000000000..27da316c2bf --- /dev/null +++ b/ACE/debian/libace-htbp-dev.install.in @@ -0,0 +1,3 @@ +usr/include/ace/HTBP +usr/lib/libACE_HTBP.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/pkgconfig/ACE_HTBP.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ diff --git a/ACE/debian/libace-inet-6.5.8.install b/ACE/debian/libace-inet-6.5.8.install deleted file mode 100644 index 59a73a509d0..00000000000 --- a/ACE/debian/libace-inet-6.5.8.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_INet-*.so diff --git a/ACE/debian/libace-inet-6.5.8.install.in b/ACE/debian/libace-inet-6.5.8.install.in new file mode 100644 index 00000000000..c8cddd876f2 --- /dev/null +++ b/ACE/debian/libace-inet-6.5.8.install.in @@ -0,0 +1 @@ +usr/lib/libACE_INet-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libace-inet-6.5.8.lintian-overrides b/ACE/debian/libace-inet-6.5.8.lintian-overrides index e49f0b41704..966bb20fa15 100644 --- a/ACE/debian/libace-inet-6.5.8.lintian-overrides +++ b/ACE/debian/libace-inet-6.5.8.lintian-overrides @@ -1,2 +1 @@ libace-inet-6.5.8: extended-description-is-probably-too-short -libace-inet-6.5.8: no-symbols-control-file usr/lib/libACE_INet-6.5.8.so diff --git a/ACE/debian/libace-inet-dev.install b/ACE/debian/libace-inet-dev.install.in index e68c7bb5479..6a98ecdaf70 100644 --- a/ACE/debian/libace-inet-dev.install +++ b/ACE/debian/libace-inet-dev.install.in @@ -1,4 +1,4 @@ -usr/lib/libACE_INet.so +usr/lib/libACE_INet.so usr/lib/@DEB_HOST_MULTIARCH@/ usr/include/ace/INet/Sock_IOStream.cpp usr/include/ace/INet/FTP_IOStream.h usr/include/ace/INet/HTTP_Request.inl @@ -63,4 +63,4 @@ usr/include/ace/INet/FTP_Response.inl usr/include/ace/INet/FTP_URL.inl usr/include/ace/INet/HTTP_StreamPolicy.h usr/include/ace/INet/Request.h -usr/lib/pkgconfig/ACE_INet.pc +usr/lib/pkgconfig/ACE_INet.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ diff --git a/ACE/debian/libace-inet-ssl-6.5.8.install b/ACE/debian/libace-inet-ssl-6.5.8.install deleted file mode 100644 index b9b8b9045f7..00000000000 --- a/ACE/debian/libace-inet-ssl-6.5.8.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_INet_SSL-*.so diff --git a/ACE/debian/libace-inet-ssl-6.5.8.install.in b/ACE/debian/libace-inet-ssl-6.5.8.install.in new file mode 100644 index 00000000000..7646d569860 --- /dev/null +++ b/ACE/debian/libace-inet-ssl-6.5.8.install.in @@ -0,0 +1 @@ +usr/lib/libACE_INet_SSL-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libace-inet-ssl-6.5.8.lintian-overrides b/ACE/debian/libace-inet-ssl-6.5.8.lintian-overrides index 9bfa0863154..d9c2fccd6a6 100644 --- a/ACE/debian/libace-inet-ssl-6.5.8.lintian-overrides +++ b/ACE/debian/libace-inet-ssl-6.5.8.lintian-overrides @@ -1,4 +1,2 @@ -libace-inet-ssl-6.5.8: no-symbols-control-file usr/lib/libACE_INet_SSL-6.5.8.so - # It's Bison-generate code covered by the GNU Bison GPL-exception libace-inet-ssl-6.5.8: possible-gpl-code-linked-with-openssl diff --git a/ACE/debian/libace-inet-ssl-dev.install b/ACE/debian/libace-inet-ssl-dev.install deleted file mode 100644 index dfe71453638..00000000000 --- a/ACE/debian/libace-inet-ssl-dev.install +++ /dev/null @@ -1,4 +0,0 @@ -usr/include/ace/INet/*SSL* -usr/include/ace/INet/*HTTPS* -usr/lib/libACE_INet_SSL.so -usr/lib/pkgconfig/ACE_INet_SSL.pc diff --git a/ACE/debian/libace-inet-ssl-dev.install.in b/ACE/debian/libace-inet-ssl-dev.install.in new file mode 100644 index 00000000000..c386ae97bdc --- /dev/null +++ b/ACE/debian/libace-inet-ssl-dev.install.in @@ -0,0 +1,4 @@ +usr/include/ace/INet/*SSL* +usr/include/ace/INet/*HTTPS* +usr/lib/libACE_INet_SSL.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/pkgconfig/ACE_INet_SSL.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ diff --git a/ACE/debian/libace-rmcast-6.5.8.install b/ACE/debian/libace-rmcast-6.5.8.install deleted file mode 100644 index 86e78259853..00000000000 --- a/ACE/debian/libace-rmcast-6.5.8.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_RMCast-*.so diff --git a/ACE/debian/libace-rmcast-6.5.8.install.in b/ACE/debian/libace-rmcast-6.5.8.install.in new file mode 100644 index 00000000000..d39b3033b18 --- /dev/null +++ b/ACE/debian/libace-rmcast-6.5.8.install.in @@ -0,0 +1 @@ +usr/lib/libACE_RMCast-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libace-rmcast-6.5.8.lintian-overrides b/ACE/debian/libace-rmcast-6.5.8.lintian-overrides deleted file mode 100644 index 3e4f8730d24..00000000000 --- a/ACE/debian/libace-rmcast-6.5.8.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-rmcast-6.5.8: no-symbols-control-file usr/lib/libACE_RMCast-6.5.8.so diff --git a/ACE/debian/libace-rmcast-dev.install b/ACE/debian/libace-rmcast-dev.install deleted file mode 100644 index 9fffea503bc..00000000000 --- a/ACE/debian/libace-rmcast-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/include/ace/RMCast -usr/lib/libACE_RMCast.so -usr/lib/pkgconfig/ACE_RMCast.pc diff --git a/ACE/debian/libace-rmcast-dev.install.in b/ACE/debian/libace-rmcast-dev.install.in new file mode 100644 index 00000000000..c1754ecb5f1 --- /dev/null +++ b/ACE/debian/libace-rmcast-dev.install.in @@ -0,0 +1,3 @@ +usr/include/ace/RMCast +usr/lib/libACE_RMCast.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/pkgconfig/ACE_RMCast.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ diff --git a/ACE/debian/libace-ssl-6.5.8.install b/ACE/debian/libace-ssl-6.5.8.install deleted file mode 100644 index 8df45a6d55f..00000000000 --- a/ACE/debian/libace-ssl-6.5.8.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_SSL-*.so diff --git a/ACE/debian/libace-ssl-6.5.8.install.in b/ACE/debian/libace-ssl-6.5.8.install.in new file mode 100644 index 00000000000..5f55d22a0ae --- /dev/null +++ b/ACE/debian/libace-ssl-6.5.8.install.in @@ -0,0 +1 @@ +usr/lib/libACE_SSL-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libace-ssl-6.5.8.lintian-overrides b/ACE/debian/libace-ssl-6.5.8.lintian-overrides index 33779b71cd6..9fbdcac8f3a 100644 --- a/ACE/debian/libace-ssl-6.5.8.lintian-overrides +++ b/ACE/debian/libace-ssl-6.5.8.lintian-overrides @@ -1,5 +1,4 @@ libace-ssl-6.5.8: extended-description-is-probably-too-short -libace-ssl-6.5.8: no-symbols-control-file usr/lib/libACE_SSL-6.5.8.so # It's Bison-generate code covered by the GNU Bison GPL-exception libace-ssl-6.5.8: possible-gpl-code-linked-with-openssl diff --git a/ACE/debian/libace-ssl-dev.install b/ACE/debian/libace-ssl-dev.install deleted file mode 100644 index 1a1c38eb201..00000000000 --- a/ACE/debian/libace-ssl-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/include/ace/SSL -usr/lib/libACE_SSL.so -usr/lib/pkgconfig/ACE_SSL.pc diff --git a/ACE/debian/libace-ssl-dev.install.in b/ACE/debian/libace-ssl-dev.install.in new file mode 100644 index 00000000000..228d41c25f6 --- /dev/null +++ b/ACE/debian/libace-ssl-dev.install.in @@ -0,0 +1,3 @@ +usr/include/ace/SSL +usr/lib/libACE_SSL.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/pkgconfig/ACE_SSL.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ diff --git a/ACE/debian/libace-tkreactor-6.5.8.install b/ACE/debian/libace-tkreactor-6.5.8.install deleted file mode 100644 index 12ab35062d2..00000000000 --- a/ACE/debian/libace-tkreactor-6.5.8.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_TkReactor-*.so diff --git a/ACE/debian/libace-tkreactor-6.5.8.install.in b/ACE/debian/libace-tkreactor-6.5.8.install.in new file mode 100644 index 00000000000..abd630df6c1 --- /dev/null +++ b/ACE/debian/libace-tkreactor-6.5.8.install.in @@ -0,0 +1 @@ +usr/lib/libACE_TkReactor-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libace-tkreactor-6.5.8.lintian-overrides b/ACE/debian/libace-tkreactor-6.5.8.lintian-overrides deleted file mode 100644 index 8c75e539987..00000000000 --- a/ACE/debian/libace-tkreactor-6.5.8.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-tkreactor-6.5.8: no-symbols-control-file usr/lib/libACE_TkReactor-6.5.8.so diff --git a/ACE/debian/libace-tkreactor-dev.install b/ACE/debian/libace-tkreactor-dev.install deleted file mode 100644 index d61e98a09f8..00000000000 --- a/ACE/debian/libace-tkreactor-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/libACE_TkReactor.so -usr/include/ace/TkReactor -usr/lib/pkgconfig/ACE_TkReactor.pc diff --git a/ACE/debian/libace-tkreactor-dev.install.in b/ACE/debian/libace-tkreactor-dev.install.in new file mode 100644 index 00000000000..64451da14d0 --- /dev/null +++ b/ACE/debian/libace-tkreactor-dev.install.in @@ -0,0 +1,3 @@ +usr/lib/libACE_TkReactor.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/include/ace/TkReactor +usr/lib/pkgconfig/ACE_TkReactor.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ diff --git a/ACE/debian/libace-tmcast-6.5.8.install b/ACE/debian/libace-tmcast-6.5.8.install deleted file mode 100644 index e066131dea0..00000000000 --- a/ACE/debian/libace-tmcast-6.5.8.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_TMCast-*.so diff --git a/ACE/debian/libace-tmcast-6.5.8.install.in b/ACE/debian/libace-tmcast-6.5.8.install.in new file mode 100644 index 00000000000..b6eda852bb3 --- /dev/null +++ b/ACE/debian/libace-tmcast-6.5.8.install.in @@ -0,0 +1 @@ +usr/lib/libACE_TMCast-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libace-tmcast-6.5.8.lintian-overrides b/ACE/debian/libace-tmcast-6.5.8.lintian-overrides deleted file mode 100644 index 1a4e9135d1d..00000000000 --- a/ACE/debian/libace-tmcast-6.5.8.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-tmcast-6.5.8: no-symbols-control-file usr/lib/libACE_TMCast-6.5.8.so diff --git a/ACE/debian/libace-tmcast-dev.install b/ACE/debian/libace-tmcast-dev.install deleted file mode 100644 index 19eaad0d3cb..00000000000 --- a/ACE/debian/libace-tmcast-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/include/ace/TMCast -usr/lib/libACE_TMCast.so -usr/lib/pkgconfig/ACE_TMCast.pc diff --git a/ACE/debian/libace-tmcast-dev.install.in b/ACE/debian/libace-tmcast-dev.install.in new file mode 100644 index 00000000000..7c82eaff73c --- /dev/null +++ b/ACE/debian/libace-tmcast-dev.install.in @@ -0,0 +1,3 @@ +usr/include/ace/TMCast +usr/lib/libACE_TMCast.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/pkgconfig/ACE_TMCast.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ diff --git a/ACE/debian/libace-xml-utils-6.5.8.install b/ACE/debian/libace-xml-utils-6.5.8.install deleted file mode 100644 index 2428ec9f109..00000000000 --- a/ACE/debian/libace-xml-utils-6.5.8.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_XML_Utils-*.so diff --git a/ACE/debian/libace-xml-utils-6.5.8.install.in b/ACE/debian/libace-xml-utils-6.5.8.install.in new file mode 100644 index 00000000000..082320b5e97 --- /dev/null +++ b/ACE/debian/libace-xml-utils-6.5.8.install.in @@ -0,0 +1 @@ +usr/lib/libACE_XML_Utils-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libace-xml-utils-6.5.8.lintian-overrides b/ACE/debian/libace-xml-utils-6.5.8.lintian-overrides deleted file mode 100644 index d63c9bc5cfa..00000000000 --- a/ACE/debian/libace-xml-utils-6.5.8.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-xml-utils-6.5.8: no-symbols-control-file usr/lib/libACE_XML_Utils-6.5.8.so diff --git a/ACE/debian/libace-xml-utils-dev.install b/ACE/debian/libace-xml-utils-dev.install deleted file mode 100644 index b1539d17224..00000000000 --- a/ACE/debian/libace-xml-utils-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/libACE_XML_Utils.so -usr/include/ace/XML_Utils/* -usr/lib/pkgconfig/ACE_XML_Utils.pc diff --git a/ACE/debian/libace-xml-utils-dev.install.in b/ACE/debian/libace-xml-utils-dev.install.in new file mode 100644 index 00000000000..45cc54d4c02 --- /dev/null +++ b/ACE/debian/libace-xml-utils-dev.install.in @@ -0,0 +1,3 @@ +usr/lib/libACE_XML_Utils.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/include/ace/XML_Utils/* +usr/lib/pkgconfig/ACE_XML_Utils.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ diff --git a/ACE/debian/libace-xtreactor-6.5.8.install b/ACE/debian/libace-xtreactor-6.5.8.install deleted file mode 100644 index c53614c7208..00000000000 --- a/ACE/debian/libace-xtreactor-6.5.8.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libACE_XtReactor-*.so diff --git a/ACE/debian/libace-xtreactor-6.5.8.install.in b/ACE/debian/libace-xtreactor-6.5.8.install.in new file mode 100644 index 00000000000..75d4b27ef61 --- /dev/null +++ b/ACE/debian/libace-xtreactor-6.5.8.install.in @@ -0,0 +1 @@ +usr/lib/libACE_XtReactor-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libace-xtreactor-6.5.8.lintian-overrides b/ACE/debian/libace-xtreactor-6.5.8.lintian-overrides deleted file mode 100644 index a3e87729442..00000000000 --- a/ACE/debian/libace-xtreactor-6.5.8.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libace-xtreactor-6.5.8: no-symbols-control-file usr/lib/libACE_XtReactor-6.5.8.so diff --git a/ACE/debian/libace-xtreactor-dev.install b/ACE/debian/libace-xtreactor-dev.install deleted file mode 100644 index b24baea6a03..00000000000 --- a/ACE/debian/libace-xtreactor-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/libACE_XtReactor.so -usr/include/ace/XtReactor -usr/lib/pkgconfig/ACE_XtReactor.pc diff --git a/ACE/debian/libace-xtreactor-dev.install.in b/ACE/debian/libace-xtreactor-dev.install.in new file mode 100644 index 00000000000..5b5b742bfaa --- /dev/null +++ b/ACE/debian/libace-xtreactor-dev.install.in @@ -0,0 +1,3 @@ +usr/lib/libACE_XtReactor.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/include/ace/XtReactor +usr/lib/pkgconfig/ACE_XtReactor.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ diff --git a/ACE/debian/libacexml-6.5.8.install b/ACE/debian/libacexml-6.5.8.install deleted file mode 100644 index d3e912ffa51..00000000000 --- a/ACE/debian/libacexml-6.5.8.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/libACEXML_XML_Svc_Conf_Parser-*.so -usr/lib/libACEXML-*.so -usr/lib/libACEXML_Parser-*.so diff --git a/ACE/debian/libacexml-6.5.8.install.in b/ACE/debian/libacexml-6.5.8.install.in new file mode 100644 index 00000000000..b7d27d6a1f4 --- /dev/null +++ b/ACE/debian/libacexml-6.5.8.install.in @@ -0,0 +1,3 @@ +usr/lib/libACEXML_XML_Svc_Conf_Parser-*.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/libACEXML-*.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/libACEXML_Parser-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libacexml-6.5.8.lintian-overrides b/ACE/debian/libacexml-6.5.8.lintian-overrides deleted file mode 100644 index a9c6f75fafc..00000000000 --- a/ACE/debian/libacexml-6.5.8.lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -libacexml-6.5.8: no-symbols-control-file usr/lib/libACEXML_Parser-6.5.8.so -libacexml-6.5.8: no-symbols-control-file usr/lib/libACEXML_XML_Svc_Conf_Parser-6.5.8.so -libacexml-6.5.8: no-symbols-control-file usr/lib/libACEXML-6.5.8.so diff --git a/ACE/debian/libacexml-dev.install b/ACE/debian/libacexml-dev.install deleted file mode 100644 index f7ed6a74851..00000000000 --- a/ACE/debian/libacexml-dev.install +++ /dev/null @@ -1,7 +0,0 @@ -usr/include/ACEXML -usr/lib/libACEXML.so -usr/lib/libACEXML_Parser.so -usr/lib/libACEXML_XML_Svc_Conf_Parser.so -usr/lib/pkgconfig/ACEXML.pc -usr/lib/pkgconfig/ACEXML_XML_Svc_Conf_Parser.pc -usr/lib/pkgconfig/ACEXML_Parser.pc diff --git a/ACE/debian/libacexml-dev.install.in b/ACE/debian/libacexml-dev.install.in new file mode 100644 index 00000000000..4236fb6802b --- /dev/null +++ b/ACE/debian/libacexml-dev.install.in @@ -0,0 +1,7 @@ +usr/include/ACEXML +usr/lib/libACEXML.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/libACEXML_Parser.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/libACEXML_XML_Svc_Conf_Parser.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/pkgconfig/ACEXML.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ +usr/lib/pkgconfig/ACEXML_XML_Svc_Conf_Parser.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ +usr/lib/pkgconfig/ACEXML_Parser.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ diff --git a/ACE/debian/libkokyu-6.5.8.install b/ACE/debian/libkokyu-6.5.8.install deleted file mode 100644 index 62854308f96..00000000000 --- a/ACE/debian/libkokyu-6.5.8.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libKokyu-*.so diff --git a/ACE/debian/libkokyu-6.5.8.install.in b/ACE/debian/libkokyu-6.5.8.install.in new file mode 100644 index 00000000000..f13089a8b0f --- /dev/null +++ b/ACE/debian/libkokyu-6.5.8.install.in @@ -0,0 +1 @@ +usr/lib/libKokyu-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libkokyu-6.5.8.lintian-overrides b/ACE/debian/libkokyu-6.5.8.lintian-overrides deleted file mode 100644 index 87c19f0fd34..00000000000 --- a/ACE/debian/libkokyu-6.5.8.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libkokyu-6.5.8: no-symbols-control-file usr/lib/libKokyu-6.5.8.so diff --git a/ACE/debian/libkokyu-dev.install b/ACE/debian/libkokyu-dev.install deleted file mode 100644 index 33ef826a07d..00000000000 --- a/ACE/debian/libkokyu-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/include/Kokyu -usr/lib/libKokyu.so -usr/lib/pkgconfig/Kokyu.pc diff --git a/ACE/debian/libkokyu-dev.install.in b/ACE/debian/libkokyu-dev.install.in new file mode 100644 index 00000000000..e86aea2bbf6 --- /dev/null +++ b/ACE/debian/libkokyu-dev.install.in @@ -0,0 +1,3 @@ +usr/include/Kokyu +usr/lib/libKokyu.so usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/pkgconfig/Kokyu.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/ diff --git a/ACE/debian/libnetsvcs-6.5.8.install b/ACE/debian/libnetsvcs-6.5.8.install deleted file mode 100644 index c7a04b16213..00000000000 --- a/ACE/debian/libnetsvcs-6.5.8.install +++ /dev/null @@ -1 +0,0 @@ -../../netsvcs/lib/libnetsvcs-*.so usr/lib diff --git a/ACE/debian/libnetsvcs-6.5.8.install.in b/ACE/debian/libnetsvcs-6.5.8.install.in new file mode 100644 index 00000000000..36f10c3ec98 --- /dev/null +++ b/ACE/debian/libnetsvcs-6.5.8.install.in @@ -0,0 +1 @@ +../../netsvcs/lib/libnetsvcs-*.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/libnetsvcs-6.5.8.lintian-overrides b/ACE/debian/libnetsvcs-6.5.8.lintian-overrides deleted file mode 100644 index 9bdc70451e8..00000000000 --- a/ACE/debian/libnetsvcs-6.5.8.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libnetsvcs-6.5.8: no-symbols-control-file usr/lib/libnetsvcs-6.5.8.so diff --git a/ACE/debian/libnetsvcs-dev.install b/ACE/debian/libnetsvcs-dev.install.in index 74d21fd30a7..d316686d81c 100644 --- a/ACE/debian/libnetsvcs-dev.install +++ b/ACE/debian/libnetsvcs-dev.install.in @@ -1,3 +1,3 @@ ../../netsvcs/lib/*.h usr/include/netsvcs ../../netsvcs/lib/*_T.cpp usr/include/netsvcs -../../netsvcs/lib/libnetsvcs.so usr/lib +../../netsvcs/lib/libnetsvcs.so usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/ACE/debian/patches/90-patch-mpc-basedir.diff b/ACE/debian/patches/90-patch-mpc-basedir.diff deleted file mode 100644 index f58f9fb3323..00000000000 --- a/ACE/debian/patches/90-patch-mpc-basedir.diff +++ /dev/null @@ -1,50 +0,0 @@ -Description: make $ACE_ROOT/bin/m{w,p}c.pl relocatable - $ACE_ROOT/bin/m{w,p}c.pl look up for MPC modules under its base path, in - $ACE_ROOT/bin/MakeProjectCreator. But we package those scripts under /usr/bin, - while MakeProjectCreator folder is put under $ACE_ROOT/bin (in other words, - /usr/lib/ace/bin) - . - This patch sets MPC path dir to use $ACE_ROOT if defined (used when building - ACE+TAO packages), or /usr/lib/ace if not. -Forwarded: not-needed -Author: Thomas Girard <thomas.g.girard@free.fr> -Last-Update: 2011-07-24 - ---- a/bin/mpc.pl -+++ b/bin/mpc.pl -@@ -20,13 +20,9 @@ - use File::Spec; - use File::Basename; - --my($basePath) = (defined $FindBin::RealBin ? $FindBin::RealBin : -- File::Spec->rel2abs(dirname($0))); --if ($^O eq 'VMS') { -- $basePath = File::Spec->rel2abs(dirname($0)) if ($basePath eq ''); -- $basePath = VMS::Filespec::unixify($basePath); --} --$basePath .= '/MakeProjectCreator'; -+my($aceroot) = $ENV{ACE_ROOT}; -+my($basePath) = (defined $aceroot ? -+ $aceroot : '/usr/lib/ace') . '/bin/MakeProjectCreator'; - - my($mpcroot) = $ENV{MPC_ROOT}; - my($mpcpath) = (defined $mpcroot ? $mpcroot : ---- a/bin/mwc.pl -+++ b/bin/mwc.pl -@@ -20,13 +20,9 @@ - use File::Spec; - use File::Basename; - --my($basePath) = (defined $FindBin::RealBin ? $FindBin::RealBin : -- File::Spec->rel2abs(dirname($0))); --if ($^O eq 'VMS') { -- $basePath = File::Spec->rel2abs(dirname($0)) if ($basePath eq ''); -- $basePath = VMS::Filespec::unixify($basePath); --} --$basePath .= '/MakeProjectCreator'; -+my($aceroot) = $ENV{ACE_ROOT}; -+my($basePath) = (defined $aceroot ? -+ $aceroot : '/usr/lib/ace') . '/bin/MakeProjectCreator'; - - my($mpcroot) = $ENV{MPC_ROOT}; - my($mpcpath) = (defined $mpcroot ? $mpcroot : diff --git a/ACE/debian/patches/91-patch-dg-basedir.diff b/ACE/debian/patches/91-patch-dg-basedir.diff deleted file mode 100644 index 2c848f0ea0a..00000000000 --- a/ACE/debian/patches/91-patch-dg-basedir.diff +++ /dev/null @@ -1,29 +0,0 @@ -Description: fix path to DependencyGenerator - $ACE_ROOT/bin/depgen.pl look up for modules under its base path, in - $ACE_ROOT/bin/DependencyGenerator. - . - This patch sets base path dir to use $ACE_ROOT if defined (used when building - ACE+TAO packages), or /usr/lib/ace if not. - . - TODO: do we still need this one? -Forwarded: not-needed -Author: Thomas Girard <thomas.g.girard@free.fr> -Last-Update: 2011-07-24 - ---- a/bin/depgen.pl -+++ b/bin/depgen.pl -@@ -19,11 +19,9 @@ - use File::Spec; - use File::Basename; - --my($basePath) = $FindBin::RealBin; --if ($^O eq 'VMS') { -- $basePath = File::Spec->rel2abs(dirname($0)) if ($basePath eq ''); -- $basePath = VMS::Filespec::unixify($basePath); --} -+my($aceroot) = $ENV{ACE_ROOT}; -+my($basePath) = (defined $aceroot ? -+ $aceroot : '/usr/lib/ace') . '/bin'; - unshift(@INC, $basePath . '/DependencyGenerator'); - - my($mpcroot) = $ENV{MPC_ROOT}; diff --git a/ACE/debian/patches/92-default-ACE_ROOT.diff b/ACE/debian/patches/92-default-ACE_ROOT.diff deleted file mode 100644 index 24f289c5c90..00000000000 --- a/ACE/debian/patches/92-default-ACE_ROOT.diff +++ /dev/null @@ -1,18 +0,0 @@ -Description: define $ACE_ROOT in generated GNUmakefile if needed - TODO: not sure whether we need it. -Forwarded: no -Author: Thomas Girard <thomas.g.girard@free.fr> -Last-Update: 2010-05-24 - ---- a/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm -+++ b/bin/MakeProjectCreator/modules/GNUACEWorkspaceCreator.pm -@@ -95,6 +95,9 @@ - "ifeq (\$(findstring k,\$(MAKEFLAGS)),k)$crlf", - " KEEP_GOING = -$crlf", - "endif$crlf$crlf", -+ "ifndef ACE_ROOT$crlf", -+ " export ACE_ROOT = /usr/lib/ace$crlf", -+ "endif$crlf", - "include \$(ACE_ROOT)/include/makeinclude/macros.GNU$crlf"; - - if ($named) { diff --git a/ACE/debian/patches/reduce-doxygen-doc.diff b/ACE/debian/patches/reduce-doxygen-doc.diff deleted file mode 100644 index 281c4eadb91..00000000000 --- a/ACE/debian/patches/reduce-doxygen-doc.diff +++ /dev/null @@ -1,127 +0,0 @@ -Description: reduce Doxygen documentation - With upstream's Doxygen settings, the generated documentation requires a huge amount of space. - Remove some detail so that it only take a reasonable amount of disk space. -Forwarded: not-needed -Author: Thomas Girard <thomas.g.girard@free.fr>, Pau Garcia i Quiles <pgquiles@elpauer.org> -Last-Update: 2014-06-29 - ---- a/etc/ace.doxygen -+++ b/etc/ace.doxygen -@@ -2136,7 +2136,7 @@ - # The default value is: YES. - # This tag requires that the tag HAVE_DOT is set to YES. - --COLLABORATION_GRAPH = YES -+COLLABORATION_GRAPH = NO - - # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for - # groups, showing the direct groups dependencies. -@@ -2288,7 +2288,7 @@ - # Minimum value: 0, maximum value: 10000, default value: 50. - # This tag requires that the tag HAVE_DOT is set to YES. - --DOT_GRAPH_MAX_NODES = 50 -+DOT_GRAPH_MAX_NODES = 15 - - # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs - # generated by dot. A depth value of 3 means that only nodes reachable from the ---- a/etc/ace_inet.doxygen -+++ b/etc/ace_inet.doxygen -@@ -2108,7 +2108,7 @@ - # The default value is: YES. - # This tag requires that the tag HAVE_DOT is set to YES. - --COLLABORATION_GRAPH = YES -+COLLABORATION_GRAPH = NO - - # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for - # groups, showing the direct groups dependencies. -@@ -2260,7 +2260,7 @@ - # Minimum value: 0, maximum value: 10000, default value: 50. - # This tag requires that the tag HAVE_DOT is set to YES. - --DOT_GRAPH_MAX_NODES = 50 -+DOT_GRAPH_MAX_NODES = 15 - - # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs - # generated by dot. A depth value of 3 means that only nodes reachable from the ---- a/etc/ace_qos.doxygen -+++ b/etc/ace_qos.doxygen -@@ -2110,7 +2110,7 @@ - # The default value is: YES. - # This tag requires that the tag HAVE_DOT is set to YES. - --COLLABORATION_GRAPH = YES -+COLLABORATION_GRAPH = NO - - # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for - # groups, showing the direct groups dependencies. -@@ -2262,7 +2262,7 @@ - # Minimum value: 0, maximum value: 10000, default value: 50. - # This tag requires that the tag HAVE_DOT is set to YES. - --DOT_GRAPH_MAX_NODES = 50 -+DOT_GRAPH_MAX_NODES = 15 - - # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs - # generated by dot. A depth value of 3 means that only nodes reachable from the ---- a/etc/ace_rmcast.doxygen -+++ b/etc/ace_rmcast.doxygen -@@ -2108,7 +2108,7 @@ - # The default value is: YES. - # This tag requires that the tag HAVE_DOT is set to YES. - --COLLABORATION_GRAPH = YES -+COLLABORATION_GRAPH = NO - - # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for - # groups, showing the direct groups dependencies. -@@ -2260,7 +2260,7 @@ - # Minimum value: 0, maximum value: 10000, default value: 50. - # This tag requires that the tag HAVE_DOT is set to YES. - --DOT_GRAPH_MAX_NODES = 50 -+DOT_GRAPH_MAX_NODES = 15 - - # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs - # generated by dot. A depth value of 3 means that only nodes reachable from the ---- a/etc/ace_ssl.doxygen -+++ b/etc/ace_ssl.doxygen -@@ -2108,7 +2108,7 @@ - # The default value is: YES. - # This tag requires that the tag HAVE_DOT is set to YES. - --COLLABORATION_GRAPH = YES -+COLLABORATION_GRAPH = NO - - # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for - # groups, showing the direct groups dependencies. -@@ -2260,7 +2260,7 @@ - # Minimum value: 0, maximum value: 10000, default value: 50. - # This tag requires that the tag HAVE_DOT is set to YES. - --DOT_GRAPH_MAX_NODES = 50 -+DOT_GRAPH_MAX_NODES = 15 - - # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs - # generated by dot. A depth value of 3 means that only nodes reachable from the ---- a/etc/acexml.doxygen -+++ b/etc/acexml.doxygen -@@ -2109,7 +2109,7 @@ - # The default value is: YES. - # This tag requires that the tag HAVE_DOT is set to YES. - --COLLABORATION_GRAPH = YES -+COLLABORATION_GRAPH = NO - - # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for - # groups, showing the direct groups dependencies. -@@ -2261,7 +2261,7 @@ - # Minimum value: 0, maximum value: 10000, default value: 50. - # This tag requires that the tag HAVE_DOT is set to YES. - --DOT_GRAPH_MAX_NODES = 50 -+DOT_GRAPH_MAX_NODES = 15 - - # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs - # generated by dot. A depth value of 3 means that only nodes reachable from the diff --git a/ACE/debian/patches/series b/ACE/debian/patches/series deleted file mode 100644 index ab8b3888dc8..00000000000 --- a/ACE/debian/patches/series +++ /dev/null @@ -1,4 +0,0 @@ -reduce-doxygen-doc.diff -90-patch-mpc-basedir.diff -91-patch-dg-basedir.diff -92-default-ACE_ROOT.diff diff --git a/ACE/debian/rules b/ACE/debian/rules index eb20a4e2112..d7df711e919 100755 --- a/ACE/debian/rules +++ b/ACE/debian/rules @@ -12,8 +12,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+format,+fortify,+stackprotector,+relro,+bindnow DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk -CFLAGS+=$(CPPFLAGS) -CXXFLAGS+=$(CPPFLAGS) +export DEB_CFLAGS_MAINT_APPEND = $(CPPFLAGS) +export DEB_CXXFLAGS_MAINT_APPEND = $(CPPFLAGS) +export DEB_CPPFLAGS_MAINT_APPEND = -g MWCFLAGS := -type gnuace -noreldefs DSO_MAKE_FLAG := versioned_so=2 @@ -34,7 +35,6 @@ ALL_ACEXML := $(filter libacexml%,$(ALL_PACKAGES)) export ACE_ROOT := $(shell pwd) export MPC_ROOT := $(ACE_ROOT)/MPC -export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(ACE_ROOT)/lib ACE_MAJOR_VERSION := $(shell awk '/ACE_MAJOR_VERSION/ { print $$3 }' ${ACE_ROOT}/ace/Version.h) ACE_MINOR_VERSION := $(shell awk '/ACE_MINOR_VERSION/ { print $$3 }' ${ACE_ROOT}/ace/Version.h) @@ -48,6 +48,9 @@ ACE_MICRO_VERSION := $(shell awk '/ACE_MICRO_VERSION/ { print $$3 }' ${ACE_ROOT} .PHONY: configure configure: configure-stamp configure-stamp: + for flname in debian/*.install.in; do \ + sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' \ + $$flname > $${flname%.in}; done cp debian/platform_macros.GNU $(ACE_ROOT)/include/makeinclude cp debian/config*.h $(ACE_ROOT)/ace/ cp debian/default.features $(ACE_ROOT)/bin/MakeProjectCreator/config @@ -90,10 +93,6 @@ override_dh_auto_clean: override_dh_compress: dh_compress -Xexamples -# Add --list-missing to make sure we don't miss new binaries -override_dh_install: - dh_install --list-missing - # ACE+TAO has different changelogs. Use the right one in every package. override_dh_installchangelogs: dh_installchangelogs -pmpc-ace MPC/ChangeLog diff --git a/ACE/debian/source/lintian-overrides b/ACE/debian/source/lintian-overrides deleted file mode 100644 index 721df3d38a3..00000000000 --- a/ACE/debian/source/lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -# We are using a compat level marked as experimental -# (compat=9 in debhelper >= 8.1.3) -ace source: package-needs-versioned-debhelper-build-depends 9 diff --git a/ACE/docs/Download.html b/ACE/docs/Download.html index d6923b5e793..845f7a8616c 100644 --- a/ACE/docs/Download.html +++ b/ACE/docs/Download.html @@ -15,14 +15,14 @@ Welcome to the download page for ACE, TAO, CIAO, and DAnCE which are open-source middleware developed by the <A -HREF="http://www.dre.vanderbilt.edu/">DOC group</a> that provide that +HREF="https://www.dre.vanderbilt.edu/">DOC group</a> that provide that following capabilities: <P> -<LI><A HREF="http://www.dre.vanderbilt.edu/~schmidt/ACE.html">ACE</A> is an +<LI><A HREF="https://www.dre.vanderbilt.edu/~schmidt/ACE.html">ACE</A> is an open-source framework that provides many components and <A -HREF="http://www.dre.vanderbilt.edu/~schmidt/POSA">patterns</A> for +HREF="https://www.dre.vanderbilt.edu/~schmidt/POSA">patterns</A> for developing high-performance, distributed real-time and embedded systems. ACE provides powerful, yet efficient abstractions for sockets, demultiplexing loops, threads, synchronization primitives. @@ -30,9 +30,9 @@ sockets, demultiplexing loops, threads, synchronization primitives. <P> -<LI><A HREF="http://www.dre.vanderbilt.edu/~schmidt/TAO.html">TAO</A> (The ACE +<LI><A HREF="https://www.dre.vanderbilt.edu/~schmidt/TAO.html">TAO</A> (The ACE ORB) is an open-source implementation of a <A -href="http://www.dre.vanderbilt.edu/~schmidt/corba.html">CORBA</A> Object +href="https://www.dre.vanderbilt.edu/~schmidt/corba.html">CORBA</A> Object Request Broker (ORB) built using components and patterns in the ACE framework. @@ -40,13 +40,13 @@ framework. <P> -<LI><A HREF="http://www.dre.vanderbilt.edu/~schmidt/CIAO.html">CIAO</a> +<LI><A HREF="https://www.dre.vanderbilt.edu/~schmidt/CIAO.html">CIAO</a> (Component Integrated ACE ORB) is an open-source implementation of the CORBA Component Model (CCM) built on top of TAO. </P> </LI> -<LI><A HREF="http://www.dre.vanderbilt.edu/~schmidt/CIAO.html">DAnCE</a> +<LI><A HREF="https://www.dre.vanderbilt.edu/~schmidt/CIAO.html">DAnCE</a> is an open-source implementation of the Deployment and Configuration standard (D&C) built on top of TAO. </P> </LI> @@ -54,7 +54,7 @@ Deployment and Configuration standard (D&C) built on top of TAO. </P> <P> After downloading a distribution we strongly advice to subscribe at least to one of the <A -HREF="http://www.dre.vanderbilt.edu/~schmidt/ACE-mail.html">announce +HREF="https://www.dre.vanderbilt.edu/~schmidt/ACE-mail.html">announce mailing lists</A> to stay informed about new releases and important updates.<P> @@ -66,7 +66,7 @@ from a number of companies. <P> <P> Doxygen documentation for releases of ACE/TAO/CIAO/DAnCE can be browsed <A -HREF="http://www.dre.vanderbilt.edu/Doxygen/">online</A>. +HREF="https://www.dre.vanderbilt.edu/Doxygen/">online</A>. <HR> <H3>Downloading Freely Available Versions of ACE, TAO, CIAO, and DAnCE</H3> @@ -178,73 +178,73 @@ Windows line feeds. For all other platforms download a .gz/.bz2 package. <TR><TH>Filename</TH><TH>Description</TH><TH>Full</TH><TH>Sources only</TH></TR> <TR><TD>ACE+TAO-6.5.0.tar.gz</TD> <TD>ACE+TAO (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.tar.gz">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.tar.gz">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.tar.gz">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.tar.gz">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO-6.5.0.tar.bz2</TD> <TD>ACE+TAO (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.tar.bz2">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.tar.bz2">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.tar.bz2">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.tar.bz2">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO-6.5.0.zip</TD> <TD>ACE+TAO (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.zip">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.zip">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.5.0.zip">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.zip">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.zip">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.5.0.zip">FTP</A>] </TD> </TR> <TR><TD>ACE-html-6.5.0.tar.gz</TD> <TD>Doxygen documentation for ACE+TAO (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.tar.gz">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.tar.gz">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE-html-6.5.0.tar.bz2</TD> <TD>Doxygen documentation for ACE+TAO (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.tar.bz2">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.tar.bz2">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE-html-6.5.0.zip</TD> <TD>Doxygen documentation for ACE+TAO (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.zip">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.zip">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.5.0.zip">FTP</A>] </TD> </TR> <TR><TD>ACE-6.5.0.tar.gz</TD> <TD>ACE only (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.tar.gz">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.tar.gz">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.tar.gz">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.tar.gz">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE-6.5.0.tar.bz2</TD> <TD>ACE only (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.tar.bz2">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.tar.bz2">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.tar.bz2">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.tar.bz2">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE-6.5.0.zip</TD> <TD>ACE only (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.zip">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.zip">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.5.0.zip">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.zip">HTTP</A>] + <TD>[<A HREF="https://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.zip">HTTP</A>] [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.5.0.zip">FTP</A>] </TD> </TR> @@ -308,7 +308,7 @@ of the DAnCE micro release is available for <P> Older versions of ACE+TAO are also available via HTTP at <A - HREF="http://download.dre.vanderbilt.edu/previous_versions">this location</A> + HREF="https://download.dre.vanderbilt.edu/previous_versions">this location</A> . This location has a few of the previous major and minor releases. This location will house all major, minor, and micro releases distributed after ACE+TAO-5.2+1.2. diff --git a/ACE/examples/Reactor/WFMO_Reactor/APC.cpp b/ACE/examples/Reactor/WFMO_Reactor/APC.cpp index 8fb78608531..bb2000fa963 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/APC.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/APC.cpp @@ -13,7 +13,7 @@ #include "ace/OS_main.h" -#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) +#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && _WIN32_WINNT >= 0x400 #include "ace/Reactor.h" #include "ace/Auto_Event.h" diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html index abff56cc898..3b3970d2f8a 100644 --- a/TAO/TAO-INSTALL.html +++ b/TAO/TAO-INSTALL.html @@ -69,11 +69,11 @@ enhancement requests through <a href="https://github.com/DOCGroup/ACE_TAO">github</a>.<P> TAO can be obtained <A -HREF="http://download.dre.vanderbilt.edu">electronically</A> +HREF="https://download.dre.vanderbilt.edu">electronically</A> via the WWW and ftp. <A -HREF="http://www.dre.vanderbilt.edu/TAO">TAO</A> is bundled +HREF="https://www.dre.vanderbilt.edu/TAO">TAO</A> is bundled with the <A -HREF="http://www.dre.vanderbilt.edu/ACE"> ACE </A> release. You'll +HREF="https://www.dre.vanderbilt.edu/ACE"> ACE </A> release. You'll always need the most recent version of ACE because TAO tracks and influences changes to ACE. Always use the ACE+TAO release bundle as a single piece instead of trying to mix and match things up.<P> diff --git a/TAO/docs/Security/Download.html b/TAO/docs/Security/Download.html index 7f8d06b475c..395cbdf364c 100644 --- a/TAO/docs/Security/Download.html +++ b/TAO/docs/Security/Download.html @@ -73,7 +73,7 @@ function MM_nbGroup(event, grpName) { //v3.0 by the BXA from this US site.</p> <h3>TAO CORBA Security Service Software</h3> <ul> - <li><a href="http://download.dre.vanderbilt.edu"> TAO: The ACE + <li><a href="https://download.dre.vanderbilt.edu"> TAO: The ACE ORB</a> (TAO's CORBA Security Service is now shipped with the main TAO distribution)</li> </ul> <h3>Cryptographic Software</h3> diff --git a/TAO/docs/tutorials/Quoter/index.html b/TAO/docs/tutorials/Quoter/index.html index e9c53e011d2..0371cf9f037 100644 --- a/TAO/docs/tutorials/Quoter/index.html +++ b/TAO/docs/tutorials/Quoter/index.html @@ -42,7 +42,7 @@ files for which links are provided. If you choose to build and run the example, however, use the files which are part of the TAO source you <A - HREF="http://download.dre.vanderbilt.edu">download</a>. You can + HREF="https://download.dre.vanderbilt.edu">download</a>. You can find those source files in <CODE>$TAO_ROOT/docs/tutorials/Quoter</CODE>, where there's also a Makefile to build them with. Downloading the files individually from these links may result in source that does not build |