Update workspace and project files to reflect the change in directory structure.

3 files changed, 22 insertions, 18 deletions

diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/MT_Cubit.dsw b/TAO/tests/Cubit/TAO/MT_Cubit/MT_Cubit.dsw
index 16b01618b33..f6006d20cb7 100644
--- a/TAO/tests/Cubit/TAO/MT_Cubit/MT_Cubit.dsw
+++ b/TAO/tests/Cubit/TAO/MT_Cubit/MT_Cubit.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 5.00
 

 ###############################################################################

 

-Project: "client"=.\client\client.dsp - Package Owner=<4>

+Project: "client"=.\client.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -15,7 +15,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "server"=.\server\server.dsp - Package Owner=<4>

+Project: "server"=.\server.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/client.dsp b/TAO/tests/Cubit/TAO/MT_Cubit/client.dsp
index b0cbc35cb00..714a94f3589 100644
--- a/TAO/tests/Cubit/TAO/MT_Cubit/client.dsp
+++ b/TAO/tests/Cubit/TAO/MT_Cubit/client.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\..\\" /I "..\..\..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "PRIORITY_INV_TEST" /YX /FD /c

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

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

 BSC32=bscmake.exe

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

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

 

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

 

@@ -65,7 +65,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\\" /I "..\..\..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PRIORITY_INV_TEST" /YX /FD /c

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

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

 BSC32=bscmake.exe

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

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

 

 !ENDIF 

 

@@ -91,12 +91,12 @@ SOURCE=.\cubit.idl
 

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

 

-# Begin Custom Build - Compiling IDL files...

+# Begin Custom Build

 InputPath=.\cubit.idl

 InputName=cubit

 

 BuildCmds= \

-	..\..\..\..\..\tao_idl\tao_idl $(InputName).idl

+	..\..\..\..\tao_idl\tao_idl $(InputName).idl

 

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

    $(BuildCmds)

@@ -119,12 +119,12 @@ BuildCmds= \
 

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

 

-# Begin Custom Build - Compiling IDL files...

+# Begin Custom Build

 InputPath=.\cubit.idl

 InputName=cubit

 

 BuildCmds= \

-	..\..\..\..\..\tao_idl\tao_idl $(InputName).idl

+	..\..\..\..\tao_idl\tao_idl $(InputName).idl

 

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

    $(BuildCmds)

@@ -156,5 +156,9 @@ SOURCE=.\cubitC.cpp
 

 SOURCE=.\Task_Client.cpp

 # End Source File

+# Begin Source File

+

+SOURCE=.\Util_Thread.cpp

+# End Source File

 # End Target

 # End Project

diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/server.dsp b/TAO/tests/Cubit/TAO/MT_Cubit/server.dsp
index 4431f4561f4..880e7cb14f9 100644
--- a/TAO/tests/Cubit/TAO/MT_Cubit/server.dsp
+++ b/TAO/tests/Cubit/TAO/MT_Cubit/server.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\..\\" /I "..\..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "PRIORITY_INV_TEST" /YX /FD /c

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

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

 BSC32=bscmake.exe

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

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

 

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

 

@@ -65,7 +65,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\\" /I "..\..\..\..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PRIORITY_INV_TEST" /YX /FD /c

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

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

 BSC32=bscmake.exe

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

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

 

 !ENDIF 

 

@@ -87,12 +87,12 @@ SOURCE=.\cubit.idl
 

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

 

-# Begin Custom Build - Compiling IDL files...

+# Begin Custom Build

 InputPath=.\cubit.idl

 InputName=cubit

 

 BuildCmds= \

-	..\..\..\..\..\tao_idl\tao_idl $(InputName).idl

+	..\..\..\..\tao_idl\tao_idl $(InputName).idl

 

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

    $(BuildCmds)

@@ -115,12 +115,12 @@ BuildCmds= \
 

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

 

-# Begin Custom Build - Compiling IDL files...

+# Begin Custom Build

 InputPath=.\cubit.idl

 InputName=cubit

 

 BuildCmds= \

-	..\..\..\..\..\tao_idl\tao_idl $(InputName).idl

+	..\..\..\..\tao_idl\tao_idl $(InputName).idl

 

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

    $(BuildCmds)