ChangeLogTag:Thu Dec 7 11:44:14 2000 Darrell Brunsch <brunsch@uci.edu>

5 files changed, 38 insertions, 25 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 011f4d5262a..1239ee8cbb7 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,12 @@
+Thu Dec  7 11:44:14 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * tests/RTCORBA/MT_Client_Protocol_Priority/client.bor:
+        * tests/RTCORBA/MT_Client_Protocol_Priority/client.dsp:
+        * tests/RTCORBA/MT_Client_Protocol_Priority/server.bor:
+        * tests/RTCORBA/MT_Client_Protocol_Priority/server.dsp:
+
+          Added linking to TAO_Strategies library.
+
 Thu Dec  7 13:45:29 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 
 	* tao/DynamicAny/DynAny_i.cpp:
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.bor b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.bor
index 74994942bfd..c8405fd6be8 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.bor
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.bor
@@ -13,11 +13,13 @@ OBJFILES = \
 CFLAGS = \
 	$(ACE_CFLAGS) \
 	$(TAO_CFLAGS) \
+	$(TAO_STRATEGIES_CFLAGS) \
 	$(TAO_PORTABLESERVER_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
 	$(TAO_LIB) \
+	$(TAO_STRATEGIES_LIB) \
 	$(TAO_PORTABLESERVER_LIB)
 
 IDLFILES = \
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.dsp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.dsp
index 03d903b4ca9..07325f283f4 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.dsp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.dsp
@@ -1,4 +1,4 @@
-# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="MT_Client_Protocol_Priority Client" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

@@ -7,19 +7,19 @@
 CFG=MT_Client_Protocol_Priority Client - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "client.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 "client.mak" CFG="MT_Client_Protocol_Priority Client - Win32 Debug"

-!MESSAGE

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

+!MESSAGE 

 !MESSAGE "MT_Client_Protocol_Priority Client - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "MT_Client_Protocol_Priority Client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

@@ -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 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 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+# ADD LINK32 TAO_Strategies.lib ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\Strategies..\..\..\tao" /libpath:"..\..\..\..\ace"

 

 !ELSEIF  "$(CFG)" == "MT_Client_Protocol_Priority Client - Win32 Debug"

 

@@ -76,9 +76,9 @@ 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 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 TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+# ADD LINK32 TAO_Strategiesd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\Strategies..\..\..\tao" /libpath:"..\..\..\..\ace"

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

@@ -121,7 +121,7 @@ SOURCE=.\test.idl
 

 !IF  "$(CFG)" == "MT_Client_Protocol_Priority Client - Win32 Release"

 

-USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe"

+USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build

 InputPath=.\test.idl

 InputName=test

@@ -160,7 +160,7 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "MT_Client_Protocol_Priority Client - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"

+USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL on $(InputName)

 InputPath=.\test.idl

 InputName=test

@@ -196,7 +196,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # End Group

diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.bor b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.bor
index 023f53abcbb..63ed40700cb 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.bor
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.bor
@@ -14,11 +14,13 @@ OBJFILES = \
 CFLAGS = \
 	$(ACE_CFLAGS) \
 	$(TAO_CFLAGS) \
+	$(TAO_STRATEGIES_CFLAGS) \
 	$(TAO_PORTABLESERVER_CFLAGS)
 
 LIBFILES = \
 	$(ACE_LIB) \
 	$(TAO_LIB) \
+	$(TAO_STRATEGIES_LIB) \
 	$(TAO_PORTABLESERVER_LIB)
 
 IDLFILES = \
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.dsp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.dsp
index 83bd4e8dd58..6c1e630d03e 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.dsp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.dsp
@@ -7,19 +7,19 @@
 CFG=MT_Client_Protocol_Priority Server - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

-!MESSAGE

+!MESSAGE 

 !MESSAGE NMAKE /f "server.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 "server.mak" CFG="MT_Client_Protocol_Priority Server - Win32 Debug"

-!MESSAGE

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

+!MESSAGE 

 !MESSAGE "MT_Client_Protocol_Priority Server - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "MT_Client_Protocol_Priority Server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

@@ -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 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 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+# ADD LINK32 TAO_PortableServer.lib TAO_Strategies.lib ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\Strategies..\..\..\tao" /libpath:"..\..\..\..\ace"

 

 !ELSEIF  "$(CFG)" == "MT_Client_Protocol_Priority Server - Win32 Debug"

 

@@ -76,9 +76,9 @@ 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 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 TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+# ADD LINK32 TAO_PortableServerd.lib TAO_Strategiesd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\Strategies..\..\..\tao" /libpath:"..\..\..\..\ace"

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

@@ -133,7 +133,7 @@ SOURCE=.\test.idl
 

 !IF  "$(CFG)" == "MT_Client_Protocol_Priority Server - Win32 Release"

 

-USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe"

+USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build

 InputPath=.\test.idl

 InputName=test

@@ -172,7 +172,7 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "MT_Client_Protocol_Priority Server - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"

+USERDEP__TEST_="..\..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL on $(InputName)

 InputPath=.\test.idl

 InputName=test

@@ -208,7 +208,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ENDIF

+!ENDIF 

 

 # End Source File

 # End Group