ChangeLogTag:Wed Oct 9 13:25:31 2002 Ossama Othman <ossama@uci.edu>

5 files changed, 169 insertions, 4 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index f10d2a3da58..323c9f1c5ae 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,15 @@
+Wed Oct  9 13:25:31 2002  Ossama Othman  <ossama@uci.edu>
+
+	* orbsvcs/orbsvcs/DsEventLogAdmin.dsp:
+	* orbsvcs/orbsvcs/DsLogAdmin.dsp:
+	* orbsvcs/orbsvcs/DsNotifyLogAdmin.dsp:
+	* orbsvcs/orbsvcs/RTEventLog.dsp:
+
+	  Fixed custom build step for the "DLL Release" configuration.
+	  Previously, the Microsoft IDL compiler "midl" was invoked by
+	  default, which is obviously incorrect.  TAO's IDL compiler is
+	  now invoked.
+
 Wed Oct  9 09:56:40 2002  Ossama Othman  <ossama@uci.edu>
 
 	* orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h:
diff --git a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.dsp b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.dsp
index 0a9be9ef352..d3353325465 100644
--- a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.dsp
+++ b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.dsp
@@ -157,6 +157,42 @@ SOURCE=.\DsEventLogAdmin.idl
 

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

 

+# PROP Ignore_Default_Tool 1

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

+InputPath=.\DsEventLogAdmin.idl

+InputName=DsEventLogAdmin

+

+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

+

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

 

 # PROP Intermediate_Dir "DLL\Debug\DsEventLogAdmin"

diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.dsp b/TAO/orbsvcs/orbsvcs/DsLogAdmin.dsp
index 2dd3dac9beb..0c4e390bd51 100644
--- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.dsp
+++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.dsp
@@ -293,7 +293,7 @@ InputPath=.\DsLogAdmin.idl
 InputName=DsLogAdmin

 

 BuildCmds= \

-	..\..\..\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_Log_Export -Wb,export_include=Log\log_export.h $(InputName).idl

+	..\..\..\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)

@@ -332,7 +332,7 @@ InputPath=.\DsLogAdmin.idl
 InputName=DsLogAdmin

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao  -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

+	..\..\..\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)

@@ -381,6 +381,42 @@ SOURCE=.\DsLogNotification.idl
 

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

 

+# PROP Ignore_Default_Tool 1

+# 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

+

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

 

 # PROP Ignore_Default_Tool 1

@@ -389,7 +425,7 @@ InputPath=.\DsLogNotification.idl
 InputName=DsLogNotification

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao  -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

+	..\..\..\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)

diff --git a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.dsp b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.dsp
index 9385acbe295..14bbd9f5968 100644
--- a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.dsp
+++ b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.dsp
@@ -157,6 +157,42 @@ SOURCE=.\DsNotifyLogAdmin.idl
 

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

 

+# PROP Ignore_Default_Tool 1

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

+InputPath=.\DsNotifyLogAdmin.idl

+InputName=DsNotifyLogAdmin

+

+BuildCmds= \

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../..  -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_NotifyLog_Export -Wb,export_include=Log\notifylog_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)" == "DsNotifyLogAdmin - Win32 Debug"

 

 # PROP Intermediate_Dir "DLL\Debug\DsNotifyLogAdmin"

@@ -166,7 +202,7 @@ InputPath=.\DsNotifyLogAdmin.idl
 InputName=DsNotifyLogAdmin

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -I../../ -I../../tao  -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_NotifyLog_Export -Wb,export_include=Log\notifylog_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -I../..  -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_NotifyLog_Export -Wb,export_include=Log\notifylog_export.h $(InputName).idl

 

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

    $(BuildCmds)

diff --git a/TAO/orbsvcs/orbsvcs/RTEventLog.dsp b/TAO/orbsvcs/orbsvcs/RTEventLog.dsp
index 6847252b28d..366c625ccdb 100644
--- a/TAO/orbsvcs/orbsvcs/RTEventLog.dsp
+++ b/TAO/orbsvcs/orbsvcs/RTEventLog.dsp
@@ -54,6 +54,15 @@ BSC32=bscmake.exe
 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 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

+# Begin Custom Build

+InputPath=.\Release\RTEventLog.dll

+InputName=RTEventLog

+SOURCE="$(InputPath)"

+

+"f" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	..\..\..\bin\Release\tao_idl -Ge 1 -I../..  -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -Wb,export_macro=TAO_NotifyLog_Export -Wb,export_include=Log\notifylog_export.h $(InputName).idl

+

+# End Custom Build

 

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

 

@@ -156,6 +165,42 @@ SOURCE=.\RTEventLogAdmin.idl
 

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

 

+# PROP Ignore_Default_Tool 1

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

+InputPath=.\RTEventLogAdmin.idl

+InputName=RTEventLogAdmin

+

+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

+

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

 

 # PROP Ignore_Default_Tool 1