ChangeLogTag:Sun May 18 17:32:29 UTC 2003 Don Hinton <dhinton@dresystems.com>

5 files changed, 90 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 56a248b9210..26299d04a88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Sun May 18 17:32:29 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+        * tests/Makefile.bor:
+        * tests/Test_Output.bor:
+          Added new Borland Makefile, tests/Test_Output.bor and modified
+          Makefile.bor to call it and link Test_Output.lib for all objects
+          and add Main.obj to OBJFILES.
+
+        * tests/test_config.h:
+        * tests/Test_Output_Export.h:
+          Added tests/Test_Output_Export.h and added Test_Output_Export to
+          Test_Output class declaration.
+
 Sun May 18 00:04:17 UTC 2003  Don Hinton  <dhinton@dresystems.com>
 
         Merged dre_030425 up to the main and rebranched to dre_test_01.
diff --git a/tests/Makefile.bor b/tests/Makefile.bor
index 9d9f06aff4a..452a7ce7aac 100644
--- a/tests/Makefile.bor
+++ b/tests/Makefile.bor
@@ -133,15 +133,19 @@ DIRS =  RMCast \
 DIRS =  RMCast
 !endif
 
-MAKEFILES = DLL_Test.bor Service_Config_DLL.bor Framework_Component_DLL.bor
+MAKEFILES = \
+	Test_Output.bor \
+	DLL_Test.bor \
+	Service_Config_DLL.bor \
+	Framework_Component_DLL.bor
 
-OBJFILES = $(OBJDIR)\$(NAME).obj
+OBJFILES = $(OBJDIR)\$(NAME).obj $(OBJDIR)\Main.obj
 
 CFLAGS = $(ACE_CFLAGS)
 
 CPPDIR = .
 
-LIBFILES = $(ACE_LIB)
+LIBFILES = $(ACE_LIB) $(BINDIR)\Test_Output$(LIB_DECORATOR).lib
 
 !include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
 !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/tests/Test_Output.bor b/tests/Test_Output.bor
new file mode 100644
index 00000000000..d4574c83166
--- /dev/null
+++ b/tests/Test_Output.bor
@@ -0,0 +1,17 @@
+#
+# $Id$
+#
+
+NAME = Test_Output
+
+TARGET = $(BINDIR)\$(NAME).dll
+
+OBJFILES = $(OBJDIR)\Test_Output.obj
+
+CFLAGS = $(ACE_CFLAGS) -DTEST_OUTPUT_BUILD_DLL
+
+CPPDIR = .
+
+LIBFILES = $(ACE_LIB)
+
+!include <$(ACE_ROOT)\include\makeinclude\build_dll.bor>
diff --git a/tests/Test_Output_Export.h b/tests/Test_Output_Export.h
new file mode 100644
index 00000000000..5fb8034488f
--- /dev/null
+++ b/tests/Test_Output_Export.h
@@ -0,0 +1,50 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl Test_Output
+// ------------------------------
+#ifndef TEST_OUTPUT_EXPORT_H
+#define TEST_OUTPUT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if !defined (TEST_OUTPUT_HAS_DLL)
+#  define TEST_OUTPUT_HAS_DLL 1
+#endif /* ! TEST_OUTPUT_HAS_DLL */
+
+#if defined (TEST_OUTPUT_HAS_DLL) && (TEST_OUTPUT_HAS_DLL == 1)
+#  if defined (TEST_OUTPUT_BUILD_DLL)
+#    define Test_Output_Export ACE_Proper_Export_Flag
+#    define TEST_OUTPUT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define TEST_OUTPUT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* TEST_OUTPUT_BUILD_DLL */
+#    define Test_Output_Export ACE_Proper_Import_Flag
+#    define TEST_OUTPUT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define TEST_OUTPUT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* TEST_OUTPUT_BUILD_DLL */
+#else /* TEST_OUTPUT_HAS_DLL == 1 */
+#  define Test_Output_Export
+#  define TEST_OUTPUT_SINGLETON_DECLARATION(T)
+#  define TEST_OUTPUT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* TEST_OUTPUT_HAS_DLL == 1 */
+
+// Set TEST_OUTPUT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (TEST_OUTPUT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define TEST_OUTPUT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define TEST_OUTPUT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !TEST_OUTPUT_NTRACE */
+
+#if (TEST_OUTPUT_NTRACE == 1)
+#  define TEST_OUTPUT_TRACE(X)
+#else /* (TEST_OUTPUT_NTRACE == 1) */
+#  define TEST_OUTPUT_TRACE(X) ACE_TRACE_IMPL(X)
+#endif /* (TEST_OUTPUT_NTRACE == 1) */
+
+#endif /* TEST_OUTPUT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/tests/test_config.h b/tests/test_config.h
index e6dce2a7674..2e2853bc8ab 100644
--- a/tests/test_config.h
+++ b/tests/test_config.h
@@ -146,7 +146,9 @@ const size_t ACE_MAX_THREADS = 4;
 #define OFSTREAM ofstream
 #endif /* ACE_LACKS_IOSTREAM_TOTALLY */
 
-class ACE_Test_Output
+#include "tests/Test_Output_Export.h"
+
+class Test_Output_Export ACE_Test_Output
 {
 public:
   ACE_Test_Output (void);