diff options
author | huangming <huangminghuang@users.noreply.github.com> | 2003-10-19 20:52:40 +0000 |
---|---|---|
committer | huangming <huangminghuang@users.noreply.github.com> | 2003-10-19 20:52:40 +0000 |
commit | b49bd24ac89608e8152323d344430d632f86c55f (patch) | |
tree | 9d5586d6d478a67fe9443776b0029940a80ab0b7 | |
parent | 19c2a0d4acfe69deff4c1f684926133cf65664d0 (diff) | |
download | ATCD-b49bd24ac89608e8152323d344430d632f86c55f.tar.gz |
ChangeLogTag: Sun Oct 19 15:46:42 2003 Huang-Ming Huang <hh1@cse.wustl.edu>
-rw-r--r-- | TAO/ChangeLog | 52 | ||||
-rw-r--r-- | TAO/TAOACE_Static.dsw | 14 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/RTCosScheduling_Static.dsp | 103 |
3 files changed, 105 insertions, 64 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6e3ce156a25..bc57aff1b59 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Sun Oct 19 15:46:42 2003 Huang-Ming Huang <hh1@cse.wustl.edu> + + * orbsvcs/orbsvcs/RTCosScheduling_Static.dsp: + * orbsvcs/tests/RTCosScheduling/RTCosScheduling_Client_Static.dsp: + * orbsvcs/tests/RTCosScheduling/RTCosScheduling_Server_Static.dsp: + Changed the configuration name from Debug and Release to + Static Debug and Static Release. + + * TAOACE_Static.dsw : Added RTCosScheduling_Static.dsp. + Sun Oct 19 07:34:16 2003 Venkita Subramonian <venkita@cs.wustl.edu> * orbsvcs/tests/Notify/lib/Peer_T.cpp: Fixed unused arg warning. @@ -9,10 +19,10 @@ Sat Oct 18 21:18:55 2003 Venkita Subramonian <venkita@cs.wustl.edu> for MSVC release configuration. Sun Oct 19 02:02:27 UTC 2003 Kevin Bryan <bryank@cs.uri.edu> - + * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp: Cast what ACE_Thread::self() returns to int to satisfy FreeBSD. - + Sat Oct 18 17:02:49 2003 Venkita Subramonian <venkita@cs.wustl.edu> * TAOACE.dsw: Added RTCosScheduling.dsp. @@ -21,7 +31,7 @@ Sat Oct 18 16:53:10 2003 Venkita Subramonian <venkita@cs.wustl.edu> * orbsvcs/orbsvcs/RTCosScheduling.dsp: Modified include and library paths. - + Sat Oct 18 15:14:38 2003 George Edwards <g.edwards@vanderbilt.edu> * tests/OBV/Supports/Supports_Test_impl.h: @@ -31,10 +41,10 @@ Sat Oct 18 15:14:38 2003 George Edwards <g.edwards@vanderbilt.edu> Sat Oct 18 12:36:22 2003 Venkita Subramonian <venkita@cs.wustl.edu> - * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp: + * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.cpp: Changed constructor definition to match prototype. This was causing undefined symbol errors in SunCC. - + Sat Oct 18 10:16:20 2003 Yamuna Krishnamurthy <yamuna@oomworks.com> Added Stream Control Transmission Protocol (SCTP) to the AVStreams @@ -42,20 +52,20 @@ Sat Oct 18 10:16:20 2003 Yamuna Krishnamurthy <yamuna@oomworks.com> transport protocol to send and receive data. The SCTP protocol is available only when the sctp flag is set. - * orbsvcs/orbsvcs/AV/SCTP_SEQ.h: - * orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp: + * orbsvcs/orbsvcs/AV/SCTP_SEQ.h: + * orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp: Contains acceptors, connectors and flow handlers to setup SCTP associations and send and receive data. - - * orbsvcs/orbsvcs/AV/FlowSpec_Entry.h: - * orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp: - * orbsvcs/orbsvcs/AV/FlowSpec_Entry.i: + + * orbsvcs/orbsvcs/AV/FlowSpec_Entry.h: + * orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp: + * orbsvcs/orbsvcs/AV/FlowSpec_Entry.i: Changed the flow specification string format to accomodate the - specification of secondary addresses for SCTP. + specification of secondary addresses for SCTP. Initial format: - "Flowname/Direction/Format/Flow_Prtocol/Sender_Address/Receiver_Address". + "Flowname/Direction/Format/Flow_Prtocol/Sender_Address/Receiver_Address". Changed to: "Flowname/Direction/Format/Flow_Prtocol/Sender_Primary_Address; Sender_Secondary_Address1;Sender_Secondary_Address2.../Receiver_Primary_Address; @@ -64,24 +74,24 @@ Sat Oct 18 10:16:20 2003 Yamuna Krishnamurthy <yamuna@oomworks.com> Added accessor methods to set/get remote and local secondary addresses. - * orbsvcs/orbsvcs/AV/AV_Core.cpp: - * orbsvcs/orbsvcs/AV/AV_Core.h: + * orbsvcs/orbsvcs/AV/AV_Core.cpp: + * orbsvcs/orbsvcs/AV/AV_Core.h: Added support to load SCTP transport protocol. - - * orbsvcs/orbsvcs/Makefile.av: + + * orbsvcs/orbsvcs/Makefile.av: Modified the Makefile to compile SCTP related files. - * orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl: + * orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl: Added a test to test with SCTP protocol. - + Sat Oct 18 09:30:40 2003 Venkita Subramonian <venkita@cs.wustl.edu> - * orbsvcs/tests/RTCosScheduling/RTCosScheduling.mpc: + * orbsvcs/tests/RTCosScheduling/RTCosScheduling.mpc: * orbsvcs/tests/RTCosScheduling/Makefile: Fixed a build dependency - problem. + problem. Sat Oct 18 08:52:15 2003 Venkita Subramonian <venkita@cs.wustl.edu> diff --git a/TAO/TAOACE_Static.dsw b/TAO/TAOACE_Static.dsw index 7e28d493745..b397f898e00 100644 --- a/TAO/TAOACE_Static.dsw +++ b/TAO/TAOACE_Static.dsw @@ -204,7 +204,7 @@ Package=<4> ###############################################################################
-Project: "Domain_static"=.\tao\Domain\TAO_Domain_Static.dsp - Package Owner=<4>
+Project: "Domain_Static"=.\tao\Domain\TAO_Domain_Static.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -522,6 +522,18 @@ Package=<4> ###############################################################################
+Project: "RTCosScheduling"=.\orbsvcs\orbsvcs\RTCosScheduling_Static.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Project: "RTEvent_Static"=.\orbsvcs\orbsvcs\RTEvent_Static.dsp - Package Owner=<4>
Package=<5>
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling_Static.dsp b/TAO/orbsvcs/orbsvcs/RTCosScheduling_Static.dsp index 69b01d560b2..43753133cf5 100644 --- a/TAO/orbsvcs/orbsvcs/RTCosScheduling_Static.dsp +++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling_Static.dsp @@ -4,23 +4,22 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104
-CFG=RTCosScheduling - Win32 Debug
+CFG=RTCosScheduling - Win32 Static Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE run the tool that generated this project file and specify the
-!MESSAGE nmake output type. You can then use the following command:
-!MESSAGE
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
!MESSAGE NMAKE /f "RTCosScheduling_Static.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "RTCosScheduling_Static.mak" CFG="RTCosScheduling - Win32 Debug"
-!MESSAGE
+!MESSAGE
+!MESSAGE NMAKE /f "RTCosScheduling_Static.mak" CFG="RTCosScheduling - Win32 Static Debug"
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "RTCosScheduling - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "RTCosScheduling - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE
+!MESSAGE
+!MESSAGE "RTCosScheduling - Win32 Static Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "RTCosScheduling - Win32 Static Release" (based on "Win32 (x86) Static Library")
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -29,44 +28,64 @@ CFG=RTCosScheduling - Win32 Debug CPP=cl.exe
RSC=rc.exe
-!IF "$(CFG)" == "RTCosScheduling - Win32 Release"
+!IF "$(CFG)" == "RTCosScheduling - Win32 Static Debug"
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "RTCosScheduling___Win32_Static_Debug"
+# PROP BASE Intermediate_Dir "RTCosScheduling___Win32_Static_Debug"
+# PROP BASE Target_Dir ""
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release\RTCosScheduling_Static"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
LINK32=link.exe -lib
-# ADD CPP /nologo /O2 /W3 /GX /MD /Zi /GR /I "$(TAO_ROOT)\orbsvcs" /I "$(TAO_ROOT)" /I "$(TAO_ROOT)\tao" /I "..\..\.." /D NDEBUG /D WIN32 /D _WINDOWS /D /D /D /FD /c
-# SUBTRACT CPP /YX
-# ADD RSC /l 0x409 /d NDEBUG /i "$(TAO_ROOT)\orbsvcs" /i "$(TAO_ROOT)" /i "$(TAO_ROOT)\tao" /i "..\..\.."
+# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Gy /I "$(TAO_ROOT)\orbsvcs" /I "$(TAO_ROOT)" /I "$(TAO_ROOT)\tao" /I "..\..\.." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /D /D /D /c
+# SUBTRACT BASE CPP /Fr /YX
+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Gy /I "$(TAO_ROOT)\orbsvcs" /I "$(TAO_ROOT)" /I "$(TAO_ROOT)\tao" /I "..\..\.." /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FD /D /D /D /c
+# SUBTRACT CPP /Fr /YX
+# ADD BASE RSC /l 0x409 /i "$(TAO_ROOT)\orbsvcs" /i "$(TAO_ROOT)" /i "$(TAO_ROOT)\tao" /i "..\..\.." /d "_DEBUG"
+# ADD RSC /l 0x409 /i "$(TAO_ROOT)\orbsvcs" /i "$(TAO_ROOT)" /i "$(TAO_ROOT)\tao" /i "..\..\.." /d "_DEBUG"
BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo /o"..\..\..\lib\TAO_RTCosScheduling.bsc"
# ADD BSC32 /nologo /o"..\..\..\lib\TAO_RTCosScheduling.bsc"
LIB32=link.exe -lib
-# ADD LIB32 /nologo /out:"..\..\..\lib\TAO_RTCosSchedulings.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\lib\TAO_RTCosSchedulingsd.lib"
+# ADD LIB32 /nologo /out:"..\..\..\lib\TAO_RTCosSchedulingsd.lib"
-!ELSEIF "$(CFG)" == "RTCosScheduling - Win32 Debug"
+!ELSEIF "$(CFG)" == "RTCosScheduling - Win32 Static Release"
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "RTCosScheduling___Win32_Static_Release"
+# PROP BASE Intermediate_Dir "RTCosScheduling___Win32_Static_Release"
+# PROP BASE Target_Dir ""
# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug\RTCosScheduling_Static"
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
LINK32=link.exe -lib
-# ADD CPP /nologo /Ob0 /W3 /Gm /GX /Zi /MDd /GR /Gy /I "$(TAO_ROOT)\orbsvcs" /I "$(TAO_ROOT)" /I "$(TAO_ROOT)\tao" /I "..\..\.." /D _DEBUG /D WIN32 /D _WINDOWS /D /D /D /FD /c
-# SUBTRACT CPP /Fr /YX
-# ADD RSC /l 0x409 /d _DEBUG /i "$(TAO_ROOT)\orbsvcs" /i "$(TAO_ROOT)" /i "$(TAO_ROOT)\tao" /i "..\..\.."
+# ADD BASE CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "$(TAO_ROOT)\orbsvcs" /I "$(TAO_ROOT)" /I "$(TAO_ROOT)\tao" /I "..\..\.." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /D /D /D /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "$(TAO_ROOT)\orbsvcs" /I "$(TAO_ROOT)" /I "$(TAO_ROOT)\tao" /I "..\..\.." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /D /D /D /c
+# SUBTRACT CPP /YX
+# ADD BASE RSC /l 0x409 /i "$(TAO_ROOT)\orbsvcs" /i "$(TAO_ROOT)" /i "$(TAO_ROOT)\tao" /i "..\..\.." /d "NDEBUG"
+# ADD RSC /l 0x409 /i "$(TAO_ROOT)\orbsvcs" /i "$(TAO_ROOT)" /i "$(TAO_ROOT)\tao" /i "..\..\.." /d "NDEBUG"
BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo /o"..\..\..\lib\TAO_RTCosScheduling.bsc"
# ADD BSC32 /nologo /o"..\..\..\lib\TAO_RTCosScheduling.bsc"
LIB32=link.exe -lib
-# ADD LIB32 /nologo /out:"..\..\..\lib\TAO_RTCosSchedulingsd.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\lib\TAO_RTCosSchedulings.lib"
+# ADD LIB32 /nologo /out:"..\..\..\lib\TAO_RTCosSchedulings.lib"
-!ENDIF
+!ENDIF
# Begin Target
-# Name "RTCosScheduling - Win32 Release"
-# Name "RTCosScheduling - Win32 Debug"
+# Name "RTCosScheduling - Win32 Static Debug"
+# Name "RTCosScheduling - Win32 Static Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;cxx;c"
@@ -122,17 +141,18 @@ SOURCE=".\RTCosScheduling\RTCosScheduling_ServerScheduler_i.i" SOURCE=".\RTCosScheduling.idl"
-!IF "$(CFG)" == "RTCosScheduling - Win32 Release"
+!IF "$(CFG)" == "RTCosScheduling - Win32 Static Debug"
+# PROP BASE Ignore_Default_Tool 1
# PROP Ignore_Default_Tool 1
# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
-InputPath=.\RTCosScheduling.idl
+InputPath=".\RTCosScheduling.idl"
InputName=RTCosScheduling
-InputDir=.
BuildCmds= \
PATH=%PATH%;..\..\..\lib \
- ..\..\..\bin\Release\tao_idl -o . -Gd -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=RTCosScheduling\RTCosScheduling_export.h -Gv -I$(TAO_ROOT) -I$(TAO_ROOT)\orbsvcs -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $(InputPath)
+ ..\..\..\bin\tao_idl -o . -Gd -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=RTCosScheduling\RTCosScheduling_export.h -Gv -I$(TAO_ROOT) -I$(TAO_ROOT)\orbsvcs -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $(InputPath) \
+
".\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -151,20 +171,20 @@ BuildCmds= \ ".\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-
# End Custom Build
-!ELSEIF "$(CFG)" == "RTCosScheduling - Win32 Debug"
+!ELSEIF "$(CFG)" == "RTCosScheduling - Win32 Static Release"
+# PROP BASE Ignore_Default_Tool 1
# PROP Ignore_Default_Tool 1
# Begin Custom Build - Invoking IDL Compiler on $(InputPath)
-InputPath=.\RTCosScheduling.idl
+InputPath=".\RTCosScheduling.idl"
InputName=RTCosScheduling
-InputDir=.
BuildCmds= \
PATH=%PATH%;..\..\..\lib \
- ..\..\..\bin\tao_idl -o . -Gd -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=RTCosScheduling\RTCosScheduling_export.h -Gv -I$(TAO_ROOT) -I$(TAO_ROOT)\orbsvcs -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $(InputPath)
+ ..\..\..\bin\Release\tao_idl -o . -Gd -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=RTCosScheduling\RTCosScheduling_export.h -Gv -I$(TAO_ROOT) -I$(TAO_ROOT)\orbsvcs -Ge 1 -Sc -Wb,pre_include=ace\pre.h -Wb,post_include=ace\post.h $(InputPath) \
+
".\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -183,10 +203,9 @@ BuildCmds= \ ".\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
-
# End Custom Build
-!ENDIF
+!ENDIF
# End Source File
# End Group
|