ChangeLogTag:Fri Jul 16 14:22:01 1999 Nanbor Wang <nanbor@cs.wustl.edu>

2 files changed, 10 insertions, 11 deletions

diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.dsp b/TAO/orbsvcs/Naming_Service/Naming_Service.dsp
index f39619017ec..d2e09d421b8 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.dsp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.dsp
@@ -54,7 +54,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 orbsvcs.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 orbsvcs.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Release/Naming_Server.exe" /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

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

 

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

+# ADD LINK32 TAOd.lib orbsvcsd.lib aced.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"Naming_Server.exe" /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Naming_Service - Win32 Alpha Debug"

 

@@ -110,7 +110,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 TAOd.lib orbsvcsd.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-# ADD LINK32 TAOd.lib orbsvcsd.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 TAOd.lib orbsvcsd.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /out:"Naming_Server.exe" /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Naming_Service - Win32 Alpha Release"

 

@@ -139,7 +139,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 orbsvcs.lib TAO.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-# ADD LINK32 orbsvcs.lib TAO.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 orbsvcs.lib TAO.lib ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /machine:ALPHA /out:"Release/Naming_Server.exe" /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

 !ENDIF 

 

diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
index 34f58a4573b..41f57836989 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
@@ -18,8 +18,8 @@ require Uniqueid;
 $sleeptime = 8;
 
 # Variables for command-line arguments to client and server
-# executables. 
-$ns_multicast_port = 10000 + uniqueid ();  
+# executables.
+$ns_multicast_port = 10000 + uniqueid ();
 $ns_orb_port = 12000 + uniqueid ();
 $iorfile = "ns.ior";
 $persistent_ior_file = "pns.ior";
@@ -30,7 +30,7 @@ sub name_server
 {
   my $args = "@_ "."-ORBnameserviceport $ns_multicast_port -o $iorfile";
   my $prog = "..$DIR_SEPARATOR..$DIR_SEPARATOR".
-      "Naming_Server".$DIR_SEPARATOR.
+      "Naming_Service".$DIR_SEPARATOR.
           "Naming_Server".$EXE_EXT;
 
   unlink $iorfile;
@@ -60,9 +60,9 @@ sub client
 # Options for all simple tests recognized by the 'client' program.
 @opts = ("-s -ORBnameserviceior file://$iorfile",
          "-s -ORBnameserviceport $ns_multicast_port",
-         "-t -ORBnameserviceior file://$iorfile", 
-         "-i -ORBnameserviceior file://$iorfile", 
-         "-e -ORBnameserviceior file://$iorfile", 
+         "-t -ORBnameserviceior file://$iorfile",
+         "-i -ORBnameserviceior file://$iorfile",
+         "-e -ORBnameserviceior file://$iorfile",
          "-y -ORBnameserviceior file://$iorfile",
          "-p $persistent_ior_file -ORBnameserviceior file://$iorfile",
          "-c file://$persistent_ior_file -ORBnameserviceior file://$iorfile");
@@ -141,4 +141,3 @@ print STDERR "\n";
 
 # @@ Capture any exit status from the processes.
 exit 0;
-