Merge pull request #308 from mitza-oci/master

Test support for Java bindings with two IDL files (one included by the other).

java/tests/two_idl/.gitignore

@@ -0,0 +1,54 @@
+/_MessageDataReaderLocalBase.java
+/_MessageDataReaderTAOPeer.java
+/_MessageDataWriterLocalBase.java
+/_MessageDataWriterTAOPeer.java
+/_MessageTypeSupportLocalBase.java
+/_MessageTypeSupportTAOPeer.java
+/CommonC.cpp
+/CommonC.h
+/CommonC.inl
+/CommonJC.cpp
+/CommonJC.h
+/CommonS.cpp
+/CommonS.h
+/CommonTypeSupportImpl.cpp
+/CommonTypeSupportImpl.h
+/Message.java
+/MessageC.cpp
+/MessageC.h
+/MessageC.inl
+/MessageDataReader.java
+/MessageDataReaderHelper.java
+/MessageDataReaderHolder.java
+/MessageDataReaderOperations.java
+/MessageDataWriter.java
+/MessageDataWriterHelper.java
+/MessageDataWriterHolder.java
+/MessageDataWriterOperations.java
+/MessageHelper.java
+/MessageHolder.java
+/MessageJC.cpp
+/MessageJC.h
+/MessageS.cpp
+/MessageS.h
+/MessageSeqHelper.java
+/MessageSeqHolder.java
+/MessageTypeSupport.idl
+/MessageTypeSupport.java
+/MessageTypeSupportC.cpp
+/MessageTypeSupportC.h
+/MessageTypeSupportC.inl
+/MessageTypeSupportHelper.java
+/MessageTypeSupportHolder.java
+/MessageTypeSupportImpl.cpp
+/MessageTypeSupportImpl.h
+/MessageTypeSupportImpl.java
+/MessageTypeSupportJC.cpp
+/MessageTypeSupportJC.h
+/MessageTypeSupportOperations.java
+/MessageTypeSupportS.cpp
+/MessageTypeSupportS.h
+/Quote.java
+/QuoteHelper.java
+/QuoteHolder.java
+/classes

java/tests/two_idl/Common.idl

@@ -0,0 +1,3 @@
+struct Quote {
+    string line;
+};

java/tests/two_idl/Message.idl

@@ -0,0 +1,9 @@
+#pragma DCPS_DATA_TYPE "Message"
+#pragma DCPS_DATA_KEY "Message id"
+
+#include "Common.idl"
+
+struct Message {
+    long id;
+    Quote payload;
+};

java/tests/two_idl/two_idl.mpc

@@ -0,0 +1,25 @@
+project: dcpslib, dcps_tcp, dcps_test_java {
+
+    sharedname      = two_idl_test
+
+    idlflags        += -Wb,stub_export_include=two_idl_test_Export.h \
+                       -Wb,stub_export_macro=two_idl_test_Export
+    dcps_ts_flags   += -Wb,export_macro=two_idl_test_Export
+    idl2jniflags    += -Wb,stub_export_include=two_idl_test_Export.h \
+                       -Wb,stub_export_macro=two_idl_test_Export
+
+    dynamicflags    += TWO_IDL_TEST_BUILD_DLL
+
+    TypeSupport_Files {
+        Message.idl
+    }
+
+    TypeSupport_Files {
+        dcps_ts_flags += -SI
+        Common.idl
+    }
+
+    Java_Files {
+        Message.java << Quote.java
+    }
+}

java/tests/two_idl/two_idl_test_Export.h

@@ -0,0 +1,55 @@
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl two_idl_test
+// ------------------------------
+#ifndef TWO_IDL_TEST_EXPORT_H
+#define TWO_IDL_TEST_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (TWO_IDL_TEST_HAS_DLL)
+#  define TWO_IDL_TEST_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && TWO_IDL_TEST_HAS_DLL */
+
+#if !defined (TWO_IDL_TEST_HAS_DLL)
+#  define TWO_IDL_TEST_HAS_DLL 1
+#endif /* !TWO_IDL_TEST_HAS_DLL */
+
+#if defined (TWO_IDL_TEST_HAS_DLL) && (TWO_IDL_TEST_HAS_DLL == 1)
+#  if defined (TWO_IDL_TEST_BUILD_DLL)
+#    define two_idl_test_Export ACE_Proper_Export_Flag
+#    define TWO_IDL_TEST_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define TWO_IDL_TEST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* TWO_IDL_TEST_BUILD_DLL */
+#    define two_idl_test_Export ACE_Proper_Import_Flag
+#    define TWO_IDL_TEST_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define TWO_IDL_TEST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* TWO_IDL_TEST_BUILD_DLL */
+#else /* TWO_IDL_TEST_HAS_DLL == 1 */
+#  define two_idl_test_Export
+#  define TWO_IDL_TEST_SINGLETON_DECLARATION(T)
+#  define TWO_IDL_TEST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* TWO_IDL_TEST_HAS_DLL == 1 */
+
+// Set TWO_IDL_TEST_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (TWO_IDL_TEST_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define TWO_IDL_TEST_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define TWO_IDL_TEST_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !TWO_IDL_TEST_NTRACE */
+
+#if (TWO_IDL_TEST_NTRACE == 1)
+#  define TWO_IDL_TEST_TRACE(X)
+#else /* (TWO_IDL_TEST_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define TWO_IDL_TEST_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (TWO_IDL_TEST_NTRACE == 1) */
+
+#endif /* TWO_IDL_TEST_EXPORT_H */
+
+// End of auto generated file.