ChangeLogTag: Sun Aug 24 13:40:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>

3 files changed, 112 insertions, 26 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index cd9dbf3c958..f59d1795657 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Sun Aug 24 13:41:12 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.bor:
+        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.bor:
+          Fixed these BCB makefiles by regenerating them using MPC
+
 Sun Aug 24 13:00:31 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/DynAny_Test/analyzer.cpp:
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.bor b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.bor
index 655a7a00339..396022fabe7 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.bor
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.bor
@@ -6,32 +6,70 @@
 
 NAME = client
 
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe
 
 OBJFILES = \
-	$(OBJDIR)\testC.obj \
-	$(OBJDIR)\client.obj 
+   $(OBJDIR)\client.obj \
+   $(OBJDIR)\testC.obj
 
-CFLAGS = \
-	$(ACE_CFLAGS) \
-	$(TAO_CFLAGS)
+LFLAGS = \
+   -j..\..\..\..\..\lib\$(CONFIG_SUBDIR) -j..\..\..\..\..\lib \
+   -L..\..\..\..\..\lib\$(CONFIG_SUBDIR) -L..\..\..\..\..\lib \
+  -j$(CORE_BINDIR) \
+  -L$(CORE_BINDIR)
 
 LIBFILES = \
-	$(ACE_LIB) \
-	$(TAO_LIB)
+   TAO_FTORB$(LIB_DECORATOR).lib \
+   TAO_PortableServer$(LIB_DECORATOR).lib \
+   TAO_IORInterceptor$(LIB_DECORATOR).lib \
+   TAO_Valuetype$(LIB_DECORATOR).lib \
+   TAO_ObjRefTemplate$(LIB_DECORATOR).lib \
+   TAO_IORManip$(LIB_DECORATOR).lib \
+   TAO$(LIB_DECORATOR).lib \
+   ACE$(LIB_DECORATOR).lib \
+
 
 IDLFILES = \
-	$(IDLDIR)\test.idl
+   $(IDLDIR)\test.idl
+
+!ifdef STATIC
+LIB_FLAGS = -DTAO_AS_STATIC_LIBS -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS
+DLL_FLAGS =
+!else
+LIB_FLAGS =
+DLL_FLAGS =
+!endif
+
+CFLAGS = \
+   -I..\..\..\..\orbsvcs \
+   -I..\..\..\.. \
+   -I..\..\..\..\tao \
+   -I..\..\..\..\.. \
+   $(LIB_FLAGS) \
+   $(DLL_FLAGS)
 
 CPPDIR = .
 
 IDLDIR = .
 
+INCLUDES = \
+   testC.h \
+   testS_T.h \
+   testS_T.cpp \
+   testC.i \
+   testS_T.i \
+   test.idl
+
+all: idl_src_files
+
 !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
 
 #
 # IDL Build rules
 #
 
+idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
+
+# IDL File Directory: .
 $(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
-	$(TAO_IDL) -DCORBA3 -I..\..\.. $**
+   $(TAO_IDL) -Gv -DCORBA3 -I..\..\..\.. -Gv -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $**
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.bor b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.bor
index 456064a96ef..30380dfb59e 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.bor
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.bor
@@ -6,39 +6,81 @@
 
 NAME = server
 
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe
 
 OBJFILES = \
-	$(OBJDIR)\testC.obj \
-	$(OBJDIR)\testS.obj \
-	$(OBJDIR)\server.obj \
-	$(OBJDIR)\test_i.obj \
-	$(OBJDIR)\Server_Request_Interceptor.obj \
-	$(OBJDIR)\Server_ORBInitializer.obj
+   $(OBJDIR)\Server_ORBInitializer.obj \
+   $(OBJDIR)\Server_Request_Interceptor.obj \
+   $(OBJDIR)\server.obj \
+   $(OBJDIR)\testC.obj \
+   $(OBJDIR)\testS.obj \
+   $(OBJDIR)\test_i.obj
 
-CFLAGS = \
-	$(ACE_CFLAGS) \
-	$(TAO_CFLAGS) \
-	$(TAO_PORTABLESERVER_CFLAGS)
+LFLAGS = \
+   -j..\..\..\..\..\lib\$(CONFIG_SUBDIR) -j..\..\..\..\..\lib \
+   -L..\..\..\..\..\lib\$(CONFIG_SUBDIR) -L..\..\..\..\..\lib \
+  -j$(CORE_BINDIR) \
+  -L$(CORE_BINDIR)
 
 LIBFILES = \
-	$(ACE_LIB) \
-	$(TAO_LIB) \
-	$(TAO_PORTABLESERVER_LIB)
+   TAO_FTORB$(LIB_DECORATOR).lib \
+   TAO_IORManip$(LIB_DECORATOR).lib \
+   TAO_PortableServer$(LIB_DECORATOR).lib \
+   TAO_IORInterceptor$(LIB_DECORATOR).lib \
+   TAO_Valuetype$(LIB_DECORATOR).lib \
+   TAO_ObjRefTemplate$(LIB_DECORATOR).lib \
+   TAO$(LIB_DECORATOR).lib \
+   ACE$(LIB_DECORATOR).lib \
+
 
 IDLFILES = \
-	$(IDLDIR)\test.idl
+   $(IDLDIR)\test.idl
+
+!ifdef STATIC
+LIB_FLAGS = -DTAO_AS_STATIC_LIBS -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS
+DLL_FLAGS =
+!else
+LIB_FLAGS =
+DLL_FLAGS =
+!endif
+
+CFLAGS = \
+   -I..\..\..\..\orbsvcs \
+   -I..\..\..\.. \
+   -I..\..\..\..\tao \
+   -I..\..\..\..\.. \
+   $(LIB_FLAGS) \
+   $(DLL_FLAGS)
 
 CPPDIR = .
 
 IDLDIR = .
 
+INCLUDES = \
+   Server_ORBInitializer.h \
+   Server_Request_Interceptor.h \
+   testC.h \
+   testS.h \
+   testS_T.h \
+   test_i.h \
+   testS_T.cpp \
+   testC.i \
+   testS.i \
+   testS_T.i \
+   test.idl
+
+all: idl_src_files
+
 !include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
 
 #
 # IDL Build rules
 #
 
+idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
+
+# IDL File Directory: .
 $(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
-	$(TAO_IDL) -DCORBA3 -I..\..\.. $**
+   $(TAO_IDL) -Gv -DCORBA3 -I..\..\..\.. -Gv -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $**