Merge pull request #371 from jwillemsen/jwi-proxysource

Add support to generate Any/TypeCode and CORBA related support code into separate files (WiP)
RemedyIT · Apr 21, 2024 · 69d6429 · 69d6429
2 parents 8987105 + 80b1065
commit 69d6429
Show file tree

Hide file tree

Showing 199 changed files with 1,715 additions and 679 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -8,7 +8,7 @@ assignees: ''
 ---
 
 **Version**
-Your TAOX11 version from taox11/tao/x11/versionx11.h
+Your TAOX11 version from taox11/tao/x11/base/versionx11.h
 
 **Describe the bug**
 A clear and concise description of what the bug is.

diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md
@@ -8,7 +8,7 @@ assignees: ''
 ---
 
 **Version**
-Your TAOX11 version from taox11/tao/x11/versionx11.h
+Your TAOX11 version from taox11/tao/x11/base/versionx11.h
 
 **Describe the issue**
 Description of your issue with as much as detail as possible

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -32,7 +32,7 @@ env:
   TAOX11_ROOT: ${{ github.workspace }}
   INSTALL_PREFIX: ${{ github.workspace }}/stage
   X11_BRANCH: master
-  ACETAOMPC_BRANCH: master
+  ACETAOMPC_BRANCH: Latest_ACE7TAO3_Micro
 
 jobs:
   build:

diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@ ACE
 *C.inl
 *C.cpp
 *P.h
+*P.cpp
 *S.h
 *S.inl
 *S.cpp

diff --git a/bin/MPC/config/ridl_base_defaults.mpb b/bin/MPC/config/ridl_base_defaults.mpb
@@ -24,20 +24,23 @@ project: taox11_basedefaults, taobaseidldefaults {
     optional(source_pre_extension) {
       commandflags(-GC) += AmiC
       commandflags(-GCa) += AmiC
+      commandflags(-Gcpc) += CP
+      commandflags(-Gatc) += A
     }
 
     optional(header_pre_extension) {
-      commandflags(!-Scp) += CP
+      commandflags(!-Scph) += CP
       commandflags(!-Ssh) += SP
       commandflags(-GC) += AmiC, AmiCP
       commandflags(-GCa) += AmiC, AmiCP
+      commandflags(-Gath) += A
     }
   }
 
   after -= TAO_IDL_EXE
   idlflags -= $(TAO_IDLFLAGS)
   idlflags -= -Sa -St
-  idlflags += -Wb,pre_include=tao/x11/pre.h \
-              -Wb,post_include=tao/x11/post.h -I$(TAOX11_ROOT)
+  idlflags += -Wb,pre_include=tao/x11/base/pre.h \
+              -Wb,post_include=tao/x11/base/post.h -I$(TAOX11_ROOT)
   idlflags += $(RIDLCFLAGS) -Sci -Ssi -Sa -St
 }
diff --git a/bin/MPC/modules/IDLHelper.pm b/bin/MPC/modules/IDLHelper.pm
@@ -81,6 +81,20 @@ sub get_output {
       push(@out, $1);
     }
   }
+  if ($flags =~ /--Gxhcpr/) {
+    if ($flags =~ /-Wb,stub_proxy_export_file=(\S*)/) {
+      push(@out, $1);
+    } elsif ($flags =~ /-Wb,stub_proxy_export_include=(\S*)/) {
+      push(@out, $1);
+    }
+  }
+  if ($flags =~ /--Gxhat/) {
+    if ($flags =~ /-Wb,anytypecode_export_file=(\S*)/) {
+      push(@out, $1);
+    } elsif ($flags =~ /-Wb,anytypecode_export_include=(\S*)/) {
+      push(@out, $1);
+    }
+  }
   if ($flags =~ /-Gxhsv/ && $flags =~ /-Wb,svnt_export_include=(\S*)/) {
     push(@out, $1);
   }

diff --git a/bin/taox11_tests.lst b/bin/taox11_tests.lst
@@ -178,6 +178,10 @@ tests/timebase/run_test.pl:
 tests/typecode/run_test.pl: !CORBA_E_COMPACT !CORBA_E_MICRO
 tests/typecode_adapter/orb_create/run_test.pl: !CORBA_E_COMPACT !CORBA_E_MICRO
 tests/typecode_adapter/resolve_ref/run_test.pl: !CORBA_E_COMPACT !CORBA_E_MICRO
+tests/typelib/nocpp/run_test.pl:
+tests/typelib/shared/run_test.pl:
+tests/typelib/stdlib/run_test.pl:
+tests/typelib/taox11/run_test.pl:
 tests/union/run_test.pl:
 tests/union/run_cross_tao_server.pl:
 tests/wchar/run_test.pl:

diff --git a/docs/src/compilation.adoc b/docs/src/compilation.adoc
@@ -17,8 +17,8 @@ command line options should be used when invoking the RIDL compiler.  +
  Command line options: +
 
 -----------------------------------
-        -Wb,pre_include=tao/x11/pre.h
-        -Wb,post_include=tao/x11/post.h
+        -Wb,pre_include=tao/x11/base/pre.h
+        -Wb,post_include=tao/x11/base/post.h
         -I$TAOX11_ROOT
         -Sci
         -Ssi
@@ -47,8 +47,8 @@ When a client needs to use <<ami/taox11_ami.adoc#,CORBA AMI>>, the following
 command line options should be applied to the RIDL compiler:
 
 -----------------------------------
-        -Wb,pre_include=tao/x11/pre.h
-        -Wb,post_include=tao/x11/post.h
+        -Wb,pre_include=tao/x11/base/pre.h
+        -Wb,post_include=tao/x11/base/post.h
         -I$TAOX11_ROOT
         -Sci
         -Ssi

diff --git a/docs/src/ridlc.adoc b/docs/src/ridlc.adoc
@@ -250,11 +250,19 @@ Sets implementation export file to generate for -Gxhimpl|
 
 ||-Wb,anytypecode_export_macro=MACRO|
 
-Sets export macro for Any ops and TypeCode|
+Sets export macro for Any and TypeCode|
 
 ||-Wb,anytypecode_export_include=FILE|
 
-Sets export include file for Any ops and TypeCode|
+Sets export include file for Any and TypeCode|
+
+||-Wb,stub_proxy_export_macro=MACRO|
+
+Sets export macro for stub proxy|
+
+||-Wb,stub_proxy_export_include=FILE|
+
+Sets export include file for stub proxy|
 
 ||-Wb,include_guard=MACRO|
 
@@ -314,6 +322,20 @@ Generate Any and TypeCode support implementation in separate *A.cpp file
 
 off
 
+||-Gath|
+
+Generate Any and TypeCode support declarations in separate *A.h file
+ (not generated by default)|
+
+off
+
+||-Gcpc|
+
+Generate stub proxy implementation in separate *CP.cpp file
+ (not generated by default)|
+
+off
+
 ||-Gaia|
 
 Generate AnyInsert_Adapter version of the Any insert policy  (not generated by default). +
@@ -340,6 +362,12 @@ Generate std::ostream insertion operators (not generated by default)|
 
 off
 
+||-Guia|
+
+Generate std::invalid_argument exception as part of our union generation (CORBA::BAD_PARAM by default)|
+
+off
+
 ||-Gtie|
 
 Generate delegation based servant implementation support (not generated by default)|
@@ -377,6 +405,20 @@ default).|
 
 off
 
+||-Gxhcp|
+
+Generate export header file for stub proxy code (not generated by
+default).|
+
+off
+
+||-Gxhat|
+
+Generate export header file for any and typecode code (not generated by
+default).|
+
+off
+
 ||-Gisrv|
 
 Generate implementation classes for servants (not generated by default;
@@ -429,9 +471,9 @@ Suppress generation of client header file (generated by default)|
 
 off
 
-||-Scp|
+||-Scph|
 
-Suppress generation of client proxy header file (generated by default)|
+Suppress generation of stub proxy header file (generated by default)|
 
 off
 

diff --git a/examples/log_module/my_log_module_export.h b/examples/log_module/my_log_module_export.h
@@ -9,7 +9,7 @@
 #ifndef MY_LOG_MODULE_EXPORT_H
 #define MY_LOG_MODULE_EXPORT_H
 
-#include "tao/x11/taox11_export_macros.h"
+#include "tao/x11/base/taox11_export_macros.h"
 
 #if defined (TAOX11_AS_STATIC_LIBS) && !defined (MY_LOGGER_HAS_DLL)
 #  define MY_LOGGER_HAS_DLL 0

diff --git a/orbsvcs/orbsvcs/naming_server/taox11_cosnaming_export.h b/orbsvcs/orbsvcs/naming_server/taox11_cosnaming_export.h
@@ -7,7 +7,7 @@
 #ifndef TAOX11_COSNAMING_EXPORT_H
 #define TAOX11_COSNAMING_EXPORT_H
 
-#include "tao/x11/taox11_export_macros.h"
+#include "tao/x11/base/taox11_export_macros.h"
 
 #if defined (TAOX11_AS_STATIC_LIBS) && !defined (TAOX11_COSNAMING_HAS_DLL)
 #  define TAOX11_COSNAMING_HAS_DLL 0

diff --git a/ridlbe/base/config.rb b/ridlbe/base/config.rb
@@ -22,7 +22,7 @@ def determine_taox11_version
           beta: 0
         }
 
-        base = File.join(File.dirname(__FILE__), '..', '..', 'tao', 'x11', 'versionx11.h')
+        base = File.join(File.dirname(__FILE__), '..', '..', 'tao', 'x11', 'base', 'versionx11.h')
         File.open(base, 'r') do |file|
           while (line = file.gets)
             if VERSION_REGEXP =~ line
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ ACE @@
     *C.inl
     *C.cpp
     *P.h
+    *P.cpp
     *S.h
     *S.inl
     *S.cpp
@@ Expand Down @@