From ab978a99d7c9e3cbdc5923ebf48a22551270ac2c Mon Sep 17 00:00:00 2001 From: Ossama Othman Date: Tue, 12 Nov 2002 06:38:45 +0000 Subject: ChangeLogTag:Mon Nov 11 22:33:37 2002 Ossama Othman --- TAO/ChangeLog | 24 +++++++++++ .../GenericFactory/Application_Controlled/Makefile | 4 +- .../Application_Controlled/Makefile.bor | 7 ++++ .../Application_Controlled/client.bor | 35 ++++++++++++++++ .../Application_Controlled/server.bor | 48 ++++++++++++++++++++++ .../LoadBalancing/GenericFactory/Makefile.bor | 12 ++++++ TAO/orbsvcs/tests/LoadBalancing/Makefile.bor | 12 ++++++ TAO/orbsvcs/tests/Makefile.bor | 1 + 8 files changed, 141 insertions(+), 2 deletions(-) create mode 100644 TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.bor create mode 100644 TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.bor create mode 100644 TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.bor create mode 100644 TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Makefile.bor create mode 100644 TAO/orbsvcs/tests/LoadBalancing/Makefile.bor diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d28f0babf7b..d461ec9af74 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,27 @@ +Mon Nov 11 22:33:37 2002 Ossama Othman + + * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile (TAO_LB_LIBS): + + Corrected order of libraries linked to the server binary. + + (client): + + Do not link server-side libraries. They are completely + unnecessary for this client binary. + + * orbsvcs/tests/Makefile.bor (DIRS): + + Added "LoadBalancing" directory to the list of directories to + recurse into. + + * orbsvcs/tests/LoadBalancing/Makefile.bor: + * orbsvcs/tests/LoadBalancing/GenericFactory/Makefile.bor: + * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.bor: + * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.bor: + * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.bor: + + New Borland C++ Makefiles for this test. + Mon Nov 11 20:31:18 2002 Ossama Othman * orbsvcs/LoadBalancer/LoadManager.cpp (TAO_LB_run_load_manager): diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile index fa65a2f3bdd..579bea6102c 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -TAO_LB_LIBS = -lTAO_PortableGroup -lTAO_CosLoadBalancing -lTAO_Messaging -lTAO_CosNaming +TAO_LB_LIBS = -lTAO_CosLoadBalancing -lTAO_PortableGroup -lTAO_CosNaming -lTAO_Messaging IDL_FILES = Test IDL_SRC = TestC.cpp TestS.cpp @@ -61,7 +61,7 @@ LDFLAGS += -L$(TAO_ROOT)/tao TestS_T.h TestS_T.cpp TestS_T.i client: $(addprefix $(VDIR),$(CLNT_TEST_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_LB_LIBS) $(TAO_SRVR_LIBS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_CLNT_LIBS) $(POSTLINK) server: $(addprefix $(VDIR),$(SVR_TEST_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_LB_LIBS) $(TAO_SRVR_LIBS) $(POSTLINK) diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.bor b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.bor new file mode 100644 index 00000000000..19f31a4d882 --- /dev/null +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.bor @@ -0,0 +1,7 @@ +# +# $Id$ +# + +MAKEFILES = server.bor client.bor + +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.bor b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.bor new file mode 100644 index 00000000000..8cbcb24dee6 --- /dev/null +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.bor @@ -0,0 +1,35 @@ +# +# $Id$ +# + +NAME = client + +TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 + +OBJFILES = \ + $(OBJDIR)\TestC.obj \ + $(OBJDIR)\client.obj + +CFLAGS = \ + $(ACE_CFLAGS) \ + $(TAO_CFLAGS) + +LIBFILES = \ + $(ACE_LIB) \ + $(TAO_LIB) + +IDLFILES = \ + $(IDLDIR)\Test.idl + +CPPDIR = . + +IDLDIR = . + +!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor> + +# +# IDL Build rules +# + +$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl + $(TAO_IDL) $** diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.bor b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.bor new file mode 100644 index 00000000000..269b786ba20 --- /dev/null +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.bor @@ -0,0 +1,48 @@ +# +# $Id$ +# + +NAME = server + +TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1 + +OBJFILES = \ + $(OBJDIR)\TestC.obj \ + $(OBJDIR)\TestS.obj \ + $(OBJDIR)\LB_server.obj \ + $(OBJDIR)\Basic.obj \ + $(OBJDIR)\server.obj + +CFLAGS = \ + $(ACE_CFLAGS) \ + $(TAO_CFLAGS) \ + $(TAO_PORTABLESERVER_CFLAGS) \ + $(TAO_MESSAGING_CFLAGS) \ + $(TAO_NAMING_CFLAGS) \ + $(TAO_PORTABLEGROUP_CFLAGS) \ + $(TAO_COSLOADBALANCING_CFLAGS) + +LIBFILES = \ + $(ACE_LIB) \ + $(TAO_LIB) \ + $(TAO_PORTABLESERVER_LIB) + $(TAO_MESSAGING_LIB) \ + $(TAO_NAMING_LIB) \ + $(TAO_PORTABLEGROUP_LIB) \ + $(TAO_COSLOADBALANCING_LIB) + +IDLFILES = \ + $(IDLDIR)\Test.idl + +CPPDIR = . + +IDLDIR = . + +!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor> + +# +# IDL Build rules +# + +$(IDLDIR)\TestS.cpp $(IDLDIR)\TestC.cpp: $(IDLDIR)\Test.idl + $(TAO_IDL) $** diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Makefile.bor b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Makefile.bor new file mode 100644 index 00000000000..0018fc3c02c --- /dev/null +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Makefile.bor @@ -0,0 +1,12 @@ +# +# Makefile for building the TAO Load Balancer GenericFactory tests +# +# $Id$ +# + + +DIRS = \ + Application_Controlled + + +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/orbsvcs/tests/LoadBalancing/Makefile.bor b/TAO/orbsvcs/tests/LoadBalancing/Makefile.bor new file mode 100644 index 00000000000..51f8f96fdb3 --- /dev/null +++ b/TAO/orbsvcs/tests/LoadBalancing/Makefile.bor @@ -0,0 +1,12 @@ +# +# Makefile for building the TAO Load Balancer tests +# +# $Id$ +# + + +DIRS = \ + GenericFactory + + +!include <$(ACE_ROOT)\include\makeinclude\recurse.bor> diff --git a/TAO/orbsvcs/tests/Makefile.bor b/TAO/orbsvcs/tests/Makefile.bor index 479215d29d4..6ec947c0544 100644 --- a/TAO/orbsvcs/tests/Makefile.bor +++ b/TAO/orbsvcs/tests/Makefile.bor @@ -16,6 +16,7 @@ DIRS = \ EC_Custom_Marshal \ ior_corbaname \ IOR_MCast \ + LoadBalancing \ Miop \ Notify \ Property \ -- cgit v1.2.1