ChangeLogTag:Fri May 17 11:30:05 2002 Nanbor Wang <nanbor@cs.wustl.edu>

3 files changed, 147 insertions, 26 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 52ceecb558f..7e10b5e3caf 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,10 +1,15 @@
+Fri May 17 11:30:05 2002  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* TAO/tests/ORT/client.dsp:
+	* TAO/tests/ORT/server.dsp: Fixed and forced custom IDL build rules.
+
 Thu May 16 16:39:01 2002  Priyanka Gontla  <pgontla@ece.uci.edu>
 
-	* TAo/tests/TAO_tests.dsw
-	* TAO/tests/ORT/client.dsp
-	* TAO/tests/ORT/server.dsp
+	* TAo/tests/TAO_tests.dsw:
+	* TAO/tests/ORT/client.dsp:
+	* TAO/tests/ORT/server.dsp:
 	  Created new dsp files and inserted them in the TAO_tests workspace.
- 
+
 Thu May 16 15:29:33 2002  Ossama Othman  <ossama@uci.edu>
 
 	* orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp (open):
@@ -34,13 +39,13 @@ Thu May 16 15:29:33 2002  Ossama Othman  <ossama@uci.edu>
 
 Wed May 15 17:38:06 2002  Priyanka Gontla  <pgontla@ece.uci.edu>
 
-	* docs/tutorials/Quoter/On_Demand_Activation/Makefile: 
+	* docs/tutorials/Quoter/On_Demand_Activation/Makefile:
 	  Shouldnt compile when AMI is disabled. Put in the fix. This will
 	  fix the errors in RedHat_7.1_No_AMI_(beguine)
 
 Wed May 15 16:04:37 2002  Priyanka Gontla  <pgontla@ece.uci.edu>
 
-	* tests/File_IO/run_test.pl: 
+	* tests/File_IO/run_test.pl:
 	  Increased the wait time for the ior file. It was raising an
 	  exception because of insufficient time.
 
@@ -79,12 +84,12 @@ Wed May 15 15:20:15 2002  Jeff Parsons <parsons@cs.wustl.edu>
 
           Added a missing release from an ACE_Auto_Basic_Array_Ptr,
           which was causing the value of the constant to be trashed
-          before it was returned. Thanks to Craig Rodrigues 
+          before it was returned. Thanks to Craig Rodrigues
           <crodrigu@bbn.com> for reporting the bug.
 
 Wed May 15 11:26:15 2002  Priyanka Gontla  <pgontla@ece.uci.edu>
 
-	* orbsvcs/tests/Security/Big_Request/Makefile: 
+	* orbsvcs/tests/Security/Big_Request/Makefile:
 	  Updated dependencies.
 
 Wed May 15 16:39:36 UTC 2002  Craig Rodrigues  <crodrigu@bbn.com>
@@ -145,10 +150,10 @@ Thu May  9 14:26:52 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 	* TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp:
 	  A pretty ugly for bug mentioned in bug id 1204. The change sets
 	  a pointer to null after deletion. This would mask the actual
-	  problem. The bug report should remind us of the problem anyway. 
+	  problem. The bug report should remind us of the problem anyway.
 
 	  This should fix the LongUpcall test failure in our daily
-	  builds. 
+	  builds.
 
 Thu May  9 11:38:16 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
@@ -159,31 +164,31 @@ Thu May  9 11:38:16 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 	connector object. The reactor is usually the one created by the
 	thread that created the maion thread and all hell breaks
 	loose. This showed up only in the Collocation tests and thanks to
-	Irfan for helping me understand what the Collocation test does. 
+	Irfan for helping me understand what the Collocation test does.
 
 	* tao/ORB_Core.cpp:
 	* tao/ORB_Core.h:
 	* tao/ORB_Core.i: Removed the pointer to the connector registry
-	  maintained by the ORB_Core. 
+	  maintained by the ORB_Core.
 
 	  The accessor method to the connector registry now takes in an
 	  ACE_ENV_ARG_DECL to propagate exceptions, since the connector
-	  registry is created on demand. 
+	  registry is created on demand.
 
 	  Removed the code that initialized the connector_registry in
-	  ORB_Core::init (), since it has to be created on demand. 
+	  ORB_Core::init (), since it has to be created on demand.
 
 	  The accessor to the connector registry gets the information from
-	  the lane resources. 
-	
+	  the lane resources.
+
 	* tao/CORBALOC_Parser.cpp:
 	* tao/Invocation.cpp:
 	* tao/ORB.cpp:
 	* tao/Object.cpp: All accesses to the connector registry passes
 	  the environment object and performs exception checking after the
-	  call. 
-	  
-	* tao/Thread_Lane_Resources.cpp: 
+	  call.
+
+	* tao/Thread_Lane_Resources.cpp:
 	* tao/Thread_Lane_Resources.h: Creates, manages and allows access
 	  to the connector registry object.
 
@@ -192,8 +197,8 @@ Thu May  9 11:38:16 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 
 	  The above checkins should fix collocation test problems in our
-	  builds.  
-	
+	  builds.
+
 Thu May  9 08:16:11 2002  Chad Elliott  <elliott_c@ociweb.com>
 
         * orbsvcs/tests/Simple_Naming/run_test.pl:
@@ -235,7 +240,7 @@ Tue May 07 15:37:38 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 	  getting introduced when multiple threads went in to the
 	  reactor. Added a command line option for the number of threads
 	  to be spawned.
-	
+
 	* tests/No_Server_MT_Connect_Test/run_test.pl: Use a single thread
 	  for the test with reactive connect strategy. Thanks to Ru for
 	  pointing out the problem on some platforms.
diff --git a/TAO/tests/ORT/client.dsp b/TAO/tests/ORT/client.dsp
index 523196580a7..ae822c47d02 100644
--- a/TAO/tests/ORT/client.dsp
+++ b/TAO/tests/ORT/client.dsp
@@ -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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 TAO_IORTable.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Release/client.exe" /libpath:"..\..\tao\IORTable" /libpath:"..\..\tao\Portableclient" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

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

 

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

 

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

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

 

 !ENDIF 

 

@@ -90,6 +90,85 @@ LINK32=link.exe
 # Begin Source File

 

 SOURCE=.\ORT_test.idl

+

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

+

+# PROP Ignore_Default_Tool 1

+# Begin Custom Build

+InputPath=.\ORT_test.idl

+InputName=ORT_test

+

+BuildCmds= \

+	..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

+"$(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)" == "ORT client - Win32 Debug"

+

+# PROP Ignore_Default_Tool 1

+# Begin Custom Build

+InputPath=.\ORT_test.idl

+InputName=ORT_test

+

+BuildCmds= \

+	..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

+"$(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 

+

 # End Source File

 # End Group

 # Begin Group "Inline Files"

diff --git a/TAO/tests/ORT/server.dsp b/TAO/tests/ORT/server.dsp
index e21963cadc5..f1104aa0de7 100644
--- a/TAO/tests/ORT/server.dsp
+++ b/TAO/tests/ORT/server.dsp
@@ -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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 TAO_IORTable.lib TAO_PortableServer.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /out:"Release/server.exe" /libpath:"..\..\tao\IORTable" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

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

 

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

 

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

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

 

 !ENDIF 

 

@@ -93,8 +93,45 @@ SOURCE=.\ORT_test.idl
 

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

 

+# PROP Ignore_Default_Tool 1

+# Begin Custom Build

+InputPath=.\ORT_test.idl

+InputName=ORT_test

+

+BuildCmds= \

+	..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

+"$(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)" == "ORT Server - Win32 Debug"

 

+# PROP Ignore_Default_Tool 1

 # Begin Custom Build

 InputPath=.\ORT_test.idl

 InputName=ORT_test