ChangeLogTag: Sat Oct 18 16:53:10 2003 Venkita Subramonian <venkita@cs.wustl.edu>

2 files changed, 106 insertions, 61 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 8be06f04cc8..5e20e99bdf7 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,8 @@
+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:
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling.dsp b/TAO/orbsvcs/orbsvcs/RTCosScheduling.dsp
index c2e8ecc13b2..5ae1a4f6329 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling.dsp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling.dsp
@@ -6,62 +6,82 @@
 

 CFG=RTCosScheduling - Win32 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.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 

 !MESSAGE NMAKE /f "RTCosScheduling.mak" CFG="RTCosScheduling - Win32 Debug"

-!MESSAGE

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

+!MESSAGE 

 !MESSAGE "RTCosScheduling - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

 !MESSAGE "RTCosScheduling - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

+MTL=midl.exe

 RSC=rc.exe

 

 !IF  "$(CFG)" == "RTCosScheduling - Win32 Release"

 

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "..\..\..\lib"

-# PROP Intermediate_Dir "Release\RTCosScheduling"

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# 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 TAO_RTCOSSCHEDULING_BUILD_DLL /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 /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RTCOSSCHEDULING_EXPORTS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "../../.." /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_RTCOSSCHEDULING_BUILD_DLL" /YX /FD /c

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

-# ADD BSC32 /nologo /o"..\..\..\lib\TAO_RTCosScheduling.bsc"

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

 LINK32=link.exe

-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO TAO_RTPortableServer.lib TAO_RTCORBA.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_Valuetype.lib TAO_ObjRefTemplate.lib TAO.lib ACE.lib /libpath:"..\..\..\lib" /nologo /version:1.3.4 /subsystem:windows /pdb:"..\..\..\lib\TAO_RTCosScheduling.pdb" /dll  /machine:I386 /out:"..\..\..\lib\TAO_RTCosScheduling.dll"

+# 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 /dll /machine:I386

+# ADD LINK32 TAO.lib ace.lib TAO_RTPortableServer.lib TAO_RTCORBA.lib TAO_PortableServer.lib TAO_IORInterceptor.lib TAO_Valuetype.lib TAO_ObjRefTemplate.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_RTCosScheduling.dll" /libpath:"..\..\tao\RTPortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\tao\RTCORBA" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao\IORInterceptor" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao\ObjRefTemplate" /libpath:"..\..\..\lib"

 

 !ELSEIF  "$(CFG)" == "RTCosScheduling - Win32 Debug"

 

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "..\..\..\lib"

-# PROP Intermediate_Dir "Debug\RTCosScheduling"

+# PROP Output_Dir ""

+# PROP Intermediate_Dir ""

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# 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 TAO_RTCOSSCHEDULING_BUILD_DLL /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 /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "RTCOSSCHEDULING_EXPORTS" /YX /FD  /c

+# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /I "../../.." /I "../.." /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TAO_RTCOSSCHEDULING_BUILD_DLL" /YX /FD  /c

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

-# ADD BSC32 /nologo /o"..\..\..\lib\TAO_RTCosScheduling.bsc"

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

 LINK32=link.exe

-# ADD LINK32 advapi32.lib user32.lib /INCREMENTAL:NO TAO_RTPortableServerd.lib TAO_RTCORBAd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_Valuetyped.lib TAO_ObjRefTemplated.lib TAOd.lib ACEd.lib /libpath:"..\..\..\lib" /nologo /version:1.3.4 /subsystem:windows /pdb:"..\..\..\lib\TAO_RTCosSchedulingd.pdb" /dll /debug /machine:I386 /out:"..\..\..\lib\TAO_RTCosSchedulingd.dll"

+# 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 /dll /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 TAOd.lib aced.lib TAO_RTPortableServerd.lib TAO_RTCORBAd.lib TAO_PortableServerd.lib TAO_IORInterceptord.lib TAO_Valuetyped.lib TAO_ObjRefTemplated.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_RTCosSchedulingd.dll" /pdbtype:sept /libpath:"..\..\tao\RTPortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\tao\RTCORBA" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao\IORInterceptor" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao\ObjRefTemplate" /libpath:"..\..\..\lib"

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

@@ -69,124 +89,144 @@ LINK32=link.exe
 # Name "RTCosScheduling - Win32 Debug"

 # Begin Group "Source Files"

 

-# PROP Default_Filter "cpp;cxx;c"

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

-SOURCE=".\RTCosScheduling\RTCosScheduling_ClientScheduler_i.cpp"

+SOURCE=.\RTCosScheduling\RTCosScheduling_ClientScheduler_i.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=".\RTCosScheduling\RTCosScheduling_PCP_Manager.cpp"

+SOURCE=.\RTCosScheduling\RTCosScheduling_PCP_Manager.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=".\RTCosScheduling\RTCosScheduling_ServerScheduler_i.cpp"

+SOURCE=.\RTCosScheduling\RTCosScheduling_ServerScheduler_i.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\RTCosSchedulingC.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\RTCosSchedulingS.cpp

 # End Source File

 # End Group

 # Begin Group "Header Files"

 

-# PROP Default_Filter "h;hpp;hxx;hh"

+# PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

-SOURCE=".\RTCosScheduling\RTCosScheduling_ClientScheduler_i.h"

+SOURCE=.\RTCosScheduling\RTCosScheduling_ClientScheduler_i.h

 # End Source File

 # Begin Source File

 

-SOURCE=".\RTCosScheduling\RTCosScheduling_PCP_Manager.h"

+SOURCE=.\RTCosScheduling\RTCosScheduling_export.h

 # End Source File

 # Begin Source File

 

-SOURCE=".\RTCosScheduling\RTCosScheduling_ServerScheduler_i.h"

+SOURCE=.\RTCosScheduling\RTCosScheduling_PCP_Manager.h

 # End Source File

-# End Group

-# Begin Group "Inline Files"

-

-# PROP Default_Filter "i;inl"

 # Begin Source File

 

-SOURCE=".\RTCosScheduling\RTCosScheduling_ClientScheduler_i.i"

+SOURCE=.\RTCosScheduling\RTCosScheduling_ServerScheduler_i.h

 # End Source File

 # Begin Source File

 

-SOURCE=".\RTCosScheduling\RTCosScheduling_PCP_Manager.i"

+SOURCE=.\RTCosSchedulingC.h

 # End Source File

 # Begin Source File

 

-SOURCE=".\RTCosScheduling\RTCosScheduling_ServerScheduler_i.i"

+SOURCE=.\RTCosSchedulingS.h

 # End Source File

 # End Group

+# Begin Group "Resource Files"

+

+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+# End Group

 # Begin Group "IDL Files"

 

-# PROP Default_Filter "idl"

+# PROP Default_Filter ".idl"

 # Begin Source File

 

-SOURCE=".\RTCosScheduling.idl"

+SOURCE=.\RTCosScheduling.idl

 

 !IF  "$(CFG)" == "RTCosScheduling - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)

+# Begin Custom Build

 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)

+	..\..\..\Release\bin\tao_idl -Ge 1 -I../../ -I../../tao  -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=RTCosScheduling\RTCosScheduling_export.h $(InputName).idl

 

-".\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-".\$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-".\$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-".\$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-".\$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-".\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

 # End Custom Build

 

 !ELSEIF  "$(CFG)" == "RTCosScheduling - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-# Begin Custom Build - Invoking IDL Compiler on $(InputPath)

+# Begin Custom Build

 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\tao_idl -Ge 1 -I../../ -I../../tao  -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_RTCosScheduling_Export -Wb,export_include=RTCosScheduling\RTCosScheduling_export.h $(InputName).idl

 

-".\$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-".\$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-".\$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-".\$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-".\$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-".\$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

 # End Custom Build

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # End Group