diff options
| -rw-r--r-- | TAO/ChangeLog-98c | 45 | ||||
| -rw-r--r-- | TAO/TAO_IDL/tao_idl.dsp | 4 | ||||
| -rw-r--r-- | TAO/TAO_IDL/tao_idl_static.dsp | 4 |
3 files changed, 39 insertions, 14 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 6dbcea9e380..4de8ce762a4 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,12 +1,37 @@ +Thu Dec 31 16:28:27 1998 Nanbor Wang <nanbor@cs.wustl.edu> + + * TAO_IDL/tao_idl.dsp: + * TAO_IDL/tao_idl_static.dsp: Also write the executables to + $ACE_ROOT/bin. + + * orbsvcs/Naming_Service/Naming_Service.dsp: Dependency update. + + * orbsvcs/orbsvcs/orbsvcs.dsp: Added Corlos' new files for Event + Channel into the project. Cleaned up IDL configurations. + + * orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.cpp: + * orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp: + * orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp: + * orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.cpp: Don't need to + specify relative path for header files reside in the same + directory. + + * orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h: + * orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h: + * orbsvcs/orbsvcs/CosEvent/EventChannel_i.h: + * orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h: + * orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h: Added + TAO_ORBSVCS_export decls. + Thu Dec 31 15:28:49 1998 Carlos O'Ryan <coryan@cs.wustl.edu> - * orbsvcs/orbsvcs/Event/EC_Event_Channel.h: - * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h: - * orbsvcs/orbsvcs/Event/EC_Dispatching.h: - * orbsvcs/orbsvcs/Event/EC_ProxySupplier.h: - * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h: - * orbsvcs/orbsvcs/Event/EC_Filter.h: - * orbsvcs/orbsvcs/Event/EC_Filter_Builder.h: + * orbsvcs/orbsvcs/Event/EC_Event_Channel.h: + * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h: + * orbsvcs/orbsvcs/Event/EC_Dispatching.h: + * orbsvcs/orbsvcs/Event/EC_ProxySupplier.h: + * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h: + * orbsvcs/orbsvcs/Event/EC_Filter.h: + * orbsvcs/orbsvcs/Event/EC_Filter_Builder.h: I'm prototyping a new version of the real-time Event Channel, this version will be more efficient, more configurable and (hopefully) easier to maintain. This initial commit is just for @@ -15,17 +40,17 @@ Thu Dec 31 15:28:49 1998 Carlos O'Ryan <coryan@cs.wustl.edu> Thu Dec 31 15:34:47 1998 Carlos O'Ryan <coryan@cs.wustl.edu> - * orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp: + * orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp: Removed temporary reference called _env, it is not needed because we can use TAO_THROW_ENV() instead of TAO_THROW. Thu Dec 31 15:04:57 1998 Carlos O'Ryan <coryan@cs.wustl.edu> - * orbsvcs/orbsvcs/Makefile: + * orbsvcs/orbsvcs/Makefile: Added the CosEC files to the Makefile; it compiles with both Sun/CC and egcs. - * orbsvcs/orbsvcs/Time/Timer_Helper.cpp: + * orbsvcs/orbsvcs/Time/Timer_Helper.cpp: Removed template instantiations, they are in orbsvcs-tmplinst.cpp already. diff --git a/TAO/TAO_IDL/tao_idl.dsp b/TAO/TAO_IDL/tao_idl.dsp index 2a9d4a1eaf2..36395687e45 100644 --- a/TAO/TAO_IDL/tao_idl.dsp +++ b/TAO/TAO_IDL/tao_idl.dsp @@ -110,7 +110,7 @@ BSC32=bscmake.exe LINK32=link.exe
# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\..\ace"
# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\..\ace"
+# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /out:"..\..\bin\tao_idl.exe" /pdbtype:sept /libpath:"..\..\ace"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Release"
@@ -141,7 +141,7 @@ BSC32=bscmake.exe LINK32=link.exe
# ADD BASE LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"../../ace"
# SUBTRACT BASE LINK32 /map
-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"../../ace"
+# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /out:"..\..\bin\Release\tao_idl.exe" /libpath:"../../ace"
# SUBTRACT LINK32 /map
!ENDIF
diff --git a/TAO/TAO_IDL/tao_idl_static.dsp b/TAO/TAO_IDL/tao_idl_static.dsp index 8be6de237a2..1303701b5a1 100644 --- a/TAO/TAO_IDL/tao_idl_static.dsp +++ b/TAO/TAO_IDL/tao_idl_static.dsp @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"../../ace"
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\bin\Release\tao_idl_static.exe" /libpath:"../../ace"
# SUBTRACT LINK32 /map
!ELSEIF "$(CFG)" == "TAO_IDL Compiler Static - Win32 Debug"
@@ -76,7 +76,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ace"
+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\bin\tao_idl_static.exe" /pdbtype:sept /libpath:"..\..\ace"
# SUBTRACT LINK32 /pdb:none
!ENDIF
|