ChangeLogTag: Sat Dec 7 09:44:33 2002 Jeff Parsons <j.parsons@vanderbilt.edu>

4 files changed, 187 insertions, 4 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 7c71e4f9626..eafe065e2af 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Sat Dec  7 09:44:33 2002  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/CosTime.dsp:
+        * orbsvcs/orbsvcs/CosTrading.dsp:
+        * orbsvcs/orbsvcs/DsLogAdmin.dsp:
+        * orbsvcs/orbsvcs/Fault_Tolerance.dsp:
+
+	  Changes to MFC project settings for IDL compilation. Thanks to
+	  John Morey <jmorey@mmintl.com for reporting the bugs.
+
 Sat Dec  7 11:59:06 UTC 2002  Don Hinton  <dhinton@ieee.org>
 
 	* orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp:  Removed close
diff --git a/TAO/orbsvcs/orbsvcs/CosTime.dsp b/TAO/orbsvcs/orbsvcs/CosTime.dsp
index 1b57f4f3362..9137678b3bd 100644
--- a/TAO/orbsvcs/orbsvcs/CosTime.dsp
+++ b/TAO/orbsvcs/orbsvcs/CosTime.dsp
@@ -315,11 +315,29 @@ BuildCmds= \
 

 # PROP BASE Ignore_Default_Tool 1

 # PROP Ignore_Default_Tool 1

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

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

+InputPath=.\TimeService.idl

+InputName=TimeService

+

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

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao  -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Time_Export -Wb,export_include=Time\time_export.h $(InputName).idl

+

+# End Custom Build

 

 !ELSEIF  "$(CFG)" == "CosTime - Win32 MFC Release"

 

 # PROP BASE Ignore_Default_Tool 1

 # PROP Ignore_Default_Tool 1

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

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

+InputPath=.\TimeService.idl

+InputName=TimeService

+

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

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../../ -I../../tao  -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Time_Export -Wb,export_include=Time\time_export.h $(InputName).idl

+

+# End Custom Build

 

 !ENDIF 

 

diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.dsp b/TAO/orbsvcs/orbsvcs/DsLogAdmin.dsp
index 69ab616ea20..ad43533c55b 100644
--- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.dsp
+++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.dsp
@@ -56,7 +56,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 /dll /machine:I386

-# ADD LINK32 TAO_ETCL.lib TAO_DynamicAny.lib TAO_Svc_Utils.lib ace.lib TAO.lib TAO_PortableServer.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_DsLogAdmin.dll" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:".\ETCL" /libpath:"..\..\tao\DynamicAny"

+# ADD LINK32 TAO_ETCL.lib TAO_Svc_Utils.lib ace.lib TAO.lib TAO_PortableServer.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_DsLogAdmin.dll" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"ETCL"

 # SUBTRACT LINK32 /pdb:none

 

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

@@ -83,7 +83,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 /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 TAO_ETCLd.lib TAO_DynamicAnyd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_DsLogAdmind.dll" /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\tao\DynamicAny" /libpath:"..\..\..\ace" /libpath:".\ETCL"

+# ADD LINK32 TAO_ETCLd.lib TAO_DynamicAnyd.lib TAO_Svc_Utilsd.lib TAO_PortableServerd.lib TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_DsLogAdmind.dll" /pdbtype:sept /libpath:"..\..\tao\DynamicAny" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:".\ETCL"

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "DsLogAdmin - Win32 MFC Debug"

@@ -114,7 +114,7 @@ BSC32=bscmake.exe
 LINK32=link.exe

 # ADD BASE LINK32 TAOd.lib aced.lib TAO_CosTradingd.lib TAO_Svc_Utilsd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_DsLogAdmind.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 # SUBTRACT BASE LINK32 /profile

-# ADD LINK32 TAOmfcd.lib acemfcd.lib TAO_CosTradingmfcd.lib TAO_Svc_Utilsmfcd.lib TAO_PortableServermfcd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_DsLogAdminmfcd.dll" /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:".\ETCL"

+# ADD LINK32 TAOmfcd.lib acemfcd.lib TAO_CosTradingmfcd.lib TAO_Svc_Utilsmfcd.lib TAO_PortableServermfcd.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_DsLogAdminmfcd.dll" /pdbtype:sept /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 # SUBTRACT LINK32 /profile

 

 !ELSEIF  "$(CFG)" == "DsLogAdmin - Win32 MFC Release"

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

 LINK32=link.exe

 # ADD BASE LINK32 ace.lib TAO.lib TAO_CosTrading.lib TAO_Svc_Utils.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_DsLogAdmin.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

-# ADD LINK32 acemfc.lib TAOmfc.lib TAO_CosTradingmfc.lib TAO_Svc_Utilsmfc.lib TAO_PortableServermfc.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_DsLogAdminmfc.dll" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:".\ETCL"

+# ADD LINK32 acemfc.lib TAOmfc.lib TAO_CosTradingmfc.lib TAO_Svc_Utilsmfc.lib TAO_PortableServermfc.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_DsLogAdminmfc.dll" /libpath:"..\..\tao\PortableServer" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

 !ENDIF 

 

@@ -367,11 +367,81 @@ BuildCmds= \
 

 # PROP BASE Ignore_Default_Tool 1

 # PROP Ignore_Default_Tool 1

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

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

+InputPath=.\DsLogAdmin.idl

+InputName=DsLogAdmin

+

+BuildCmds= \

+	..\..\..\bin\tao_idl -Ge 1 -I../..  -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Log_Export -Wb,export_include=Log\log_export.h $(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)" == "DsLogAdmin - Win32 MFC Release"

 

 # PROP BASE Ignore_Default_Tool 1

 # PROP Ignore_Default_Tool 1

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

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

+InputPath=.\DsLogAdmin.idl

+InputName=DsLogAdmin

+

+BuildCmds= \

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../..  -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Log_Export -Wb,export_include=Log\log_export.h $(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 

 

@@ -383,6 +453,7 @@ SOURCE=.\DsLogNotification.idl
 !IF  "$(CFG)" == "DsLogAdmin - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

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

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

 InputPath=.\DsLogNotification.idl

 InputName=DsLogNotification

@@ -421,6 +492,7 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "DsLogAdmin - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

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

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

 InputPath=.\DsLogNotification.idl

 InputName=DsLogNotification

@@ -458,8 +530,82 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "DsLogAdmin - Win32 MFC Debug"

 

+# PROP Ignore_Default_Tool 1

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

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

+InputPath=.\DsLogNotification.idl

+InputName=DsLogNotification

+

+BuildCmds= \

+	..\..\..\bin\tao_idl -Ge 1 -I../..  -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Log_Export -Wb,export_include=Log\log_export.h $(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)" == "DsLogAdmin - Win32 MFC Release"

 

+# PROP Ignore_Default_Tool 1

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

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

+InputPath=.\DsLogNotification.idl

+InputName=DsLogNotification

+

+BuildCmds= \

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../..  -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_Log_Export -Wb,export_include=Log\log_export.h $(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

diff --git a/TAO/orbsvcs/orbsvcs/Fault_Tolerance.dsp b/TAO/orbsvcs/orbsvcs/Fault_Tolerance.dsp
index 37955dc8f1d..3804c21dfcf 100644
--- a/TAO/orbsvcs/orbsvcs/Fault_Tolerance.dsp
+++ b/TAO/orbsvcs/orbsvcs/Fault_Tolerance.dsp
@@ -317,6 +317,15 @@ BuildCmds= \
 

 # PROP BASE Ignore_Default_Tool 1

 # PROP Ignore_Default_Tool 1

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

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

+InputPath=.\FT_CORBA.idl

+InputName=FT_CORBA

+

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

+	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao -I../ -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_FT_Export -Wb,export_include=FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(InputName).idl

+

+# End Custom Build

 

 !ENDIF