From a4fe4096adbfc2721bd07d7f0a7e02e9edeb4fac Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 21 Oct 2011 14:46:45 +0000 Subject: Fri Oct 21 14:44:28 UTC 2011 Johnny Willemsen * tao/IORManipulation/IORManipulation.mpc: * tao/IORTable/IORTable.mpc: * tao/ZIOP/ZIOP.mpc: Generate export files as part of the build * tao/IORManipulation/ior_manip_export.h: * tao/IORTable/iortable_export.h: * tao/ZIOP/ziop_export.h: Removed these files. * tao/ZIOP/ZIOP.h: Doxygen fix --- TAO/ChangeLog | 15 +++++++++++ TAO/tao/IORManipulation/IORManipulation.mpc | 5 +++- TAO/tao/IORManipulation/ior_manip_export.h | 40 ----------------------------- TAO/tao/IORTable/IORTable.mpc | 4 ++- TAO/tao/IORTable/iortable_export.h | 40 ----------------------------- TAO/tao/ZIOP/ZIOP.h | 2 +- TAO/tao/ZIOP/ZIOP.mpc | 4 ++- TAO/tao/ZIOP/ziop_export.h | 40 ----------------------------- 8 files changed, 26 insertions(+), 124 deletions(-) delete mode 100644 TAO/tao/IORManipulation/ior_manip_export.h delete mode 100644 TAO/tao/IORTable/iortable_export.h delete mode 100644 TAO/tao/ZIOP/ziop_export.h diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c05f9f5e1f7..f735e440dd5 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,18 @@ +Fri Oct 21 14:44:28 UTC 2011 Johnny Willemsen + + * tao/IORManipulation/IORManipulation.mpc: + * tao/IORTable/IORTable.mpc: + * tao/ZIOP/ZIOP.mpc: + Generate export files as part of the build + + * tao/IORManipulation/ior_manip_export.h: + * tao/IORTable/iortable_export.h: + * tao/ZIOP/ziop_export.h: + Removed these files. + + * tao/ZIOP/ZIOP.h: + Doxygen fix + Thu Oct 20 17:34:00 UTC 2011 Johnny Willemsen * tests/POA/On_Demand_Act_Direct_Coll/On_Demand_Act_D_Coll.mpc: diff --git a/TAO/tao/IORManipulation/IORManipulation.mpc b/TAO/tao/IORManipulation/IORManipulation.mpc index 91f46408796..59de2cd291a 100644 --- a/TAO/tao/IORManipulation/IORManipulation.mpc +++ b/TAO/tao/IORManipulation/IORManipulation.mpc @@ -1,13 +1,15 @@ //$Id$ + project(*idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags += -Gp -Gd -Sci -SS -Sorb -GX \ -Wb,export_macro=TAO_IORManip_Export \ -Wb,export_include=tao/IORManipulation/ior_manip_export.h \ + -Wb,stub_export_file=ior_manip_export.h \ -Wb,include_guard=TAO_IORMANIP_SAFE_INCLUDE \ -Wb,safe_include=tao/IORManipulation/IORManip_Loader.h \ - -iC tao/IORManipulation + -iC tao/IORManipulation -Gxhst idlflags -= -Sa -St IOR.pidl } @@ -29,6 +31,7 @@ project(IORManipulation) : taolib, tao_output, install, anytypecode, taoidldefau Header_Files { *.h + ior_manip_export.h IORC.h IORS.h IORA.h diff --git a/TAO/tao/IORManipulation/ior_manip_export.h b/TAO/tao/IORManipulation/ior_manip_export.h deleted file mode 100644 index 0173c23bb58..00000000000 --- a/TAO/tao/IORManipulation/ior_manip_export.h +++ /dev/null @@ -1,40 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -// ------------------------------ -#ifndef TAO_IORMANIP_EXPORT_H -#define TAO_IORMANIP_EXPORT_H - -#include "ace/config-all.h" - -#if defined (TAO_AS_STATIC_LIBS) -# if !defined (TAO_IORMANIP_HAS_DLL) -# define TAO_IORMANIP_HAS_DLL 0 -# endif /* ! TAO_IORMANIP_HAS_DLL */ -#else -# if !defined (TAO_IORMANIP_HAS_DLL) -# define TAO_IORMANIP_HAS_DLL 1 -# endif /* ! TAO_IORMANIP_HAS_DLL */ -#endif - -#if defined (TAO_IORMANIP_HAS_DLL) && (TAO_IORMANIP_HAS_DLL == 1) -# if defined (TAO_IORMANIP_BUILD_DLL) -# define TAO_IORManip_Export ACE_Proper_Export_Flag -# define TAO_IORMANIP_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define TAO_IORMANIP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* TAO_IORMANIP_BUILD_DLL */ -# define TAO_IORManip_Export ACE_Proper_Import_Flag -# define TAO_IORMANIP_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define TAO_IORMANIP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* TAO_IORMANIP_BUILD_DLL */ -#else /* TAO_IORMANIP_HAS_DLL == 1 */ -# define TAO_IORManip_Export -# define TAO_IORMANIP_SINGLETON_DECLARATION(T) -# define TAO_IORMANIP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* TAO_IORMANIP_HAS_DLL == 1 */ - -#endif /* TAO_IORMANIP_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/tao/IORTable/IORTable.mpc b/TAO/tao/IORTable/IORTable.mpc index e7229ec5e68..682954ac040 100644 --- a/TAO/tao/IORTable/IORTable.mpc +++ b/TAO/tao/IORTable/IORTable.mpc @@ -5,9 +5,10 @@ project(*core_idl) : tao_versioning_idl_defaults, install { idlflags += -Gp -Gd -Sci -SS -Sorb \ -Wb,export_macro=TAO_IORTable_Export \ -Wb,export_include=tao/IORTable/iortable_export.h \ + -Wb,stub_export_file=iortable_export.h \ -Wb,include_guard=TAO_IORTABLE_SAFE_INCLUDE \ -Wb,safe_include=tao/IORTable/IORTable.h \ - -iC tao/IORTable + -iC tao/IORTable -Gxhst IORTable.pidl } @@ -28,6 +29,7 @@ project(IORTable) : taolib, tao_output, install, taoidldefaults { Header_Files { *.h + iortable_export.h IORTableC.h IORTableS.h } diff --git a/TAO/tao/IORTable/iortable_export.h b/TAO/tao/IORTable/iortable_export.h deleted file mode 100644 index ba6833bea98..00000000000 --- a/TAO/tao/IORTable/iortable_export.h +++ /dev/null @@ -1,40 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -// ------------------------------ -#ifndef TAO_IORTABLE_EXPORT_H -#define TAO_IORTABLE_EXPORT_H - -#include "ace/config-all.h" - -#if defined (TAO_AS_STATIC_LIBS) -# if !defined (TAO_IORTABLE_HAS_DLL) -# define TAO_IORTABLE_HAS_DLL 0 -# endif /* ! TAO_IORTABLE_HAS_DLL */ -#else -# if !defined (TAO_IORTABLE_HAS_DLL) -# define TAO_IORTABLE_HAS_DLL 1 -# endif /* ! TAO_IORTABLE_HAS_DLL */ -#endif - -#if defined (TAO_IORTABLE_HAS_DLL) && (TAO_IORTABLE_HAS_DLL == 1) -# if defined (TAO_IORTABLE_BUILD_DLL) -# define TAO_IORTable_Export ACE_Proper_Export_Flag -# define TAO_IORTABLE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define TAO_IORTABLE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* TAO_IORTABLE_BUILD_DLL */ -# define TAO_IORTable_Export ACE_Proper_Import_Flag -# define TAO_IORTABLE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define TAO_IORTABLE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* TAO_IORTABLE_BUILD_DLL */ -#else /* TAO_IORTABLE_HAS_DLL == 1 */ -# define TAO_IORTable_Export -# define TAO_IORTABLE_SINGLETON_DECLARATION(T) -# define TAO_IORTABLE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* TAO_IORTABLE_HAS_DLL == 1 */ - -#endif /* TAO_IORTABLE_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/tao/ZIOP/ZIOP.h b/TAO/tao/ZIOP/ZIOP.h index 7230f11651d..e0811fc084a 100644 --- a/TAO/tao/ZIOP/ZIOP.h +++ b/TAO/tao/ZIOP/ZIOP.h @@ -34,7 +34,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** * @class TAO_ZIOP_Loader * - * @brief Class that loads the BiDir library. + * @brief Class that loads the ZIOP library. */ class TAO_ZIOP_Export TAO_ZIOP_Loader : public TAO_ZIOP_Adapter diff --git a/TAO/tao/ZIOP/ZIOP.mpc b/TAO/tao/ZIOP/ZIOP.mpc index 8670b1f52a6..8eb56e3ae18 100644 --- a/TAO/tao/ZIOP/ZIOP.mpc +++ b/TAO/tao/ZIOP/ZIOP.mpc @@ -6,9 +6,10 @@ project(*core_idl) : tao_versioning_idl_defaults, install { idlflags += -Gp -Gd -Sci -SS -Sorb \ -Wb,export_macro=TAO_ZIOP_Export \ -Wb,export_include=tao/ZIOP/ziop_export.h \ + -Wb,stub_export_file=ziop_export.h \ -Wb,include_guard=TAO_ZIOP_SAFE_INCLUDE \ -Wb,safe_include=tao/ZIOP/ZIOP.h \ - -iC tao/ZIOP + -iC tao/ZIOP -Gxhst ZIOP.pidl } @@ -29,6 +30,7 @@ project(ZIOP) : tao_output, install, taolib, compression, pi, taoidldefaults { Header_Files { *.h + ziop_export.h ZIOPC.h ZIOPS.h } diff --git a/TAO/tao/ZIOP/ziop_export.h b/TAO/tao/ZIOP/ziop_export.h deleted file mode 100644 index f865c230b9b..00000000000 --- a/TAO/tao/ZIOP/ziop_export.h +++ /dev/null @@ -1,40 +0,0 @@ -// -*- C -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -// ------------------------------ -#ifndef TAO_ZIOP_EXPORT_H -#define TAO_ZIOP_EXPORT_H - -#include "ace/config-all.h" - -#if defined (TAO_AS_STATIC_LIBS) -# if !defined (TAO_ZIOP_HAS_DLL) -# define TAO_ZIOP_HAS_DLL 0 -# endif /* ! TAO_ZIOP_HAS_DLL */ -#else -# if !defined (TAO_ZIOP_HAS_DLL) -# define TAO_ZIOP_HAS_DLL 1 -# endif /* ! TAO_ZIOP_HAS_DLL */ -#endif - -#if defined (TAO_ZIOP_HAS_DLL) && (TAO_ZIOP_HAS_DLL == 1) -# if defined (TAO_ZIOP_BUILD_DLL) -# define TAO_ZIOP_Export ACE_Proper_Export_Flag -# define TAO_ZIOP_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define TAO_ZIOP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* TAO_ZIOP_BUILD_DLL */ -# define TAO_ZIOP_Export ACE_Proper_Import_Flag -# define TAO_ZIOP_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define TAO_ZIOP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* TAO_ZIOP_BUILD_DLL */ -#else /* TAO_ZIOP_HAS_DLL == 1 */ -# define TAO_ZIOP_Export -# define TAO_ZIOP_SINGLETON_DECLARATION(T) -# define TAO_ZIOP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* TAO_ZIOP_HAS_DLL == 1 */ - -#endif /* TAO_ZIOP_EXPORT_H */ - -// End of auto generated file. - -- cgit v1.2.1