Mon Jun 1 20:29:12 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu>

3 files changed, 32 insertions, 6 deletions

diff --git a/CIAO/CIDLC/cidlc.cpp b/CIAO/CIDLC/cidlc.cpp
index c105e80d8a7..cb33707e8a2 100644
--- a/CIAO/CIDLC/cidlc.cpp
+++ b/CIAO/CIDLC/cidlc.cpp
@@ -138,9 +138,16 @@ main (int argc, char* argv[])
                       "Run preprocessor only and output result to stdout.",
                       CL::OptionType::flag));
 
+    cld.add_option (CL::OptionDescription ("suppress-lem",
+                                           "Suppress generation of local executor mapping",
+                                           CL::OptionType::flag));
+
+    cld.add_option (CL::OptionDescription ("suppress-svnt",
+                                           "Suppress generation of servant code",
+                                           CL::OptionType::flag));
+    
     cld.add_argument ("cidl file");
 
-
     CommandLine cl;
 
     if (!parse (argc, argv, cld, cl))
@@ -330,6 +337,7 @@ main (int argc, char* argv[])
 
 
     // Generate executor mapping.
+    if (!cl.get_value ("suppress-lem", false))
     {
       ExecutorMappingGenerator lem_gen;
       lem_gen.generate (cl, tu, file_path);
@@ -349,6 +357,7 @@ main (int argc, char* argv[])
     }
 
     // Generate servant code.
+    if (!cl.get_value ("suppress-svnt", false))
     {
       ServantGenerator svnt_gen (cl);
       svnt_gen.generate (tu, file_path);
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 96506e44816..f2e8e05d2d7 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,11 +1,20 @@
+Mon Jun  1 20:29:12 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * CIDLC/cidlc.cpp:
+        * MPC/config/ciaocidldefaults.mpb:
+
+          Added two options:  --suppress-lem and --suppress-svnt, which will
+          suppress generation of the local executor mapping and servant code,
+          respectively.
+        
 Fri May 29 00:48:01 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * CIDLC/ServantHeaderGenerator.cpp:
         * CIDLC/ServantSourceGenerator.cpp:
 
-          Some tweaks to the generated _svnt files to properly compile with 
+          Some tweaks to the generated _svnt files to properly compile with
           the changes introduced in the previous commit .
-        
+
 Thu May 28 19:07:27 UTC 2009  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * CIDLC/ExecutorMappingGenerator.cpp:
diff --git a/CIAO/MPC/config/ciaocidldefaults.mpb b/CIAO/MPC/config/ciaocidldefaults.mpb
index 534e83f5a68..ff8e9449ffb 100644
--- a/CIAO/MPC/config/ciaocidldefaults.mpb
+++ b/CIAO/MPC/config/ciaocidldefaults.mpb
@@ -22,9 +22,6 @@ project: build_files {
     command           = $(CIDLC)
     commandflags      = $(CIDLC_FLAGS)
     inputext          = .cidl
-    source_outputext  = _svnt.cpp
-    header_outputext  = _svnt.h
-    generic_outputext = E.idl
     keyword cidlflags = commandflags
 
 
@@ -32,5 +29,16 @@ project: build_files {
       commandflags (--gen-desc-file) = _Impl.ccd
     }
 
+    optional (header_outputext) {
+      commandflags (!--suppress-svnt) = _svnt.h
+    }
+
+    optional (source_outputext) {
+      commandflags (!--suppress-svnt) = _svnt.cpp
+    }
+
+    optional (generic_outputext) {
+      commandflags (!--suppress-lem) = E.idl
+    }
   }
 }