ChangeLogTag: Sun Jul 06 19:30:52 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>

3 files changed, 171 insertions, 52 deletions

diff --git a/TAO/examples/RTCORBA/Activity/Makefile.Activity.bor b/TAO/examples/RTCORBA/Activity/Makefile.Activity.bor
new file mode 100644
index 00000000000..6f66391de85
--- /dev/null
+++ b/TAO/examples/RTCORBA/Activity/Makefile.Activity.bor
@@ -0,0 +1,55 @@
+# Makefile for building the test exe with Borland C++ Builder
+
+NAME = test
+
+OBJFILES = \
+	$(OBJDIR)\main.obj
+
+EXTERNAL_LIBS = \
+ \
+
+LFLAGS = \
+	-j..\..\..\..\lib\$(CONFIG_SUBDIR) -j..\..\..\..\lib \
+	-L..\..\..\..\lib\$(CONFIG_SUBDIR) -L..\..\..\..\lib \
+  -j$(CORE_BINDIR) \
+  -L$(CORE_BINDIR)
+
+LIBFILES = \
+	activity$(LIB_DECORATOR).lib \
+	TAO_RTPortableServer$(LIB_DECORATOR).lib \
+	TAO_RTCORBA$(LIB_DECORATOR).lib \
+	TAO_CosNaming$(LIB_DECORATOR).lib \
+	TAO_Svc_Utils$(LIB_DECORATOR).lib \
+	TAO_IORTable$(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 \
+	$(EXTERNAL_LIBS)
+
+!ifdef STATIC
+LIB_FLAGS = -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 = .
+
+INCLUDES = \
+	JobS_T.h \
+	JobS_T.cpp \
+	JobS_T.i
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
diff --git a/TAO/examples/RTCORBA/Activity/Makefile.Activity_Lib.bor b/TAO/examples/RTCORBA/Activity/Makefile.Activity_Lib.bor
new file mode 100644
index 00000000000..dfbf37d5231
--- /dev/null
+++ b/TAO/examples/RTCORBA/Activity/Makefile.Activity_Lib.bor
@@ -0,0 +1,98 @@
+# Makefile for building the activity library with Borland C++ Builder
+
+NAME = activity
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe
+
+OBJFILES = \
+	$(OBJDIR)\Activity.obj \
+	$(OBJDIR)\Builder.obj \
+	$(OBJDIR)\JobC.obj \
+	$(OBJDIR)\JobS.obj \
+	$(OBJDIR)\Job_i.obj \
+	$(OBJDIR)\POA_Holder.obj \
+	$(OBJDIR)\Periodic_Task.obj \
+	$(OBJDIR)\Task_Stats.obj \
+	$(OBJDIR)\Thread_Task.obj
+
+EXTERNAL_LIBS = \
+ \
+
+LFLAGS = \
+	-j..\..\..\..\lib\$(CONFIG_SUBDIR) -j..\..\..\..\lib \
+	-L..\..\..\..\lib\$(CONFIG_SUBDIR) -L..\..\..\..\lib \
+  -j$(CORE_BINDIR) \
+  -L$(CORE_BINDIR)
+
+LIBFILES = \
+	TAO_RTPortableServer$(LIB_DECORATOR).lib \
+	TAO_RTCORBA$(LIB_DECORATOR).lib \
+	TAO_CosNaming$(LIB_DECORATOR).lib \
+	TAO_Svc_Utils$(LIB_DECORATOR).lib \
+	TAO_PortableServer$(LIB_DECORATOR).lib \
+	TAO_IORInterceptor$(LIB_DECORATOR).lib \
+	TAO_Valuetype$(LIB_DECORATOR).lib \
+	TAO_ObjRefTemplate$(LIB_DECORATOR).lib \
+	TAO_IORTable$(LIB_DECORATOR).lib \
+	TAO$(LIB_DECORATOR).lib \
+	ACE$(LIB_DECORATOR).lib \
+	$(EXTERNAL_LIBS)
+
+IDLFILES = \
+	$(IDLDIR)\Job.idl
+
+!ifdef STATIC
+LIB_FLAGS = -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS
+DLL_FLAGS =
+!else
+LIB_FLAGS =
+DLL_FLAGS = -DACTIVITY_BUILD_DLL
+!endif
+
+CFLAGS = \
+	-I..\..\..\orbsvcs \
+	-I..\..\.. \
+	-I..\..\..\tao \
+	-I..\..\..\.. \
+	$(LIB_FLAGS) \
+	$(DLL_FLAGS)
+
+CPPDIR = .
+
+IDLDIR = .
+
+INCLUDES = \
+	Activity.h \
+	Builder.h \
+	JobC.h \
+	JobS.h \
+	JobS_T.h \
+	Job_i.h \
+	POA_Holder.h \
+	Periodic_Task.h \
+	Task_Stats.h \
+	Thread_Task.h \
+	JobS_T.cpp \
+	JobC.i \
+	JobS.i \
+	JobS_T.i \
+	Task_Stats.inl \
+	Job.idl
+
+INCDIR_NAME = orbsvcs
+
+all: idl_src_files
+
+BASE_BINDIR = $(ACE_ROOT)\bin
+
+!include <$(ACE_ROOT)\include\makeinclude\build_library.bor>
+
+#
+# IDL Build rules
+#
+
+idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
+
+# IDL File Directory: .
+$(IDLDIR)\JobS.cpp $(IDLDIR)\JobC.cpp: $(IDLDIR)\Job.idl
+	$(TAO_IDL) -Gv -I..\..\.. -I..\..\..\orbsvcs -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $**
diff --git a/TAO/examples/RTCORBA/Activity/Makefile.bor b/TAO/examples/RTCORBA/Activity/Makefile.bor
index a0afbb53e87..63619745f0a 100644
--- a/TAO/examples/RTCORBA/Activity/Makefile.bor
+++ b/TAO/examples/RTCORBA/Activity/Makefile.bor
@@ -1,58 +1,24 @@
+#----------------------------------------------------------------------------
+#       Borland Workspace
+#----------------------------------------------------------------------------
 
-#
-# Makefile for building the Activity RTCorba example
-#
+!include <$(ACE_ROOT)\include\makeinclude\make_flags.bor>
 
-NAME = activity
+all:
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.Activity_Lib.bor all
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.Activity.bor all
 
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -I$(ACE_ROOT)/TAO/orbsvcs/orbsvcs -Ge 1
+clean:
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.Activity_Lib.bor clean
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.Activity.bor clean
 
-OBJFILES = \
-        $(OBJDIR)\JobC.obj \
-        $(OBJDIR)\JobS.obj \
-        $(OBJDIR)\Periodic_Task.obj \
-        $(OBJDIR)\Thread_Task.obj \
-        $(OBJDIR)\Activity.obj \
-        $(OBJDIR)\Builder.obj \
-        $(OBJDIR)\POA_Holder.obj \
-        $(OBJDIR)\Job_i.obj \
-        $(OBJDIR)\Task_Stats.obj
+realclean:
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.Activity_Lib.bor realclean
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.Activity.bor realclean
 
-CFLAGS = \
-	$(ACE_CFLAGS) \
-	$(TAO_CFLAGS) \
-        $(TAO_PORTABLESERVER_CFLAGS) \
-        $(TAO_NAMING_CFLAGS) \
-        $(TAO_RTCORBA_CFLAGS) \
-        $(TAO_RTPORTABLESERVER_CFLAGS) \
-        $(TAO_VALUETYPE_CFLAGS) \
-	$(TAO_IORINTERCEPTOR_CFLAGS) \
-	$(TAO_ORT_CFLAGS)
-
-LIBFILES = \
-	$(ACE_LIB) \
-	$(TAO_LIB) \
-        $(TAO_PORTABLESERVER_LIB) \
-        $(TAO_NAMING_LIB) \
-        $(TAO_RTCORBA_LIB) \
-        $(TAO_RTPORTABLESERVER_LIB) \
-        $(TAO_VALUETYPE_LIB) \
-	$(TAO_IORINTERCEPTOR_LIB) \
-	$(TAO_ORT_LIB)
-
-IDLFILES = \
-        $(IDLDIR)\Job.idl
-
-CPPDIR = .
-
-IDLDIR = .
-
-!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
-
-#
-# IDL Build rules
-#
-
-$(IDLDIR)\JobC.cpp $(IDLDIR)\JobS.cpp: $(IDLDIR)\Job.idl
-	$(TAO_IDL) $**
+install:
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.Activity_Lib.bor install
+	$(MAKE) -$(MAKEFLAGS) $(MAKE_FLAGS) -f Makefile.Activity.bor install
 
+regenerate:
+	C:\Perl\bin\perl.exe \ACElatest\ACE_wrappers\bin\mwc.pl -type borland