Fri Jul 15 08:33:20 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>

        * MPC/config/ifr_client_skel.mpb:
        * MPC/config/ifrservice.mpb:
        * orbsvcs/IFR_Service/IFR_Service.mpc:
        * orbsvcs/orbsvcs/IFRService.mpc:
        * orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h:
        * orbsvcs/orbsvcs/IFRService/ComponentDef_i.h:
        * orbsvcs/orbsvcs/IFRService/EventPortDef_i.h:
        * orbsvcs/orbsvcs/IFRService/HomeDef_i.h:
        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp:
        * orbsvcs/orbsvcs/IFRService/IRObject_i.h:
        * orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp:
        * tao/IFR_Client/IFR_Client.mpc:
        * tao/IFR_Client/ifr_client_skel_export.h:
          Generate a new IFR_Client_skel library that contains all
          skeletons for the IFR_Client. This is generated under TAO/tao/IFR_Client
          and than used by the IFRService

        * orbsvcs/orbsvcs/IFRService/IFR_BaseS.h:
        * orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl:
        * orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp:
        * orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h:
        * orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl:
        * orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp:
        * orbsvcs/orbsvcs/IFRService/IFR_BasicS.h:
        * orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl:
        * orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp:
        * orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h:
        * orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl:
        * orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp:
        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h:
        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl:
        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp:
        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h:
        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl:
        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp:
        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h:
        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl:
        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp:
        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h:
        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl:
        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp:
          Removed these files, it are generated files that shouldn't be in
          the repository

2 files changed, 79 insertions, 6 deletions

diff --git a/TAO/tao/IFR_Client/IFR_Client.mpc b/TAO/tao/IFR_Client/IFR_Client.mpc
index aa5c9b0b20c..8ce7578e927 100644
--- a/TAO/tao/IFR_Client/IFR_Client.mpc
+++ b/TAO/tao/IFR_Client/IFR_Client.mpc
@@ -1,16 +1,19 @@
 //$Id$
 project(*idl) : tao_versioning_idl_defaults, install {
   custom_only = 1
+  idlflags += -GX \
+              -Wb,stub_export_macro=TAO_IFR_Client_Export \
+              -Wb,stub_export_include=tao/IFR_Client/ifr_client_export.h \
+              -Wb,skel_export_macro=TAO_IFR_Client_Skel_Export \
+              -Wb,skel_export_include=tao/IFR_Client/ifr_client_skel_export.h \
+              -iC tao/IFR_Client -GT
+  idlflags -= -Sa -St
+
   IDL_Files {
-    idlflags += -SS -GX \
-                -Wb,stub_export_macro=TAO_IFR_Client_Export \
-                -Wb,stub_export_include=tao/IFR_Client/ifr_client_export.h \
-                -iC tao/IFR_Client
-    idlflags -= -Sa -St
-    IFR_Base.pidl
     IFR_Basic.pidl
     IFR_Components.pidl
     IFR_Extended.pidl
+    IFR_Base.pidl
   }
 
   specific {
@@ -59,3 +62,34 @@ project(IFR_Client) : taolib, tao_output, install, anytypecode, taoidldefaults {
     install_dir = tao/IFR_Client
   }
 }
+
+project(IFR_Client_skel) : taolib, tao_output, install, anytypecode, taoidldefaults {
+  after       += *idl
+  sharedname   = TAO_IFR_Client_skel
+  dynamicflags += TAO_IFR_CLIENT_SKEL_BUILD_DLL
+
+  Source_Files {
+    IFR_BaseS.cpp
+    IFR_BasicS.cpp
+    IFR_ComponentsS.cpp
+    IFR_ExtendedS.cpp
+  }
+
+  Header_Files {
+    IFR_BaseS.h
+    IFR_BasicS.h
+    IFR_ComponentsS.h
+    IFR_ExtendedS.h
+  }
+
+  Inline_Files {
+    IFR_BaseS.inl
+    IFR_BasicS.inl
+    IFR_ComponentsS.inl
+    IFR_ExtendedS.inl
+  }
+
+  specific {
+    install_dir = tao/IFR_Client
+  }
+}
diff --git a/TAO/tao/IFR_Client/ifr_client_skel_export.h b/TAO/tao/IFR_Client/ifr_client_skel_export.h
new file mode 100644
index 00000000000..2793ea585e1
--- /dev/null
+++ b/TAO/tao/IFR_Client/ifr_client_skel_export.h
@@ -0,0 +1,39 @@
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl
+// ------------------------------
+#ifndef TAO_IFR_CLIENT_SKEL_EXPORT_H
+#define TAO_IFR_CLIENT_SKEL_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (TAO_AS_STATIC_LIBS)
+#  if !defined (TAO_IFR_CLIENT_SKEL_HAS_DLL)
+#    define TAO_IFR_CLIENT_SKEL_HAS_DLL 0
+#  endif /* ! TAO_IFR_CLIENT_SKEL_HAS_DLL */
+#else
+#  if !defined (TAO_IFR_CLIENT_SKEL_HAS_DLL)
+#    define TAO_IFR_CLIENT_SKEL_HAS_DLL 1
+#  endif /* ! TAO_IFR_CLIENT_SKEL_HAS_DLL */
+#endif
+
+#if defined (TAO_IFR_CLIENT_SKEL_HAS_DLL) && (TAO_IFR_CLIENT_SKEL_HAS_DLL == 1)
+#  if defined (TAO_IFR_CLIENT_SKEL_BUILD_DLL)
+#    define TAO_IFR_Client_Skel_Export ACE_Proper_Export_Flag
+#    define TAO_IFR_CLIENT_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define TAO_IFR_CLIENT_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* TAO_IFR_CLIENT_SKEL_BUILD_DLL */
+#    define TAO_IFR_Client_Skel_Export ACE_Proper_Import_Flag
+#    define TAO_IFR_CLIENT_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define TAO_IFR_CLIENT_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* TAO_IFR_CLIENT_SKEL_BUILD_DLL */
+#else /* TAO_IFR_CLIENT_SKEL_HAS_DLL == 1 */
+#  define TAO_IFR_Client_Skel_Export
+#  define TAO_IFR_CLIENT_SKEL_SINGLETON_DECLARATION(T)
+#  define TAO_IFR_CLIENT_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* TAO_IFR_CLIENT_SKEL_HAS_DLL == 1 */
+
+#endif /* TAO_IFR_CLIENT_SKEL_EXPORT_H */
+
+// End of auto generated file.