diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-10-09 16:33:52 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-10-09 16:33:52 +0000 |
| commit | 2dc1e684796c67a1dbe6551167641f30bc6ca386 (patch) | |
| tree | f764a9782fb8d5e0bd359a8c940f3b3219e26fc9 | |
| parent | 5b3ba15a2fb6f50691b5fac0ef888cee334e2c74 (diff) | |
| download | ATCD-2dc1e684796c67a1dbe6551167641f30bc6ca386.tar.gz | |
ChangeLogTag:Wed Oct 9 09:28:28 2002 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | TAO/ChangeLog | 19 | ||||
| -rw-r--r-- | TAO/TAOACE.dsw | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile | 10 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Svc_Utils.dsp | 12 |
4 files changed, 31 insertions, 12 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 2895c6a26eb..9ae0e83d9b0 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,22 @@ +Wed Oct 9 09:28:28 2002 Ossama Othman <ossama@uci.edu> + + * TAOACE.dsw: + * TAOACE_Static.dsw: + + Corrected project dependencies for DsNotifyLogAdmin project. + + * orbsvcs/orbsvcs/Svc_Utils.dsp: + + More fixes for redundant "-I../../tao" preprocessor directives. + Addresses compile-time problems in the "DLL Release" + configuration. + + * orbsvcs/orbsvcs/Makefile (TAO_ORBSVCS): + + Due to popular demand and broken builds, temporarily removed the + four Event Logging Services from the list of ORB services to + build. + Tue Oct 8 16:28:05 2002 Jaiganesh Balasubramanian <jai@doc.ece.uci.edu> * orbsvcs/tests/LoadBalancing/GenericFactory/Basic.cpp: diff --git a/TAO/TAOACE.dsw b/TAO/TAOACE.dsw index 40ed5c12e16..5496bedf54f 100644 --- a/TAO/TAOACE.dsw +++ b/TAO/TAOACE.dsw @@ -399,7 +399,7 @@ Package=<4> Project_Dep_Name CosNotification
End Project Dependency
Begin Project Dependency
- Project_Dep_Name DsLogAdmin
+ Project_Dep_Name DsEventLogAdmin
End Project Dependency
}}}
diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile index 1e2d5159d25..ec7ca36b22c 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile +++ b/TAO/orbsvcs/orbsvcs/Makefile @@ -36,16 +36,16 @@ ifndef TAO_ORBSVCS NativeCosEvent \ CosEvent \ RTOLDEvent \ - RTSchedEvent \ - EventLog \ - RTEventLog \ - NotifyLog + RTSchedEvent +# EventLog \ +# RTEventLog \ +# NotifyLog endif #corba_messaging TAO_ORBSVCS += Concurrency \ Trader \ - Log \ AV +# Log ifeq ($(minimum_corba),0) ifneq (Compilers 4.2,$(findstring Compilers 4.2,$(CC_VERSION))) diff --git a/TAO/orbsvcs/orbsvcs/Svc_Utils.dsp b/TAO/orbsvcs/orbsvcs/Svc_Utils.dsp index 68befc29484..832aa97a9ac 100644 --- a/TAO/orbsvcs/orbsvcs/Svc_Utils.dsp +++ b/TAO/orbsvcs/orbsvcs/Svc_Utils.dsp @@ -263,7 +263,7 @@ InputPath=.\RtecBase.idl InputName=RtecBase
BuildCmds= \
- ..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=svc_utils_export.h $(InputName).idl
+ ..\..\..\bin\Release\tao_idl -Ge 1 -I../.. -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=svc_utils_export.h $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -302,7 +302,7 @@ InputPath=.\RtecBase.idl InputName=RtecBase
BuildCmds= \
- ..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=svc_utils_export.h $(InputName).idl
+ ..\..\..\bin\tao_idl -Ge 1 -I../.. -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=svc_utils_export.h $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -342,7 +342,7 @@ InputPath=.\RtecBase.idl InputName=RtecBase
BuildCmds= \
- ..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=svc_utils_export.h $(InputName).idl
+ ..\..\..\bin\Release\tao_idl -Ge 1 -I../.. -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=svc_utils_export.h $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -393,7 +393,7 @@ InputPath=.\TimeBase.idl InputName=TimeBase
BuildCmds= \
- ..\..\..\bin\Release\tao_idl -Ge 1 -I../.. -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=svc_utils_export.h $(InputName).idl
+ ..\..\..\bin\Release\tao_idl -Ge 1 -I../.. -Wb,pre_incluxde=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=svc_utils_export.h $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -432,7 +432,7 @@ InputPath=.\TimeBase.idl InputName=TimeBase
BuildCmds= \
- ..\..\..\bin\tao_idl -Ge 1 -I../../ -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=svc_utils_export.h $(InputName).idl
+ ..\..\..\bin\tao_idl -Ge 1 -I../.. -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=svc_utils_export.h $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -472,7 +472,7 @@ InputPath=.\TimeBase.idl InputName=TimeBase
BuildCmds= \
- ..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=svc_utils_export.h $(InputName).idl
+ ..\..\..\bin\Release\tao_idl -Ge 1 -I../.. -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=svc_utils_export.h $(InputName).idl
"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
|