Updated flags for client_proxy_hdr, not client_proxy anymore

    * connectors/psdd4ccm/ridlbe/ccmx11/facets/psdd4ccm/config.rb:
    * ridlbe/ccmx11/config.rb:
    * ridlbe/ccmx11/facets/ami4ccm/config.rb:
    * ridlbe/ccmx11/facets/corba4ccm/config.rb:
    * ridlbe/ccmx11/facets/dds/config.rb:
    * ridlbe/ccmx11/facets/dds4ccm/config.rb:

connectors/psdd4ccm/ridlbe/ccmx11/facets/psdd4ccm/config.rb

@@ -156,7 +156,7 @@ def self.gen_psdd4ccm_conn_only(options, idl_ext)
 
         options[:no_servant_code] = true
         options[:no_cdr_streaming] = true
-        options[:no_client_proxy] = true
+        options[:no_client_proxy_hdr] = true
 
         # mark this pass for PSDD4CCM connector implementation generation
         options[:gen_exec_for_psdd_connector] = true
@@ -229,7 +229,7 @@ def self.gen_psdd4ccm_lemgen(options, idl_ext)
         # if not set explicitly but -Gxhst is than assume -Gxhlst is as well
         lemgen_opts.gen_export_lem_stub ||= options.gen_export_st
         lemgen_opts[:gen_lem_gen] = true # -Glem,gen
-        lemgen_opts[:no_client_proxy] = true
+        lemgen_opts[:no_client_proxy_hdr] = true
         lemgen_opts[:no_cdr_streaming] = true
         lemgen_opts[:svnt_skeletons] = false # suppress all skeleton code generation
         lemgen_opts[:gen_psdd4ccm_lemidl] = true # mark the LEM IDL generation in the scheduled pass for PSDD4CCM

ridlbe/ccmx11/config.rb

@@ -333,7 +333,7 @@ def self.setup_compile_lem_idl(options, idl_ext)
       # Only (lem) stub and lem_stub_export file have to be generated from lem idl file
       impl_opts[:svnt_skeletons] = false
       # no proxy required for local interfaces only
-      impl_opts[:no_client_proxy] = true
+      impl_opts[:no_client_proxy_hdr] = true
       # suppress CDR support for local interfaces only
       impl_opts[:no_cdr_streaming] = true
       # suppress Any and Typecode support for (local) code generation

ridlbe/ccmx11/facets/ami4ccm/config.rb

@@ -344,7 +344,7 @@ def self.gen_ami_connector_complete_ami_conn_idl(options, idl_ext)
         impl_opts[:svnt_skeletons] = false
         # generate only stub header
         impl_opts[:no_client_source] = true
-        impl_opts[:no_client_proxy] = true
+        impl_opts[:no_client_proxy_hdr] = true
 
         # schedule new input processor for *A_conn.idl
         IDL.push_input(impl_opts[:idlfile], impl_opts)
@@ -380,7 +380,7 @@ def self.gen_ami_connector_complete_ami_conn_lem(options, idl_ext)
         impl_opts[:idlfile] = IDL::CCMX11.lem_output_file(options[:acon_conn_idl], options, idl_ext)
 
         # Only (lem) stub and conn_lem_stub_export file have to be generated from lem idl file
-        impl_opts[:no_client_proxy] = true
+        impl_opts[:no_client_proxy_hdr] = true
         impl_opts[:svnt_skeletons] = false
 
         # generate the composite lem_stub_export if generating exports for connector
@@ -571,7 +571,7 @@ def self.gen_ami_idl(options, idl_ext)
         # generate full stubs
         a_opts[:no_client_source] = false
         a_opts[:no_client_header] = false
-        a_opts[:no_client_proxy] = false
+        a_opts[:no_client_proxy_hdr] = false
         IDL.push_input(a_opts[:idlfile], a_opts)
       end
 

ridlbe/ccmx11/facets/corba4ccm/config.rb

@@ -173,7 +173,7 @@ def self.schedule_corba4ccm_idl_input(options, cc_opts)
         # generate only stub header
         cc_opts[:svnt_skeletons] = false
         cc_opts[:no_client_source] = true
-        cc_opts[:no_client_proxy] = true
+        cc_opts[:no_client_proxy_hdr] = true
         # generate lem stub exports if -Gxhlst or -Gxhex or -Gxhsv are specified
         cc_opts.gen_export_lem_stub ||= options.gen_export_ex || options.gen_export_svnt
         # generate LEM IDL and (in yet another pass) the LEM stubs

ridlbe/ccmx11/facets/dds/config.rb

@@ -157,7 +157,7 @@ def self.gen_idl_for_typed_entities(options, idl_ext)
         # now get the resulting IDL file and schedule a parsing pass
         # generating only the stub files without a stub proxy
         entities_opts.svnt_skeletons = false
-        entities_opts.no_client_proxy = true
+        entities_opts.no_client_proxy_hdr = true
         # Disable the generation of typecode and any support, it is not
         # used by ddsx11
         entities_opts.gen_typecodes = false

ridlbe/ccmx11/facets/dds4ccm/config.rb

@@ -157,7 +157,7 @@ def self.gen_dds4ccm_conn_only(options, idl_ext)
 
         options[:no_servant_code] = true
         options[:no_cdr_streaming] = true
-        options[:no_client_proxy] = true
+        options[:no_client_proxy_hdr] = true
 
         # mark this pass for DDS4CCM connector implementation generation
         options[:gen_exec_for_dds_connector] = true
@@ -229,7 +229,7 @@ def self.gen_dds4ccm_lemgen(options, idl_ext)
         # if not set explicitly but -Gxhst is than assume -Gxhlst is as well
         lemgen_opts.gen_export_lem_stub ||= options.gen_export_st
         lemgen_opts[:gen_lem_gen] = true # -Glem,gen
-        lemgen_opts[:no_client_proxy] = true
+        lemgen_opts[:no_client_proxy_hdr] = true
         lemgen_opts[:no_cdr_streaming] = true
         lemgen_opts[:svnt_skeletons] = false # suppress all skeleton code generation
         lemgen_opts[:gen_dds4ccm_lemidl] = true # mark the LEM IDL generation in the scheduled pass for DDS4CCM