diff options
| -rw-r--r-- | modules/CIAO/ChangeLog | 14 | ||||
| -rw-r--r-- | modules/CIAO/tests/CIDL/CodeGen/Basic.mpc | 2 | ||||
| -rw-r--r-- | modules/CIAO/tests/CIDL/CodeGen/Basic_skel_export.h | 58 | ||||
| -rw-r--r-- | modules/CIAO/tests/CIDL/CodeGen/Basic_stub_export.h | 58 | ||||
| -rw-r--r-- | modules/CIAO/tests/CIDL/CodeGen/CodeGen_exec_export.h | 78 | ||||
| -rw-r--r-- | modules/CIAO/tests/CIDL/CodeGen/CodeGen_stub_export.h | 78 | ||||
| -rw-r--r-- | modules/CIAO/tests/CIDL/CodeGen/CodeGen_svnt_export.h | 78 |
7 files changed, 15 insertions, 351 deletions
diff --git a/modules/CIAO/ChangeLog b/modules/CIAO/ChangeLog index 726e539c372..67dfd4dc8fb 100644 --- a/modules/CIAO/ChangeLog +++ b/modules/CIAO/ChangeLog @@ -1,3 +1,17 @@ +Wed Sep 23 21:23:19 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu> + + * tests/CIDL/CodeGen/Basic.mpc: + + Added generation of export header files. + + * tests/CIDL/CodeGen/CodeGen_exec_export.h: + * tests/CIDL/CodeGen/Basic_stub_export.h: + * tests/CIDL/CodeGen/CodeGen_svnt_export.h: + * tests/CIDL/CodeGen/Basic_skel_export.h: + * tests/CIDL/CodeGen/CodeGen_stub_export.h: + + Removed these files, now generated. + Wed Sep 23 19:37:29 UTC 2009 Jeff Parsons <j.parsons@vanderbilt.edu> * tools/IDL3_to_XMI/IDL3_TO_XMI.mpc: diff --git a/modules/CIAO/tests/CIDL/CodeGen/Basic.mpc b/modules/CIAO/tests/CIDL/CodeGen/Basic.mpc index 7a8b856fe5c..95cc9fb75cb 100644 --- a/modules/CIAO/tests/CIDL/CodeGen/Basic.mpc +++ b/modules/CIAO/tests/CIDL/CodeGen/Basic.mpc @@ -1,7 +1,7 @@ // $Id$ // This file is generated with "generate_component_mpc.pl -n Basic" -project(Basic_idl_gen) : ciaoidldefaults, anytypecode { +project(Basic_idl_gen) : componentidldefaults, anytypecode { custom_only = 1 idlflags += -Wb,stub_export_macro=BASIC_STUB_Export \ -Wb,stub_export_include=Basic_stub_export.h \ diff --git a/modules/CIAO/tests/CIDL/CodeGen/Basic_skel_export.h b/modules/CIAO/tests/CIDL/CodeGen/Basic_skel_export.h deleted file mode 100644 index ca992b8f940..00000000000 --- a/modules/CIAO/tests/CIDL/CodeGen/Basic_skel_export.h +++ /dev/null @@ -1,58 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl BASIC_SKEL -// ------------------------------ -#ifndef BASIC_SKEL_EXPORT_H -#define BASIC_SKEL_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (BASIC_SKEL_HAS_DLL) -# define BASIC_SKEL_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && BASIC_SKEL_HAS_DLL */ - -#if !defined (BASIC_SKEL_HAS_DLL) -# define BASIC_SKEL_HAS_DLL 1 -#endif /* ! BASIC_SKEL_HAS_DLL */ - -#if defined (BASIC_SKEL_HAS_DLL) && (BASIC_SKEL_HAS_DLL == 1) -# if defined (BASIC_SKEL_BUILD_DLL) -# define BASIC_SKEL_Export ACE_Proper_Export_Flag -# define BASIC_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define BASIC_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* BASIC_SKEL_BUILD_DLL */ -# define BASIC_SKEL_Export ACE_Proper_Import_Flag -# define BASIC_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define BASIC_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* BASIC_SKEL_BUILD_DLL */ -#else /* BASIC_SKEL_HAS_DLL == 1 */ -# define BASIC_SKEL_Export -# define BASIC_SKEL_SINGLETON_DECLARATION(T) -# define BASIC_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* BASIC_SKEL_HAS_DLL == 1 */ - -// Set BASIC_SKEL_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (BASIC_SKEL_NTRACE) -# if (ACE_NTRACE == 1) -# define BASIC_SKEL_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define BASIC_SKEL_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !BASIC_SKEL_NTRACE */ - -#if (BASIC_SKEL_NTRACE == 1) -# define BASIC_SKEL_TRACE(X) -#else /* (BASIC_SKEL_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define BASIC_SKEL_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (BASIC_SKEL_NTRACE == 1) */ - -#endif /* BASIC_SKEL_EXPORT_H */ - -// End of auto generated file. diff --git a/modules/CIAO/tests/CIDL/CodeGen/Basic_stub_export.h b/modules/CIAO/tests/CIDL/CodeGen/Basic_stub_export.h deleted file mode 100644 index 469d1f6827c..00000000000 --- a/modules/CIAO/tests/CIDL/CodeGen/Basic_stub_export.h +++ /dev/null @@ -1,58 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl BASIC_STUB -// ------------------------------ -#ifndef BASIC_STUB_EXPORT_H -#define BASIC_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (BASIC_STUB_HAS_DLL) -# define BASIC_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && BASIC_STUB_HAS_DLL */ - -#if !defined (BASIC_STUB_HAS_DLL) -# define BASIC_STUB_HAS_DLL 1 -#endif /* ! BASIC_STUB_HAS_DLL */ - -#if defined (BASIC_STUB_HAS_DLL) && (BASIC_STUB_HAS_DLL == 1) -# if defined (BASIC_STUB_BUILD_DLL) -# define BASIC_STUB_Export ACE_Proper_Export_Flag -# define BASIC_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define BASIC_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* BASIC_STUB_BUILD_DLL */ -# define BASIC_STUB_Export ACE_Proper_Import_Flag -# define BASIC_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define BASIC_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* BASIC_STUB_BUILD_DLL */ -#else /* BASIC_STUB_HAS_DLL == 1 */ -# define BASIC_STUB_Export -# define BASIC_STUB_SINGLETON_DECLARATION(T) -# define BASIC_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* BASIC_STUB_HAS_DLL == 1 */ - -// Set BASIC_STUB_NTRACE = 0 to turn on library specific tracing even if -// tracing is turned off for ACE. -#if !defined (BASIC_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define BASIC_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define BASIC_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !BASIC_STUB_NTRACE */ - -#if (BASIC_STUB_NTRACE == 1) -# define BASIC_STUB_TRACE(X) -#else /* (BASIC_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define BASIC_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (BASIC_STUB_NTRACE == 1) */ - -#endif /* BASIC_STUB_EXPORT_H */ - -// End of auto generated file. diff --git a/modules/CIAO/tests/CIDL/CodeGen/CodeGen_exec_export.h b/modules/CIAO/tests/CIDL/CodeGen/CodeGen_exec_export.h deleted file mode 100644 index d240c41e03f..00000000000 --- a/modules/CIAO/tests/CIDL/CodeGen/CodeGen_exec_export.h +++ /dev/null @@ -1,78 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler v1.6.9 **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -#ifndef CODEGEN_EXEC_EXPORT_H -#define CODEGEN_EXEC_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (CODEGEN_EXEC_HAS_DLL) -# define CODEGEN_EXEC_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && CODEGEN_EXEC_HAS_DLL */ - -#if !defined (CODEGEN_EXEC_HAS_DLL) -# define CODEGEN_EXEC_HAS_DLL 1 -#endif /* ! CODEGEN_EXEC_HAS_DLL */ - -#if defined (CODEGEN_EXEC_HAS_DLL) && (CODEGEN_EXEC_HAS_DLL == 1) -# if defined (CODEGEN_EXEC_BUILD_DLL) -# define CODEGEN_EXEC_Export ACE_Proper_Export_Flag -# define CODEGEN_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define CODEGEN_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* CODEGEN_EXEC_BUILD_DLL */ -# define CODEGEN_EXEC_Export ACE_Proper_Import_Flag -# define CODEGEN_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define CODEGEN_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* CODEGEN_EXEC_BUILD_DLL */ -#else /* CODEGEN_EXEC_HAS_DLL == 1 */ -# define CODEGEN_EXEC_Export -# define CODEGEN_EXEC_SINGLETON_DECLARATION(T) -# define CODEGEN_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* CODEGEN_EXEC_HAS_DLL == 1 */ - -// Set CODEGEN_EXEC_NTRACE = 0 to turn on library-specific -// tracing even if tracing is turned off for ACE. -#if !defined (CODEGEN_EXEC_NTRACE) -# if (ACE_NTRACE == 1) -# define CODEGEN_EXEC_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CODEGEN_EXEC_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CODEGEN_EXEC_NTRACE */ - -#if (CODEGEN_EXEC_NTRACE == 1) -# define CODEGEN_EXEC_TRACE(X) -#else /* (CODEGEN_EXEC_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define CODEGEN_EXEC_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (CODEGEN_EXEC_NTRACE == 1) */ - -#endif /* CODEGEN_EXEC_EXPORT_H */ - diff --git a/modules/CIAO/tests/CIDL/CodeGen/CodeGen_stub_export.h b/modules/CIAO/tests/CIDL/CodeGen/CodeGen_stub_export.h deleted file mode 100644 index 35dec897a4f..00000000000 --- a/modules/CIAO/tests/CIDL/CodeGen/CodeGen_stub_export.h +++ /dev/null @@ -1,78 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler v1.6.9 **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -#ifndef CODEGEN_STUB_EXPORT_H -#define CODEGEN_STUB_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (CODEGEN_STUB_HAS_DLL) -# define CODEGEN_STUB_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && CODEGEN_STUB_HAS_DLL */ - -#if !defined (CODEGEN_STUB_HAS_DLL) -# define CODEGEN_STUB_HAS_DLL 1 -#endif /* ! CODEGEN_STUB_HAS_DLL */ - -#if defined (CODEGEN_STUB_HAS_DLL) && (CODEGEN_STUB_HAS_DLL == 1) -# if defined (CODEGEN_STUB_BUILD_DLL) -# define CODEGEN_STUB_Export ACE_Proper_Export_Flag -# define CODEGEN_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define CODEGEN_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* CODEGEN_STUB_BUILD_DLL */ -# define CODEGEN_STUB_Export ACE_Proper_Import_Flag -# define CODEGEN_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define CODEGEN_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* CODEGEN_STUB_BUILD_DLL */ -#else /* CODEGEN_STUB_HAS_DLL == 1 */ -# define CODEGEN_STUB_Export -# define CODEGEN_STUB_SINGLETON_DECLARATION(T) -# define CODEGEN_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* CODEGEN_STUB_HAS_DLL == 1 */ - -// Set CODEGEN_STUB_NTRACE = 0 to turn on library-specific -// tracing even if tracing is turned off for ACE. -#if !defined (CODEGEN_STUB_NTRACE) -# if (ACE_NTRACE == 1) -# define CODEGEN_STUB_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CODEGEN_STUB_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CODEGEN_STUB_NTRACE */ - -#if (CODEGEN_STUB_NTRACE == 1) -# define CODEGEN_STUB_TRACE(X) -#else /* (CODEGEN_STUB_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define CODEGEN_STUB_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (CODEGEN_STUB_NTRACE == 1) */ - -#endif /* CODEGEN_STUB_EXPORT_H */ - diff --git a/modules/CIAO/tests/CIDL/CodeGen/CodeGen_svnt_export.h b/modules/CIAO/tests/CIDL/CodeGen/CodeGen_svnt_export.h deleted file mode 100644 index cd8cfb23791..00000000000 --- a/modules/CIAO/tests/CIDL/CodeGen/CodeGen_svnt_export.h +++ /dev/null @@ -1,78 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -// **** Code generated by the The ACE ORB (TAO) IDL Compiler v1.6.9 **** -// TAO and the TAO IDL Compiler have been developed by: -// Center for Distributed Object Computing -// Washington University -// St. Louis, MO -// USA -// http://www.cs.wustl.edu/~schmidt/doc-center.html -// and -// Distributed Object Computing Laboratory -// University of California at Irvine -// Irvine, CA -// USA -// http://doc.ece.uci.edu/ -// and -// Institute for Software Integrated Systems -// Vanderbilt University -// Nashville, TN -// USA -// http://www.isis.vanderbilt.edu/ -// -// Information about TAO is available at: -// http://www.cs.wustl.edu/~schmidt/TAO.html - -#ifndef CODEGEN_SVNT_EXPORT_H -#define CODEGEN_SVNT_EXPORT_H - -#include "ace/config-all.h" - -#if defined (ACE_AS_STATIC_LIBS) && !defined (CODEGEN_SVNT_HAS_DLL) -# define CODEGEN_SVNT_HAS_DLL 0 -#endif /* ACE_AS_STATIC_LIBS && CODEGEN_SVNT_HAS_DLL */ - -#if !defined (CODEGEN_SVNT_HAS_DLL) -# define CODEGEN_SVNT_HAS_DLL 1 -#endif /* ! CODEGEN_SVNT_HAS_DLL */ - -#if defined (CODEGEN_SVNT_HAS_DLL) && (CODEGEN_SVNT_HAS_DLL == 1) -# if defined (CODEGEN_SVNT_BUILD_DLL) -# define CODEGEN_SVNT_Export ACE_Proper_Export_Flag -# define CODEGEN_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define CODEGEN_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* CODEGEN_SVNT_BUILD_DLL */ -# define CODEGEN_SVNT_Export ACE_Proper_Import_Flag -# define CODEGEN_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define CODEGEN_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* CODEGEN_SVNT_BUILD_DLL */ -#else /* CODEGEN_SVNT_HAS_DLL == 1 */ -# define CODEGEN_SVNT_Export -# define CODEGEN_SVNT_SINGLETON_DECLARATION(T) -# define CODEGEN_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* CODEGEN_SVNT_HAS_DLL == 1 */ - -// Set CODEGEN_SVNT_NTRACE = 0 to turn on library-specific -// tracing even if tracing is turned off for ACE. -#if !defined (CODEGEN_SVNT_NTRACE) -# if (ACE_NTRACE == 1) -# define CODEGEN_SVNT_NTRACE 1 -# else /* (ACE_NTRACE == 1) */ -# define CODEGEN_SVNT_NTRACE 0 -# endif /* (ACE_NTRACE == 1) */ -#endif /* !CODEGEN_SVNT_NTRACE */ - -#if (CODEGEN_SVNT_NTRACE == 1) -# define CODEGEN_SVNT_TRACE(X) -#else /* (CODEGEN_SVNT_NTRACE == 1) */ -# if !defined (ACE_HAS_TRACE) -# define ACE_HAS_TRACE -# endif /* ACE_HAS_TRACE */ -# define CODEGEN_SVNT_TRACE(X) ACE_TRACE_IMPL(X) -# include "ace/Trace.h" -#endif /* (CODEGEN_SVNT_NTRACE == 1) */ - -#endif /* CODEGEN_SVNT_EXPORT_H */ - |