Mon May 31 20:34:26 1999 Irfan Pyarali <irfan@cs.wustl.edu>

4 files changed, 58 insertions, 45 deletions

diff --git a/TAO/tests/InterOp-Naming/InterOp-Naming.dsw b/TAO/tests/InterOp-Naming/InterOp-Naming.dsw
index 6c423feb435..d0901e821f1 100644
--- a/TAO/tests/InterOp-Naming/InterOp-Naming.dsw
+++ b/TAO/tests/InterOp-Naming/InterOp-Naming.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

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

 

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

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

 

 Package=<5>

 {{{

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

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

 

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

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

 

 Package=<5>

 {{{

diff --git a/TAO/tests/InterOp-Naming/INS_client.dsp b/TAO/tests/InterOp-Naming/client.dsp
index f738dc77f63..87792b7b796 100644
--- a/TAO/tests/InterOp-Naming/INS_client.dsp
+++ b/TAO/tests/InterOp-Naming/client.dsp
@@ -1,35 +1,34 @@
-# Microsoft Developer Studio Project File - Name="INS_client" - Package Owner=<4>

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

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=INS_client - Win32 Debug

+CFG=InterOp Naming 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 NMAKE /f "INS_client.mak".

-!MESSAGE 

+!MESSAGE

+!MESSAGE NMAKE /f "client.mak".

+!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 "INS_client.mak" CFG="INS_client - Win32 Debug"

-!MESSAGE 

+!MESSAGE

+!MESSAGE NMAKE /f "client.mak" CFG="InterOp Naming Client - Win32 Debug"

+!MESSAGE

 !MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "INS_client - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "INS_client - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE 

+!MESSAGE

+!MESSAGE "InterOp Naming Client - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "InterOp Naming Client - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

 RSC=rc.exe

 

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

+!IF  "$(CFG)" == "InterOp Naming Client - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

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

 

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

+!ELSEIF  "$(CFG)" == "InterOp Naming Client - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

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

 

-!ENDIF 

+!ENDIF

 

 # Begin Target

 

-# Name "INS_client - Win32 Release"

-# Name "INS_client - Win32 Debug"

+# Name "InterOp Naming Client - Win32 Release"

+# Name "InterOp Naming Client - Win32 Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter ".cpp"

@@ -130,8 +129,9 @@ SOURCE=.\INSS.i
 

 SOURCE=.\INS.idl

 

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

+!IF  "$(CFG)" == "InterOp Naming Client - Win32 Release"

 

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

 # Begin Custom Build - Invoking TAO idl compiler on INS.idl

 InputPath=.\INS.idl

 InputName=INS

@@ -167,8 +167,9 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

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

+!ELSEIF  "$(CFG)" == "InterOp Naming Client - Win32 Debug"

 

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

 # Begin Custom Build - Invoking TAO idl compiler on INS.idl

 InputPath=.\INS.idl

 InputName=INS

@@ -204,7 +205,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ENDIF 

+!ENDIF

 

 # End Source File

 # End Group

diff --git a/TAO/tests/InterOp-Naming/INS_server.dsp b/TAO/tests/InterOp-Naming/server.dsp
index 97b60bcdaf2..9758d732199 100644
--- a/TAO/tests/InterOp-Naming/INS_server.dsp
+++ b/TAO/tests/InterOp-Naming/server.dsp
@@ -1,27 +1,27 @@
-# Microsoft Developer Studio Project File - Name="INS_server" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="InterOp Naming Server" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=INS_server - Win32 Debug

+CFG=InterOp Naming 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 NMAKE /f "INS_server.mak".

-!MESSAGE 

+!MESSAGE

+!MESSAGE NMAKE /f "server.mak".

+!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 "INS_server.mak" CFG="INS_server - Win32 Debug"

-!MESSAGE 

+!MESSAGE

+!MESSAGE NMAKE /f "server.mak" CFG="InterOp Naming Server - Win32 Debug"

+!MESSAGE

 !MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "INS_server - Win32 Release" (based on\

+!MESSAGE

+!MESSAGE "InterOp Naming Server - Win32 Release" (based on\

  "Win32 (x86) Console Application")

-!MESSAGE "INS_server - Win32 Debug" (based on\

+!MESSAGE "InterOp Naming Server - Win32 Debug" (based on\

  "Win32 (x86) Console Application")

-!MESSAGE 

+!MESSAGE

 

 # Begin Project

 # PROP Scc_ProjName ""

@@ -29,7 +29,7 @@ CFG=INS_server - Win32 Debug
 CPP=cl.exe

 RSC=rc.exe

 

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

+!IF  "$(CFG)" == "InterOp Naming Server - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

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

 

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

+!ELSEIF  "$(CFG)" == "InterOp Naming Server - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

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

 

-!ENDIF 

+!ENDIF

 

 # Begin Target

 

-# Name "INS_server - Win32 Release"

-# Name "INS_server - Win32 Debug"

+# Name "InterOp Naming Server - Win32 Release"

+# Name "InterOp Naming Server - Win32 Debug"

 # Begin Group "IDL Files"

 

 # PROP Default_Filter ".idl"

@@ -90,7 +90,7 @@ LINK32=link.exe
 

 SOURCE=.\INS.idl

 

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

+!IF  "$(CFG)" == "InterOp Naming Server - Win32 Release"

 

 # Begin Custom Build - Invoking TAO idl compiler on INS.idl

 InputPath=.\INS.idl

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

 # End Custom Build

 

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

+!ELSEIF  "$(CFG)" == "InterOp Naming Server - Win32 Debug"

 

 # Begin Custom Build - Invoking TAO idl compiler on INS.idl

 InputPath=.\INS.idl

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

 # End Custom Build

 

-!ENDIF 

+!ENDIF

 

 # End Source File

 # End Group

diff --git a/TAO/tests/TAO_Tests.dsw b/TAO/tests/TAO_Tests.dsw
index 0ac87a0b814..faa6f49945f 100644
--- a/TAO/tests/TAO_Tests.dsw
+++ b/TAO/tests/TAO_Tests.dsw
@@ -51,7 +51,19 @@ Package=<4>
 

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

 

-Project: "InterOperable Naming Service"=".\InterOp-Naming\InterOp_test.dsp" - Package Owner=<4>

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

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

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

 

 Package=<5>

 {{{