r2corba 1.4.1 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 63353bb76dd72a205b4029f34d89b56f739ca9e9
-  data.tar.gz: 8420f0951c31aa1da62aebd37ff55da02b4bc4bd
+SHA256:
+  metadata.gz: 3e920ffb5c3121f0f590343fd78737a1f18af807b6800812880e7d59a8d81586
+  data.tar.gz: 7b285e71aefed6353b2b28405e6a5b970705f27c2397fb5acea0e922dedbee48
 SHA512:
-  metadata.gz: 6c5449dc83cb39fff21241ce0ad8693826d8022b815f909ae53128e60f8653156c7efcfb26b3ed3c5b33f1dcae0278f3f3f873ff695dcdf49b219b54cb7fb71c
-  data.tar.gz: e750d0cd1241d05b2cefefe73b13fa73db54820aa3f53f3dff40557af6a93e8a808535116999171bb283fdc60ccec6445557a2ee84c5d314e71b26f176786fcf
+  metadata.gz: 791e4da7b7477da1b3c63e75040b1d690816e669be8e9d9d7607daaec2612a80001413dbb3a30ce683d2e89573f6379068676fe91ee82157d74a437d78cc4239
+  data.tar.gz: d61caa1200c08e3e4f96f3fea2626fba209d16e47c7a91932177c700f00aff0d7937903051b4a269b30de79e62fb07c186d2f3aae6178619382e3936fd6b6307

data/CHANGES

@@ -1,5 +1,19 @@
 
-Current version: 1.4.1
+Current version: 1.5.1
+
+Changes since version 1.4.1:
+
+o   Added support for MRI Ruby 2.1.x & 2.2.x (32 & 64 bits)
+
+o   Added support for TAO <= 2.3.1
+
+o   Added support for JRuby <= 1.7.19
+
+o   Added support for JacORB <= 3.5
+
+o   Upgraded RIDL frontend to 2.5.5
+
+o   Officially drop MRI Ruby < 1.9 support
 
 Changes since version 1.3.1:
 

data/LICENSE

@@ -8,12 +8,12 @@ written in Ruby, C++ and Java. It is designed to provide a CORBA mapping for
 the Ruby programming language.
 Instead of going for a complete native Ruby mapping implementing a native
 Ruby ORB, R2CORBA aims at providing CORBA functionality through a Ruby
-extension using the DII and DSI interfaces of an existing CORBA ORB 
+extension using the DII and DSI interfaces of an existing CORBA ORB
 implementation.
 There are currently two flavors of this extension available:
-  o an MRI Ruby extension written in Ruby and C/C++ using TAO 
-    (The ACE ORB; see http://www.cs.wustl.edu/~schmidt/TAO.html).
-  o a JRuby extension written in Ruby and Java using JacORB 
+  o an MRI Ruby extension written in Ruby and C/C++ using TAO
+    (The ACE ORB; see http://www.dre.vanderbilt.edu/~schmidt/TAO.html).
+  o a JRuby extension written in Ruby and Java using JacORB
     (http://www.jacorb.org/index.html).
 A native Ruby implementation of an OMG IDL compiler supplements this
 extension and provides powerful features like direct inclusion of IDL
@@ -56,4 +56,4 @@ IN NO EVENT WILL REMEDY IT OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE
 FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
 DAMAGES, EVEN IF REMEDY IT HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-R2CORBA is Copyright Remedy IT. Nijkerk, The Netherlands, 2006-2013.
+R2CORBA is Copyright Remedy IT. Duiven, The Netherlands, 2006-2019.

data/README.rdoc

@@ -0,0 +1,62 @@
+{<img src="https://badge.fury.io/rb/r2corba.svg" alt="Gem Version" />}[https://rubygems.org/gems/r2corba]
+{<img src="https://www.codefactor.io/repository/github/remedyit/r2corba/badge" alt="CodeFactor" />}[https://www.codefactor.io/repository/github/remedyit/r2corba]
+{<img src="https://github.com/RemedyIT/r2corba/workflows/linux/badge.svg" alt="Linux CI" />}[https://github.com/RemedyIT/r2corba/actions?query=workflow%3Alinux]
+{<img src="https://github.com/RemedyIT/r2corba/workflows/windows/badge.svg" alt="Windows CI" />}[https://github.com/RemedyIT/r2corba/actions?query=workflow%3Awindows]
+
+= R2CORBA
+
+== Description
+
+R2CORBA (Ruby2CORBA) is a {CORBA}[https://www.omg.org/spec/CORBA] language mapping implementation for the {Ruby programming language}[https://www.ruby-lang.org].
+
+== Synopsis
+
+R2CORBA provides a complete implementation of the standard OMG Ruby CORBA Language Mapping ({RCLM}[https://www.omg.org/spec/RCLM]) compliant with the latest version of the CORBA standard.
+
+R2CORBA includes:
+
+* an RCLM compliant RIDL code generator backend
+* an RCLM compliant API
+* multiple ORB implementations through an extension framework
+
+Instead of going for a complete native Ruby mapping implementing a native Ruby ORB, R2CORBA aims at providing CORBA functionality through a Ruby extension using the DII and DSI interfaces of an existing CORBA ORB implementation. There are currently two flavors of this extension available:
+
+* an MRI Ruby extension written in Ruby and C/C++ using {TAO}[https://www.remedy.nl/opensource/tao.html]
+* a JRuby extension written in Ruby and Java using {JacORB}[https://www.remedy.nl/opensource/jacorb.html]
+
+The {RIDL}[https://www.remedy.nl/opensource/ridl.html] based, native Ruby implementation of an OMG \IDL compiler supplements this extension and provides powerful features like direct inclusion of \IDL language modules into your Ruby programs without the need of explicit, separate stub generation.
+
+== How to get R2CORBA
+
+Execute
+
+ gem install r2corba
+
+to install R2CORBA as a gem.
+
+== Bugs
+
+If you find a bug, please report it at the R2CORBA project's {issue tracker}[https://github.com/RemedyIT/r2corba/issues].
+
+== License
+
+R2CORBA is Copyright (c) 2007-2021 Remedy IT Expertise BV, The Netherlands.
+
+It is free software, and may be redistributed under the terms specified in the link:LICENSE file.
+
+== Acknowledgments
+
+See the link:THANKS file.
+
+== Warranty
+
+This software is provided "as is" and without any express or implied warranties, including, without limitation, the implied warranties of merchantibility and fitness for a particular purpose.
+
+== Releasing new r2corba gems
+
+A new r2corba ruby gem release can be made by incrementing the R2CORBA version in link:lib/corba/common/version.rb and create a new release on {github}[https://github.com/RemedyIT/r2corba/releases] matching the new version (for example v1.6.0). The github {Ruby Gem Release}[https://github.com/RemedyIT/r2corba/actions?query=workflow%3A%22Ruby+Gem+Release%22] action will automatically create a new {r2corba}[https://www.rubygems.org/gems/r2corba] and {taosource}[https://www.rubygems.org/gems/taosource] gem and push these to Rubygems.org.
+
+A new R2CORBA taosource gem can be created by executing
+
+  rake r2corba:gem:taogem
+

data/THANKS

@@ -15,7 +15,7 @@ Our thanks go to:
   OS abstraction and multiplatform compatibility of this software
   make it an ideal ingredient for a Ruby CORBA implementation.
 
-* The people of the JacORB development team (a.o. Gerald Brose and 
+* The people of the JacORB development team (a.o. Gerald Brose and
   Andre Spiegel) and all their collaborators for creating a high-
   performance, multi threaded and spec compliant ORB for the
   Java environment.
@@ -26,7 +26,7 @@ Our thanks go to:
   2001 (incl. RINN and Ruby-Orbit) which has helped us in many ways
   to create R2CORBA.
 
-* Paul Brannan of Automated Trading Desk, LLC for his insightfull
+* Paul Brannan of Automated Trading Desk, LLC for his insightful
   comments on the first release of the Ruby CORBA language mapping.
 
 * Renato Lucindo and Eider Oliveira for their remarks and fixes for
@@ -36,7 +36,7 @@ Our thanks go to:
 
 * William Otte for his patches for the Mac OSX port.
 
-* David MacMahon for his comments and tests, especially with regard to 
+* David MacMahon for his comments and tests, especially with regard to
   omniORBpy interoperability.
 
 * David MacMahon for his Multi_Threading/Threads test.
@@ -46,7 +46,9 @@ Our thanks go to:
 
 * Karsten Richter for reporting a bug in union implicit default
   handling and providing a partial patch and regression test.
-  
+
 * Grant Birchmeier for reporting the RIDL logger bug (triggered
   by an unknown pragma)
- 
+
+* Andrey Mramornov for reporting and testing the R2CORBA build
+  problems on Ubuntu.

data/bin/r2corba

@@ -1,4 +1,4 @@
-#!/bin/env ruby
+#!/usr/bin/env ruby
 #---------------------------------
 # This file is generated
 #---------------------------------

data/bin/ridlc

@@ -1,4 +1,4 @@
-#!/bin/env ruby
+#!/usr/bin/env ruby
 #---------------------------------
 # This file is generated
 #---------------------------------

data/bin/rins

@@ -1,4 +1,4 @@
-#!/bin/env ruby
+#!/usr/bin/env ruby
 #---------------------------------
 # This file is generated
 #---------------------------------

data/ext/extload/extload.c

@@ -9,13 +9,12 @@ static TCHAR *pszPathEnd = 0;
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
   (void)lpvReserved;
-  size_t len;
 
   if (fdwReason == DLL_PROCESS_ATTACH)
   {
     GetModuleFileName(hinstDLL, &szModulePath[0], MAX_PATH);
     /* find last path separator and cut off path to get foldername incl. last separator */
-    len = strlen (&szModulePath[0]);
+    size_t len = strlen (&szModulePath[0]);
     while (len > 0 && szModulePath[--len] != '\\') ;
     pszPathEnd = &szModulePath[len+1];
     *pszPathEnd = '\0';
@@ -23,16 +22,15 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
   return TRUE;
 }
 
-typedef void (WINAPI *TExtInit)(void);
+typedef void (WINAPI *TExtInit)();
 
 #define DEF_EXTENSION_INIT(LIBNAME) \
 __declspec (dllexport) void Init_ ## LIBNAME ## w() \
 { \
-  const char *pszLibName; \
   HMODULE hlib; \
   TExtInit pfInit; \
 \
-  pszLibName = #LIBNAME ".so"; \
+  const char *pszLibName = #LIBNAME ".so"; \
   strcat (&szModulePath[0], pszLibName); \
   if (NULL == (hlib = LoadLibraryEx(szModulePath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH))) \
   { \
@@ -41,7 +39,8 @@ __declspec (dllexport) void Init_ ## LIBNAME ## w() \
     strcat (&szModulePath[0], pszLibName); \
     if (NULL == (hlib = LoadLibraryEx(szModulePath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH))) \
     { \
-      printf("ERROR: extload failed to load %s\n", #LIBNAME); \
+      DWORD dwError = GetLastError(); \
+      printf("ERROR: extload failed to load %s.so and %s, error code %lu\n", #LIBNAME, szModulePath, dwError); \
       return; \
     } \
   } \

data/ext/libr2tao/any.cpp

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #------------------------------------------------------------------*/
 
 #include "required.h"
@@ -715,8 +714,8 @@ R2TAO_EXPORT void r2tao_Ruby2Any(CORBA::Any& _any, CORBA::TypeCode_ptr _tc, VALU
         // autowrap valuebox values
         rval = r2tao_wrap_Valuebox (rval, _tc);
       }
-      // fall through
     }
+    // fall through
     case CORBA::tk_value:
     case CORBA::tk_event:
     {

data/ext/libr2tao/exception.cpp

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #------------------------------------------------------------------*/
 
 #include "required.h"

data/ext/libr2tao/exception.h

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #------------------------------------------------------------------*/
 
 #ifndef __R2TAO_EXCEPTION_H
@@ -23,7 +22,6 @@
  * see 19.16 "Mapping for Exception Types" and 19.22 "Handling Exceptions".
  *
  */
-
 #define R2TAO_TRY   try
 #define R2TAO_CATCH \
   catch (const CORBA::SystemException& sex) \

data/ext/libr2tao/longdouble.cpp

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #------------------------------------------------------------------*/
 
 #include "required.h"

data/ext/libr2tao/longdouble.h

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #------------------------------------------------------------------*/
 
 #if defined (NONNATIVE_LONGDOUBLE)

data/ext/libr2tao/object.cpp

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #------------------------------------------------------------------*/
 
 #include "required.h"
@@ -20,6 +19,7 @@
 #include "object.h"
 #include "exception.h"
 #include "orb.h"
+#include <memory>
 
 R2TAO_EXPORT VALUE r2corba_cObject = 0;
 R2TAO_EXPORT VALUE r2tao_cObject = 0;
@@ -562,7 +562,7 @@ public:
     : req_ (req),
       exception_ (false),
       corba_ex_ (0) {}
-  virtual ~R2TAO_Request_BlockedRegionCaller ();
+  virtual ~R2TAO_Request_BlockedRegionCaller () noexcept(false);
 
   VALUE call ();
 
@@ -578,13 +578,13 @@ protected:
   CORBA::Exception* corba_ex_;
 };
 
-R2TAO_Request_BlockedRegionCaller::~R2TAO_Request_BlockedRegionCaller()
+R2TAO_Request_BlockedRegionCaller::~R2TAO_Request_BlockedRegionCaller() noexcept(false)
 {
   if (this->exception_)
   {
     if (corba_ex_)
     {
-      ACE_Auto_Basic_Ptr<CORBA::Exception> e_ptr(corba_ex_);
+      std::unique_ptr<CORBA::Exception> e_ptr(corba_ex_);
       corba_ex_->_raise ();
     }
     else

data/ext/libr2tao/object.h

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #------------------------------------------------------------------*/
 #ifndef __R2TAO_OBJECT_H
 #define __R2TAO_OBJECT_H

data/ext/libr2tao/orb.cpp

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #------------------------------------------------------------------*/
 
 #include "orb.h"
@@ -21,7 +20,7 @@
 #include "ace/Reactor.h"
 #include "ace/Signal.h"
 #include "ace/Sig_Handler.h"
-#include "ace/Auto_Ptr.h"
+#include <memory>
 
 #define RUBY_INVOKE_FUNC RUBY_ALLOC_FUNC
 
@@ -243,7 +242,7 @@ VALUE rCORBA_ORB_init(int _argc, VALUE *_argv, VALUE /*klass*/) {
   char **argv;
   int i;
   CORBA::ORB_var orb;
-  ACE_Auto_Basic_Ptr<char*> argv_safe;
+  std::unique_ptr<char*> argv_safe;
 
   rb_scan_args(_argc, _argv, "02", &v0, &v1);
 
@@ -458,7 +457,7 @@ public:
       timeout_ (&to),
       exception_ (false),
       corba_ex_ (0) {}
-  virtual ~R2TAO_ORB_BlockedRegionCaller ();
+  virtual ~R2TAO_ORB_BlockedRegionCaller () noexcept(false);
 
   VALUE call (bool with_unblock=true);
 
@@ -478,13 +477,13 @@ protected:
   CORBA::Exception* corba_ex_;
 };
 
-R2TAO_ORB_BlockedRegionCaller::~R2TAO_ORB_BlockedRegionCaller()
+R2TAO_ORB_BlockedRegionCaller::~R2TAO_ORB_BlockedRegionCaller() noexcept(false)
 {
   if (this->exception_)
   {
     if (corba_ex_)
     {
-      ACE_Auto_Basic_Ptr<CORBA::Exception> e_ptr(corba_ex_);
+      std::unique_ptr<CORBA::Exception> e_ptr(corba_ex_);
       corba_ex_->_raise ();
     }
     else
@@ -569,7 +568,7 @@ public:
     : R2TAO_ORB_BlockedRegionCaller (orb), sg_(sg) {}
   R2TAO_ORB_BlockedWorkPending (R2CSigGuard& sg, CORBA::ORB_ptr orb, ACE_Time_Value& to)
     : R2TAO_ORB_BlockedRegionCaller (orb, to), sg_(sg) {}
-  virtual ~R2TAO_ORB_BlockedWorkPending ();
+  virtual ~R2TAO_ORB_BlockedWorkPending () noexcept(false);
 
 protected:
   virtual VALUE do_exec ();
@@ -578,7 +577,7 @@ private:
   R2CSigGuard& sg_;
 };
 
-R2TAO_ORB_BlockedWorkPending::~R2TAO_ORB_BlockedWorkPending()
+R2TAO_ORB_BlockedWorkPending::~R2TAO_ORB_BlockedWorkPending() noexcept(false)
 {
   if (this->exception_)
   {
@@ -586,7 +585,7 @@ R2TAO_ORB_BlockedWorkPending::~R2TAO_ORB_BlockedWorkPending()
     try {
       if (corba_ex_)
       {
-        ACE_Auto_Basic_Ptr<CORBA::Exception> e_ptr(corba_ex_);
+        std::unique_ptr<CORBA::Exception> e_ptr(corba_ex_);
         corba_ex_->_raise ();
       }
       else

data/ext/libr2tao/orb.h

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #------------------------------------------------------------------*/
 #ifndef __R2TAO_ORB_H
 #define __R2TAO_ORB_H

data/ext/libr2tao/r2tao_export.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /*--------------------------------------------------------------------
-# r2tao_ext.h - R2TAO CORBA basic support
+# r2tao_export.h - R2TAO CORBA basic support
 #
 # Author: Martin Corino
 #
@@ -9,7 +9,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #------------------------------------------------------------------*/
 #ifndef R2TAO_EXPORT_H
 #define R2TAO_EXPORT_H

data/ext/libr2tao/r2tao_ext.h

@@ -8,15 +8,10 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #------------------------------------------------------------------*/
 #ifndef __R2TAO_EXT_H
 #define __R2TAO_EXT_H
 
-#if defined (__cplusplus)
-};
-#endif
-
 #if defined (OLD_MSC_VER)
   // un-fudge the version macro here that was fudged
   // in required.h otherwise ACE will complain
@@ -24,15 +19,7 @@
   #define _MSC_VER OLD_MSC_VER
 #endif
 
-#include <ace/pre.h>
-
 #include <ace/config-all.h>
 
-#include <ace/post.h>
-
-#if defined (__cplusplus)
-extern "C" {
-#endif
-
 #endif