ChangeLogTag: Wed Apr 4 11:36:10 UTC 2007 Chad Elliott <elliott_c@ociweb.com>

4 files changed, 146 insertions, 9 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 424ba395fd3..cb1f8bd1f35 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,13 +1,25 @@
+Wed Apr  4 11:36:10 UTC 2007  Chad Elliott  <elliott_c@ociweb.com>
+
+        * tests/Bug_2677_Regression/Makefile.am:
+        * tests/Bug_2735_Regression/Makefile.am:
+
+          Added missing automake makefiles.
+
+        * tests/Bug_2735_Regression/server.cpp:
+
+          Fixed a compilation error on HP-UX.  They have some pretty simple
+          macros defined (e.g., SERVER).
+
 Tue Apr  3 19:08:44 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl:
-        
+
           Added static_cast to avoid conversion warning on MSVC8.
 
 Tue Apr  3 18:53:54 UTC 2007  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/Utils.mpc:
-        
+
           Changed project name from Utils to TAO_Utils to avoid namespace
           pollution, since MPC doesn't accept duplicate project names
           anywhere in the tree during generation.
diff --git a/TAO/tests/Bug_2677_Regression/Makefile.am b/TAO/tests/Bug_2677_Regression/Makefile.am
new file mode 100644
index 00000000000..cbc5ea09cdb
--- /dev/null
+++ b/TAO/tests/Bug_2677_Regression/Makefile.am
@@ -0,0 +1,74 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## /tao_builds/chad/doc/build/linux/ACE/bin/mwc.pl -type automake -noreldefs
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
+
+
+## Makefile.Bug_2677_Regression.am
+
+if BUILD_EXCEPTIONS
+
+noinst_LTLIBRARIES = libBug_2677_Regression.la
+
+libBug_2677_Regression_la_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR) \
+  -DBUG_2677_REGRESSION_BUILD_DLL
+
+libBug_2677_Regression_la_SOURCES = \
+  DllORB.cpp
+
+noinst_HEADERS = \
+  DllORB.h
+
+endif BUILD_EXCEPTIONS
+
+## Makefile.Bug_2677_Regression_Server.am
+
+if BUILD_EXCEPTIONS
+
+noinst_PROGRAMS = server
+
+server_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR)
+
+server_SOURCES = \
+  server.cpp \
+  DllORB.h \
+  bug_2677_regression_export.h
+
+server_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif BUILD_EXCEPTIONS
+
+
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = foreign
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2735_Regression/Makefile.am b/TAO/tests/Bug_2735_Regression/Makefile.am
new file mode 100644
index 00000000000..13102bcb9cc
--- /dev/null
+++ b/TAO/tests/Bug_2735_Regression/Makefile.am
@@ -0,0 +1,51 @@
+##  Process this file with automake to create Makefile.in
+##
+## $Id$
+##
+## This file was generated by MPC.  Any changes made directly to
+## this file will be lost the next time it is generated.
+##
+## MPC Command:
+## /tao_builds/chad/doc/build/linux/ACE/bin/mwc.pl -type automake -noreldefs
+
+ACE_BUILDDIR = $(top_builddir)/..
+ACE_ROOT = $(top_srcdir)/..
+TAO_BUILDDIR = $(top_builddir)
+TAO_ROOT = $(top_srcdir)
+
+
+## Makefile.Bug_2735_Regression.am
+
+if BUILD_EXCEPTIONS
+
+noinst_PROGRAMS = server
+
+server_CPPFLAGS = \
+  -I$(ACE_ROOT) \
+  -I$(ACE_BUILDDIR) \
+  -I$(TAO_ROOT) \
+  -I$(TAO_BUILDDIR)
+
+server_SOURCES = \
+  server.cpp
+
+server_LDADD = \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
+  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
+  $(TAO_BUILDDIR)/tao/libTAO.la \
+  $(ACE_BUILDDIR)/ace/libACE.la
+
+endif BUILD_EXCEPTIONS
+
+
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = foreign
+
+## Clean up template repositories, etc.
+clean-local:
+	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
+	-rm -f gcctemp.c gcctemp so_locations *.ics
+	-rm -rf cxx_repository ptrepository ti_files
+	-rm -rf templateregistry ir.out
+	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_2735_Regression/server.cpp b/TAO/tests/Bug_2735_Regression/server.cpp
index 81ddd5493ab..cc009aa5089 100644
--- a/TAO/tests/Bug_2735_Regression/server.cpp
+++ b/TAO/tests/Bug_2735_Regression/server.cpp
@@ -14,9 +14,9 @@ static const ACE_TCHAR* server_strat =
 static const ACE_TCHAR* foo_strat =
   ACE_STATIC_SERVICE_DIRECTIVE ("Foo_Strategy_Factory", "");
 
-enum Strategy { SERVER, FOO };
+enum Factory_Strategy { SERVER_STRATEGY, FOO_STRATEGY };
 
-static Strategy strategy = SERVER;
+static Factory_Strategy factory_strategy = SERVER_STRATEGY;
 
 static int
 parse_args (int argc, ACE_TCHAR *argv[])
@@ -28,10 +28,10 @@ parse_args (int argc, ACE_TCHAR *argv[])
     switch (c)
       {       
       case 'f':
-        strategy = FOO;
+        factory_strategy = FOO_STRATEGY;
         break;
       case 's':
-        strategy = SERVER;
+        factory_strategy = SERVER_STRATEGY;
         break;
       case '?':
       default:
@@ -57,12 +57,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       int targc = 3;
       char* targv[] = { "server", "-ORBSvcConfDirective", 0 };
-      switch (strategy)
+      switch (factory_strategy)
         {
-        case FOO:
+        case FOO_STRATEGY:
           targv[2] = const_cast<char*> (ACE_TEXT_ALWAYS_CHAR (foo_strat));
           break;
-        case SERVER:
+        case SERVER_STRATEGY:
           targv[2] = const_cast<char*> (ACE_TEXT_ALWAYS_CHAR (server_strat));
           break;
         }