Fri Jan 20 10:31:19 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>

13 files changed, 73 insertions, 51 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 94188eb7ced..5bef2966e0b 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jan 20 10:31:19 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * connectors/dds4ccm/idl/dds4ccm_stub.mpc:
+        * connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc:
+        * connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc:
+          Reduced the amount of files being generated
+
 Fri Jan 20 10:08:02 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc:
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc b/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc
index 7d50d101e22..150fd644a77 100644
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc
+++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_stub.mpc
@@ -9,7 +9,7 @@ project (DDS4CCM_idl_gen) : install, dds4ccm, componentidldefaults {
               -I$(CIAO_ROOT)/connectors
 
   IDL_Files {
-    idlflags += -Gxhst -Gxhsk -SS -Ssvcp -Ssvtp -Sci
+    idlflags += -Gxhst -Gxhsk -SS -Ssvntc -Ssvntt -Sci
     dds4ccm_Base.idl
   }
 
@@ -34,7 +34,7 @@ project (DDS4CCM_idl_gen) : install, dds4ccm, componentidldefaults {
 
   IDL_Files {
     idlflags -= -Gxhst -Gxhsk
-    idlflags += -Ssvcp -Ssvtp -SS -Sci
+    idlflags += -Ssvntc -Ssvntt -SS -Sci
     dds4ccm_ConnectorStatusListener.idl
     dds4ccm_DataListenerControl.idl
     dds4ccm_PortStatusListener.idl
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc
index bf17a2fc25c..32ace3e6d0f 100644
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc
+++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_lem_stub.mpc
@@ -13,7 +13,7 @@ project (CIAO_NDDS_lem_gen) : install, ndds_idltocpp, ciaoidldefaults {
   }
 
   IDL_Files {
-     idlflags += -Scc
+     idlflags += -Sci
      ndds_dcps_i_handleE.idl
   }
 
@@ -32,6 +32,7 @@ project (CIAO_NDDS_lem_stub) : install, ndds_idltocpp_stub, ccm_lem_stub, ccm_se
 
   Source_Files {
    ndds_dcpsEC.cpp
+   ndds_dcps_i_handleEC.cpp
   }
 
   Header_Files {
diff --git a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc
index 4512ef46753..e751aea5b61 100644
--- a/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc
+++ b/CIAO/connectors/dds4ccm/idl/ndds/ndds_idltocpp_stub.mpc
@@ -6,7 +6,7 @@ project (CIAO_NDDS_idl_gen) : install, ndds_idltocpp, componentidldefaults {
               -Wb,stub_export_include=ndds_stub_export.h \
               -Wb,skel_export_macro=NDDS_SKEL_Export \
               -Wb,skel_export_include=ndds_skel_export.h \
-              -I$(CIAO_ROOT)/connectors -Glem -Ssvcp -Ssvtp
+              -I$(CIAO_ROOT)/connectors -Glem -Ssvntc -Ssvntt
 
   IDL_Files {
     ndds_dcps.idl
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 69d27ca5443..bc91951f0e1 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,16 @@
+Fri Jan 20 10:30:24 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * MPC/config/taobaseidldefaults.mpb:
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_produce.cpp:
+        * TAO_IDL/be/be_util.cpp:
+        * TAO_IDL/be/be_visitor_root/root_svth.cpp:
+        * TAO_IDL/be_include/be_global.h:
+        * docs/compiler.html:
+          Changed the arguments a little bit more, -Ssvntc suppreses _svnt.cpp,
+          -Ssvntt suppresses _svnt_T.{h,cpp}
+
 Fri Jan 20 09:27:41 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * MPC/config/taobaseidldefaults.mpb:
diff --git a/TAO/MPC/config/taobaseidldefaults.mpb b/TAO/MPC/config/taobaseidldefaults.mpb
index 1b05ba68655..0f66908a82d 100644
--- a/TAO/MPC/config/taobaseidldefaults.mpb
+++ b/TAO/MPC/config/taobaseidldefaults.mpb
@@ -59,15 +59,19 @@ project: build_files {
     }
 
     optional(source_pre_extension) {
-      commandflags(-Gsv && !-Ssvcp) += _svnt
+      commandflags(-Gsv && !-Ssvntc) += _svnt
     }
 
     optional(source_pre_extension) {
-      commandflags(-Gsv && !-Ssvtp) += _svnt_T
+      commandflags(-Gsv && !-Ssvntt) += _svnt_T
     }
 
     optional(header_pre_extension) {
-      commandflags(-Gsv) += _svnt, _svnt_T
+      commandflags(-Gsv) += _svnt
+    }
+
+    optional(header_pre_extension) {
+      commandflags(-Gsv && !-Ssvntt) += _svnt_T
     }
 
     optional(source_pre_extension) {
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index c9a2cf8e2be..ff9c258a928 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -1090,7 +1090,7 @@ TAO_CodeGen::start_ciao_svnt_header (const char *fname)
     }
 
   // Generate the include statement for the template server header.
-  if (be_global->gen_ciao_svnt ())
+  if (be_global->gen_svnt_t_files ())
     {
       os  << "#include \""
           << be_global->be_get_ciao_tmpl_svnt_hdr_fname (true)
@@ -1220,7 +1220,7 @@ TAO_CodeGen::start_ciao_svnt_template_header (const char *fname)
     {
       *this->ciao_svnt_template_header_ << be_nl
         << "#include \""
-        << "connectors/ami4ccm/ami4ccm/ami4ccm_svnt_T.h\""
+        << "connectors/ami4ccm/ami4ccm/ami4ccm_svnt.h\""
         << be_nl;
     }
 
@@ -1972,22 +1972,19 @@ TAO_CodeGen::end_ciao_svnt_source (void)
 int
 TAO_CodeGen::end_ciao_svnt_template_header (void)
 {
-  if (be_global->gen_svnt_tpp_files ())
-    {
-      *this->ciao_svnt_template_header_ << be_nl_2
-                                        << "#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)"
-                                        << be_nl << "#include \""
-                                        << be_global->be_get_ciao_tmpl_svnt_src_fname (true)
-                                        << "\"" << be_nl
-                                        << "#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */"
-                                        << be_nl_2
-                                        << "#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)"
-                                        << be_nl << "#pragma implementation (\""
-                                        << be_global->be_get_ciao_tmpl_svnt_src_fname (true)
-                                        << "\")"
-                                        << be_nl << "#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */"
-                                        << be_nl;
-    }
+  *this->ciao_svnt_template_header_ << be_nl_2
+                                    << "#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)"
+                                    << be_nl << "#include \""
+                                    << be_global->be_get_ciao_tmpl_svnt_src_fname (true)
+                                    << "\"" << be_nl
+                                    << "#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */"
+                                    << be_nl_2
+                                    << "#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)"
+                                    << be_nl << "#pragma implementation (\""
+                                    << be_global->be_get_ciao_tmpl_svnt_src_fname (true)
+                                    << "\")"
+                                    << be_nl << "#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */"
+                                    << be_nl;
 
   if (be_global->post_include () != 0)
     {
diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp
index 0dbb5d35069..da0af2fbfd8 100644
--- a/TAO/TAO_IDL/be/be_global.cpp
+++ b/TAO/TAO_IDL/be/be_global.cpp
@@ -128,7 +128,7 @@ BE_GlobalData::BE_GlobalData (void)
     gen_anyop_files_ (false),
     gen_skel_files_ (true),
     gen_svnt_cpp_files_ (true),
-    gen_svnt_tpp_files_ (true),
+    gen_svnt_t_files_ (true),
     gen_client_inline_ (true),
     gen_client_stub_ (true),
     gen_server_skeleton_ (true),
@@ -2394,15 +2394,15 @@ BE_GlobalData::gen_svnt_cpp_files (bool val)
 }
 
 bool
-BE_GlobalData::gen_svnt_tpp_files (void) const
+BE_GlobalData::gen_svnt_t_files (void) const
 {
-  return this->gen_svnt_tpp_files_;
+  return this->gen_svnt_t_files_;
 }
 
 void
-BE_GlobalData::gen_svnt_tpp_files (bool val)
+BE_GlobalData::gen_svnt_t_files (bool val)
 {
-  this->gen_svnt_tpp_files_ = val;
+  this->gen_svnt_t_files_ = val;
 }
 
 bool
@@ -3492,13 +3492,13 @@ BE_GlobalData::parse_args (long &i, char **av)
                 be_global->any_support (false);
               }
           }
-        else if (av[i][2] == 's' && av[i][3] == 'v' && av[i][4] == 'c' && av[i][5] == 'p' && '\0' == av[i][6])
+        else if (av[i][2] == 's' && av[i][3] == 'v' && av[i][4] == 'n' && av[i][5] == 't' && av[i][6] == 'c' && '\0' == av[i][7])
           {
             be_global->gen_svnt_cpp_files (false);
           }
-        else if (av[i][2] == 's' && av[i][3] == 'v' && av[i][4] == 't' && av[i][5] == 'p' && '\0' == av[i][6])
+        else if (av[i][2] == 's' && av[i][3] == 'v' && av[i][4] == 'n' && av[i][5] == 't' && av[i][6] == 't' && '\0' == av[i][7])
           {
-            be_global->gen_svnt_tpp_files (false);
+            be_global->gen_svnt_t_files (false);
           }
         else if (av[i][2] == 'o' && av[i][3] == 'r' && av[i][4] == 'b' && '\0' == av[i][5])
           {
@@ -3536,7 +3536,7 @@ BE_GlobalData::parse_args (long &i, char **av)
               }
             else if (av[i][3] == 'c')
               {
-                // No stub inline.
+                // No stub
                 be_global->gen_client_stub (false);
               }
             else if (av[i][3] == 'd' && av[i][4] == 'r')
diff --git a/TAO/TAO_IDL/be/be_produce.cpp b/TAO/TAO_IDL/be/be_produce.cpp
index 4fd3ff7d76c..29f7875ee21 100644
--- a/TAO/TAO_IDL/be/be_produce.cpp
+++ b/TAO/TAO_IDL/be/be_produce.cpp
@@ -226,12 +226,12 @@ BE_produce (void)
           BE_visit_root (root_svs_visitor, "CIAO servant source");
         }
 
-      ctx.state (TAO_CodeGen::TAO_ROOT_SVTH);
-      be_visitor_root_svth root_svth_visitor (&ctx);
-      BE_visit_root (root_svth_visitor, "CIAO template servant header");
-
-      if (be_global->gen_svnt_tpp_files ())
+      if (be_global->gen_svnt_t_files ())
         {
+          ctx.state (TAO_CodeGen::TAO_ROOT_SVTH);
+          be_visitor_root_svth root_svth_visitor (&ctx);
+          BE_visit_root (root_svth_visitor, "CIAO template servant header");
+
           ctx.state (TAO_CodeGen::TAO_ROOT_SVTS);
           be_visitor_root_svts root_svts_visitor (&ctx);
           BE_visit_root (root_svts_visitor, "CIAO template servant source");
diff --git a/TAO/TAO_IDL/be/be_util.cpp b/TAO/TAO_IDL/be/be_util.cpp
index cfb81049b22..c003d0363b9 100644
--- a/TAO/TAO_IDL/be/be_util.cpp
+++ b/TAO/TAO_IDL/be/be_util.cpp
@@ -852,12 +852,12 @@ be_util::usage (void)
     ));
   ACE_DEBUG ((
       LM_DEBUG,
-      ACE_TEXT (" -Ssvcp\t\t\tsuppress generating servant implementation")
+      ACE_TEXT (" -Ssvntc\t\tsuppress generating servant implementation")
       ACE_TEXT (" (disabled by default)\n")
     ));
   ACE_DEBUG ((
       LM_DEBUG,
-      ACE_TEXT (" -Ssvtp\t\t\tsuppress generating servant template implementation")
+      ACE_TEXT (" -Ssvntt\t\tsuppress generating servant template files")
       ACE_TEXT (" (disabled by default)\n")
     ));
   ACE_DEBUG ((
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_svth.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_svth.cpp
index c4b4a10e963..d899d3a5db5 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_svth.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_svth.cpp
@@ -53,7 +53,7 @@ int
 be_visitor_root_svth::init (void)
 {
   /// First open the file for writing.
-  int status =
+  int const status =
     tao_cg->start_ciao_svnt_template_header (
       be_global->be_get_ciao_tmpl_svnt_hdr_fname ());
 
diff --git a/TAO/TAO_IDL/be_include/be_global.h b/TAO/TAO_IDL/be_include/be_global.h
index 9222c131750..c20bcf4a180 100644
--- a/TAO/TAO_IDL/be_include/be_global.h
+++ b/TAO/TAO_IDL/be_include/be_global.h
@@ -822,9 +822,9 @@ public:
   bool gen_svnt_cpp_files (void) const;
   void gen_svnt_cpp_files (bool val);
 
-  /// Accessors for the member gen_svnt_tpp_files_.
-  bool gen_svnt_tpp_files (void) const;
-  void gen_svnt_tpp_files (bool val);
+  /// Accessors for the member gen_svnt_t_files_.
+  bool gen_svnt_t_files (void) const;
+  void gen_svnt_t_files (bool val);
 
   /// Accessors for the member gen_client_inline_.
   bool gen_client_inline (void) const;
@@ -1198,7 +1198,7 @@ private:
 
   /// True by default, but a command line option can turn this of so that
   /// we don't generate a svnt_T.cpp file
-  bool gen_svnt_tpp_files_;
+  bool gen_svnt_t_files_;
 
   /// True by default, but a command line option can turn this off so
   /// that we don't generate a client inline file
diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html
index 330a08295ad..5a8a2b98b8a 100644
--- a/TAO/docs/compiler.html
+++ b/TAO/docs/compiler.html
@@ -1199,18 +1199,18 @@ also receives other options that are specific to it.<p>
         just suppresses it without looking at any possible contents;</td>
   </tr>
 
-  <tr><a name="Ssvcp">
-    <td><tt>-Ssvsp</tt></td>
+  <tr><a name="Ssvntc">
+    <td><tt>-Ssvntc</tt></td>
 
     <td>Suppress generation of the servant implementation file (_svnt.cpp).</td>
     <td>This option doesn't check whether something is generated in the files. It
         just suppresses them without looking at any possible contents;</td>
   </tr>
 
-  <tr><a name="Ssvtp">
-    <td><tt>-Ssvtp</tt></td>
+  <tr><a name="Ssvntt">
+    <td><tt>-Ssvntt</tt></td>
 
-    <td>Suppress generation of the servant templated implementation file (_svnt_T.cpp).</td>
+    <td>Suppress generation of the servant templated files (_svnt_T.{h,cpp}).</td>
     <td>This option doesn't check whether something is generated in the files. It
         just suppresses them without looking at any possible contents;</td>
   </tr>