summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLogs/ChangeLog-02a7
-rw-r--r--ChangeLogs/ChangeLog-03a7
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a13
-rw-r--r--TAO/orbsvcs/Event_Service/Makefile.bor4
-rw-r--r--TAO/orbsvcs/orbsvcs/Makefile.bor2
-rw-r--r--TAO/orbsvcs/orbsvcs/RTEvent.bor25
-rw-r--r--TAO/orbsvcs/orbsvcs/Svc_Utils.bor12
-rw-r--r--TAO/tests/Param_Test/client.bor1
-rw-r--r--include/makeinclude/ace_flags.bor6
10 files changed, 55 insertions, 29 deletions
diff --git a/ChangeLog b/ChangeLog
index 6a5b982a400..ce4bfe16607 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 6 09:42:39 2000 Chris Kohlhoff <chris@kohlhoff.com>
+
+ * include/makeinclude/ace_flags.bor:
+ Added support for new orbsvcs libraries.
+
Mon Jun 05 20:59:42 2000 David L. Levine <levine@cs.wustl.edu>
* include/makeinclude/wrapper_macros.GNU: protected definitions
@@ -1678,7 +1683,7 @@ Sat May 13 19:05:23 2000 Darrell Brunsch <brunsch@uci.edu>
Forgot to add a base member initialization for the allocator
in the new ACE_USHORT16 constructor for ACE_WString. Thanks
- to Chris Kohlhoff <chris@kohlhoff.com> for noticeing this.
+ to Chris Kohlhoff <chris@kohlhoff.com> for noticing this.
Sat May 13 19:07:32 2000 Nanbor Wang <nanbor@cs.wustl.edu>
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 6a5b982a400..ce4bfe16607 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,8 @@
+Tue Jun 6 09:42:39 2000 Chris Kohlhoff <chris@kohlhoff.com>
+
+ * include/makeinclude/ace_flags.bor:
+ Added support for new orbsvcs libraries.
+
Mon Jun 05 20:59:42 2000 David L. Levine <levine@cs.wustl.edu>
* include/makeinclude/wrapper_macros.GNU: protected definitions
@@ -1678,7 +1683,7 @@ Sat May 13 19:05:23 2000 Darrell Brunsch <brunsch@uci.edu>
Forgot to add a base member initialization for the allocator
in the new ACE_USHORT16 constructor for ACE_WString. Thanks
- to Chris Kohlhoff <chris@kohlhoff.com> for noticeing this.
+ to Chris Kohlhoff <chris@kohlhoff.com> for noticing this.
Sat May 13 19:07:32 2000 Nanbor Wang <nanbor@cs.wustl.edu>
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 6a5b982a400..ce4bfe16607 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,8 @@
+Tue Jun 6 09:42:39 2000 Chris Kohlhoff <chris@kohlhoff.com>
+
+ * include/makeinclude/ace_flags.bor:
+ Added support for new orbsvcs libraries.
+
Mon Jun 05 20:59:42 2000 David L. Levine <levine@cs.wustl.edu>
* include/makeinclude/wrapper_macros.GNU: protected definitions
@@ -1678,7 +1683,7 @@ Sat May 13 19:05:23 2000 Darrell Brunsch <brunsch@uci.edu>
Forgot to add a base member initialization for the allocator
in the new ACE_USHORT16 constructor for ACE_WString. Thanks
- to Chris Kohlhoff <chris@kohlhoff.com> for noticeing this.
+ to Chris Kohlhoff <chris@kohlhoff.com> for noticing this.
Sat May 13 19:07:32 2000 Nanbor Wang <nanbor@cs.wustl.edu>
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 4de9517bc49..cb729a8b50e 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,16 @@
+Tue Jun 6 09:42:39 2000 Chris Kohlhoff <chris@kohlhoff.com>
+
+ * orbsvcs/orbsvcs/Makefile.bor:
+ * orbsvcs/orbsvcs/RTEvent.bor:
+ * orbsvcs/orbsvcs/Svc_Utils.bor:
+ * orbsvcs/orbsvcs/RTSchedEvent.bor:
+ * orbsvcs/orbsvcs/RTOLDEvent.bor:
+ * orbsvcs/Event_Service/Makefile.bor:
+ Added new orbsvcs libraries RTSchedEvent and RTOLDEvent.
+
+ * tests/Param_Test/client.bor:
+ Added missing file small_union.cpp.
+
Tue Jun 06 01:20:37 2000 Irfan Pyarali <irfan@cs.wustl.edu>
* tao/POA.cpp (client_exposed_policies): Some of the client
diff --git a/TAO/orbsvcs/Event_Service/Makefile.bor b/TAO/orbsvcs/Event_Service/Makefile.bor
index 815b19d7be0..b334cf1d9fe 100644
--- a/TAO/orbsvcs/Event_Service/Makefile.bor
+++ b/TAO/orbsvcs/Event_Service/Makefile.bor
@@ -8,10 +8,10 @@ OBJFILES = \
$(OBJDIR)\Event_Service.obj
CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_NAMING_CFLAGS) \
- $(TAO_RTSCHED_CFLAGS) $(TAO_RTEVENT_CFLAGS)
+ $(TAO_RTSCHED_CFLAGS) $(TAO_RTEVENT_CFLAGS) $(TAO_RTOLDEVENT_CFLAGS)
LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_NAMING_LIB) $(TAO_RTSCHED_LIB) \
- $(TAO_RTEVENT_LIB)
+ $(TAO_RTEVENT_LIB) $(TAO_RTOLDEVENT_LIB)
CPPDIR = .
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.bor b/TAO/orbsvcs/orbsvcs/Makefile.bor
index 447bffd54cd..b741c89bf24 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.bor
+++ b/TAO/orbsvcs/orbsvcs/Makefile.bor
@@ -9,6 +9,8 @@ MAKEFILES = \
CosTrading.bor \
RTSched.bor \
RTEvent.bor \
+ RTOLDEvent.bor \
+ RTSchedEvent.bor \
CosEvent.bor \
CosNotification.bor \
AV.bor \
diff --git a/TAO/orbsvcs/orbsvcs/RTEvent.bor b/TAO/orbsvcs/orbsvcs/RTEvent.bor
index 13bb50b8934..115fe65e695 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent.bor
+++ b/TAO/orbsvcs/orbsvcs/RTEvent.bor
@@ -16,8 +16,6 @@ IDLFILES = \
$(IDLDIR)\RtecUDPAdmin.idl
OBJFILES = \
- $(OBJDIR)\BCU.obj \
- $(OBJDIR)\Dispatching_Modules.obj \
$(OBJDIR)\EC_And_Filter.obj \
$(OBJDIR)\EC_Basic_Factory.obj \
$(OBJDIR)\EC_Basic_Filter_Builder.obj \
@@ -44,16 +42,12 @@ OBJFILES = \
$(OBJDIR)\EC_ObserverStrategy.obj \
$(OBJDIR)\EC_Per_Supplier_Filter.obj \
$(OBJDIR)\EC_Prefix_Filter_Builder.obj \
- $(OBJDIR)\EC_Priority_Dispatching.obj \
- $(OBJDIR)\EC_Priority_Scheduling.obj \
$(OBJDIR)\EC_ProxyConsumer.obj \
$(OBJDIR)\EC_ProxySupplier.obj \
$(OBJDIR)\EC_QOS_Info.obj \
$(OBJDIR)\EC_Reactive_ConsumerControl.obj \
$(OBJDIR)\EC_Reactive_SupplierControl.obj \
$(OBJDIR)\EC_Reactive_Timeout_Generator.obj \
- $(OBJDIR)\EC_Sched_Filter.obj \
- $(OBJDIR)\EC_Sched_Filter_Builder.obj \
$(OBJDIR)\EC_Scheduling_Strategy.obj \
$(OBJDIR)\EC_Supplier_Filter.obj \
$(OBJDIR)\EC_Supplier_Filter_Builder.obj \
@@ -64,15 +58,7 @@ OBJFILES = \
$(OBJDIR)\EC_Trivial_Supplier_Filter.obj \
$(OBJDIR)\EC_Type_Filter.obj \
$(OBJDIR)\EC_UDP_Admin.obj \
- $(OBJDIR)\Event_Channel.obj \
- $(OBJDIR)\Event_Manip.obj \
$(OBJDIR)\Event_Utilities.obj \
- $(OBJDIR)\GPlot_File.obj \
- $(OBJDIR)\Local_ESTypes.obj \
- $(OBJDIR)\Memory_Pools.obj \
- $(OBJDIR)\Module_Factory.obj \
- $(OBJDIR)\ReactorTask.obj \
- $(OBJDIR)\RT_Task.obj \
$(OBJDIR)\RtecDefaultEventDataC.obj \
$(OBJDIR)\RtecDefaultEventDataS.obj \
$(OBJDIR)\RtecEventChannelAdminC.obj \
@@ -80,18 +66,17 @@ OBJFILES = \
$(OBJDIR)\RtecEventCommC.obj \
$(OBJDIR)\RtecEventCommS.obj \
$(OBJDIR)\RtecUDPAdminC.obj \
- $(OBJDIR)\RtecUDPAdminS.obj \
- $(OBJDIR)\Timer_Module.obj
+ $(OBJDIR)\RtecUDPAdminS.obj
RESOURCE = $(OBJDIR)\orbsvcs.res
!ifdef STATIC
CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_NAMING_CFLAGS) $(TAO_RTSCHED_CFLAGS) $(TAO_RTEVENT_CFLAGS)
+ $(TAO_NAMING_CFLAGS) $(TAO_RTSCHED_CFLAGS) $(TAO_RTEVENT_CFLAGS)
!else
CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_NAMING_CFLAGS) $(TAO_RTSCHED_CFLAGS) $(TAO_RTEVENT_CFLAGS) \
- -DTAO_RTEVENT_BUILD_DLL
+ $(TAO_NAMING_CFLAGS) $(TAO_RTSCHED_CFLAGS) $(TAO_RTEVENT_CFLAGS) \
+ -DTAO_RTEVENT_BUILD_DLL
!endif
CPPDIR = .;Event
@@ -99,7 +84,7 @@ CPPDIR = .;Event
IDLDIR = .
LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_SVC_UTILS_LIB) $(TAO_NAMING_LIB) \
- $(TAO_RTSCHED_LIB)
+ $(TAO_RTSCHED_LIB)
all: idl_src_files rtevent_lib
diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils.bor b/TAO/orbsvcs/orbsvcs/Svc_Utils.bor
index aa1731418e0..86d5d8bc43c 100644
--- a/TAO/orbsvcs/orbsvcs/Svc_Utils.bor
+++ b/TAO/orbsvcs/orbsvcs/Svc_Utils.bor
@@ -1,5 +1,5 @@
#
-# Makefile for building the TAO TimeBase library
+# Makefile for building the TAO Svc Utils library
#
NAME = TAO_Svc_Utils
@@ -10,13 +10,16 @@ TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
-Wb,post_include=ace/post.h
IDLFILES = \
- $(IDLDIR)\TimeBase.idl
+ $(IDLDIR)\TimeBase.idl \
+ $(IDLDIR)\RtecBase.idl
OBJFILES = \
$(OBJDIR)\IOR_Multicast.obj \
$(OBJDIR)\Time_Utilities.obj \
$(OBJDIR)\TimeBaseC.obj \
- $(OBJDIR)\TimeBaseS.obj
+ $(OBJDIR)\TimeBaseS.obj \
+ $(OBJDIR)\RtecBaseC.obj \
+ $(OBJDIR)\RtecBaseS.obj
RESOURCE = $(OBJDIR)\orbsvcs.res
@@ -47,3 +50,6 @@ idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
$(IDLDIR)\TimeBaseC.cpp $(IDLDIR)\TimeBaseS.cpp: $(IDLDIR)\TimeBase.idl
$(TAO_IDL) $**
+
+$(IDLDIR)\RtecBaseC.cpp $(IDLDIR)\RtecBaseS.cpp: $(IDLDIR)\RtecBase.idl
+ $(TAO_IDL) $**
diff --git a/TAO/tests/Param_Test/client.bor b/TAO/tests/Param_Test/client.bor
index a5446d39f62..6cc5aeceae5 100644
--- a/TAO/tests/Param_Test/client.bor
+++ b/TAO/tests/Param_Test/client.bor
@@ -52,6 +52,7 @@ OBJFILES = \
$(OBJDIR)\recursive_union.obj \
$(OBJDIR)\except.obj \
$(OBJDIR)\big_union.obj \
+ $(OBJDIR)\small_union.obj \
$(OBJDIR)\multdim_array.obj \
$(OBJDIR)\complex_any.obj
diff --git a/include/makeinclude/ace_flags.bor b/include/makeinclude/ace_flags.bor
index 802a68b9389..fa31e0ffc89 100644
--- a/include/makeinclude/ace_flags.bor
+++ b/include/makeinclude/ace_flags.bor
@@ -12,7 +12,7 @@ DLL_FLAG=1
#
# Compiler flags
#
-ACE_CFLAGS = -I$(ACE_ROOT) -DACE_HAS_DLL=$(DLL_FLAG) -DACE_OS_HAS_DLL=$(DLL_FLAG)
+ACE_CFLAGS = -I$(ACE_ROOT) -DACE_HAS_DLL=$(DLL_FLAG)
TAO_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_HAS_DLL=$(DLL_FLAG)
TAO_SVC_UTILS_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_SVC_UTILS_HAS_DLL=$(DLL_FLAG)
TAO_AV_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_AV_HAS_DLL=$(DLL_FLAG)
@@ -24,7 +24,9 @@ TAO_NAMING_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_NAMING_HAS_DLL=$(DLL_FLAG)
TAO_NOTIFY_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_NOTIFY_HAS_DLL=$(DLL_FLAG)
TAO_PROPERTY_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_PROPERTY_HAS_DLL=$(DLL_FLAG)
TAO_RTEVENT_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_RTEVENT_HAS_DLL=$(DLL_FLAG)
+TAO_RTOLDEVENT_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_RTOLDEVENT_HAS_DLL=$(DLL_FLAG)
TAO_RTSCHED_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_RTSCHED_HAS_DLL=$(DLL_FLAG)
+TAO_RTSCHEDEVENT_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_RTSCHEDEVENT_HAS_DLL=$(DLL_FLAG)
TAO_TIME_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_TIME_HAS_DLL=$(DLL_FLAG)
TAO_TRADING_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_TRADING_HAS_DLL=$(DLL_FLAG)
@@ -44,6 +46,8 @@ TAO_NAMING_LIB = $(CORE_BINDIR)\TAO_CosNaming$(LIB_DECORATOR).lib
TAO_NOTIFY_LIB = $(CORE_BINDIR)\TAO_CosNotification$(LIB_DECORATOR).lib
TAO_PROPERTY_LIB = $(CORE_BINDIR)\TAO_CosProperty$(LIB_DECORATOR).lib
TAO_RTEVENT_LIB = $(CORE_BINDIR)\TAO_RTEvent$(LIB_DECORATOR).lib
+TAO_RTOLDEVENT_LIB = $(CORE_BINDIR)\TAO_RTOLDEvent$(LIB_DECORATOR).lib
TAO_RTSCHED_LIB = $(CORE_BINDIR)\TAO_RTSched$(LIB_DECORATOR).lib
+TAO_RTSCHEDEVENT_LIB = $(CORE_BINDIR)\TAO_RTSchedEvent$(LIB_DECORATOR).lib
TAO_TIME_LIB = $(CORE_BINDIR)\TAO_CosTime$(LIB_DECORATOR).lib
TAO_TRADING_LIB = $(CORE_BINDIR)\TAO_CosTrading$(LIB_DECORATOR).lib
View Lorry Controller Status