Wed Aug 8 12:29:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 68 insertions, 5 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 0d3151ae5e3..469cd7b8bd0 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Wed Aug  8 12:29:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Codeset.mpc:
+        * tao/Codeset/Codeset_Manager_i.cpp:
+        * tao/Codeset/CodeSetContext.pidl:
+        * tao/CONV_FRAME.pidl:
+        * tao/Makefile.am:
+          Moved the CodeSetContext struct to the Codeset library, it
+          is only used by code in this library.
+
 Wed Aug  8 11:58:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/PortableServer/Active_Object_Map.{cpp,h}:
diff --git a/TAO/tao/CONV_FRAME.pidl b/TAO/tao/CONV_FRAME.pidl
index 579a669d967..185d4221192 100644
--- a/TAO/tao/CONV_FRAME.pidl
+++ b/TAO/tao/CONV_FRAME.pidl
@@ -26,11 +26,6 @@ module CONV_FRAME {
      CodeSetComponent ForCharData;
      CodeSetComponent ForWcharData;
   };
-
-  struct CodeSetContext {
-     CodeSetId char_data;
-     CodeSetId wchar_data;
-  };
 };
 
 #endif /* TAO_CORBA_CONV_FRAME_PIDL */
diff --git a/TAO/tao/Codeset.mpc b/TAO/tao/Codeset.mpc
index 2e30a69159e..c84514f6732 100644
--- a/TAO/tao/Codeset.mpc
+++ b/TAO/tao/Codeset.mpc
@@ -29,5 +29,11 @@ project : taolib, install, tao_versioning_idl_defaults, nolink_codecfactory {
   }
 
   IDL_Files {
+    idlflags += -GA -SS -Sci -Sorb \
+                -Wb,export_macro=TAO_Codeset_Export \
+                -Wb,export_include=tao/Codeset/codeset_export.h \
+                -o Codeset
+    idlflags -= -St
+    Codeset/CodeSetContext.pidl
   }
 }
diff --git a/TAO/tao/Codeset/CodeSetContext.pidl b/TAO/tao/Codeset/CodeSetContext.pidl
new file mode 100644
index 00000000000..dd3418408e6
--- /dev/null
+++ b/TAO/tao/Codeset/CodeSetContext.pidl
@@ -0,0 +1,25 @@
+// -*- IDL -*-
+
+/**
+ * @file CodeSetContext.pidl
+ *
+ * $Id$
+ *
+ * This file is used to generate CodeSetContextC.*
+ */
+
+#ifndef TAO_CORBA_CODESETCONTEXT_PIDL
+#define TAO_CORBA_CODESETCONTEXT_PIDL
+
+#include "tao/CONV_FRAME.pidl"
+
+#pragma prefix "omg.org"
+
+module CONV_FRAME {
+  struct CodeSetContext {
+     CodeSetId char_data;
+     CodeSetId wchar_data;
+  };
+};
+
+#endif /* TAO_CORBA_CODESETCONTEXT_PIDL */
diff --git a/TAO/tao/Codeset/Codeset_Manager_i.cpp b/TAO/tao/Codeset/Codeset_Manager_i.cpp
index 43df345a0e7..5246f2abac4 100644
--- a/TAO/tao/Codeset/Codeset_Manager_i.cpp
+++ b/TAO/tao/Codeset/Codeset_Manager_i.cpp
@@ -13,6 +13,7 @@
 #include "tao/Codeset/Codeset_Manager_i.h"
 #include "tao/Codeset/Codeset_Translator_Factory.h"
 #include "tao/Codeset/Codeset.h"
+#include "tao/Codeset/CodeSetContextC.h"
 
 #include "ace/Dynamic_Service.h"
 #include "ace/Codeset_Registry.h"
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index 1033b7dad49..3f9b87c44e8 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -1555,6 +1555,27 @@ EXTRA_DIST = \
 
 if BUILD_EXCEPTIONS
 
+BUILT_SOURCES += \
+  Codeset/CodeSetContextA.cpp \
+  Codeset/CodeSetContextA.h \
+  Codeset/CodeSetContextC.cpp \
+  Codeset/CodeSetContextC.h \
+  Codeset/CodeSetContextS.h
+
+CLEANFILES += \
+  Codeset/CodeSetContext-stamp \
+  Codeset/CodeSetContextA.cpp \
+  Codeset/CodeSetContextA.h \
+  Codeset/CodeSetContextC.cpp \
+  Codeset/CodeSetContextC.h \
+  Codeset/CodeSetContextS.h
+
+Codeset/CodeSetContextA.cpp Codeset/CodeSetContextA.h Codeset/CodeSetContextC.cpp Codeset/CodeSetContextC.h Codeset/CodeSetContextS.h: Codeset/CodeSetContext-stamp
+
+Codeset/CodeSetContext-stamp: $(srcdir)/CodeSetContext/CodeSetContext.pidl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -GA -SS -Sci -Sorb -Wb,export_macro=TAO_Codeset_Export -Wb,export_include=tao/Codeset/codeset_export.h -o Codeset $(srcdir)/Codeset/CodeSetContext.pidl
+	@touch $@
+
 lib_LTLIBRARIES += libTAO_Codeset.la
 
 libTAO_Codeset_la_CPPFLAGS = \
@@ -1566,6 +1587,8 @@ libTAO_Codeset_la_CPPFLAGS = \
 
 libTAO_Codeset_la_SOURCES = \
   Codeset/Codeset.cpp \
+  Codeset/CodeSetContextA.cpp \
+  Codeset/CodeSetContextC.cpp \
   Codeset/Codeset_Descriptor.cpp \
   Codeset/Codeset_Manager_Factory.cpp \
   Codeset/Codeset_Manager_i.cpp \
@@ -1584,6 +1607,9 @@ libTAO_Codeset_la_LIBADD = \
 
 nobase_include_HEADERS += \
   Codeset/Codeset.h \
+  Codeset/CodeSetContextA.h \
+  Codeset/CodeSetContextC.h \
+  Codeset/CodeSetContextS.h
   Codeset/Codeset_Descriptor.h \
   Codeset/Codeset_Manager_Factory.h \
   Codeset/Codeset_Manager_i.h \