ChangeLogTag:Fri Mar 24 15:40:25 2000 Darrell Brunsch <brunsch@uci.edu>

6 files changed, 165 insertions, 26 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 757f589be7e..90deb717591 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,23 @@
+Fri Mar 24 15:40:25 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * orbsvcs/orbsvcs/CosNaming.dsp:
+
+          Changed the release version of the IDL custom build to use 
+          "Naming\naming_export.h" instead of just "naming_export.h"
+
+        * examples/mfc/StdAfx.h:
+        * examples/mfc/server.cpp:
+        * examples/mfc/client.dsp:
+        * examples/mfc/server.dsp:
+
+          As was pointed out by David Dunn <dunn@tripos.com>, the release
+          version wasn't compiling since the headers were not in the proper 
+          order.  Moved the ACE/TAO headers to the beginning of StdAfx.
+          While I was there, I fixed up the dsp files to be more consistent
+          with the rest of our project files.
+
+          [Bug 512]
+
 Fri Mar 24 10:21:27 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 
 	* TAO_IDL/ast/ast_expression.cpp:
diff --git a/TAO/examples/mfc/StdAfx.h b/TAO/examples/mfc/StdAfx.h
index 45c41156805..ed233ec0e17 100644
--- a/TAO/examples/mfc/StdAfx.h
+++ b/TAO/examples/mfc/StdAfx.h
@@ -12,6 +12,9 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
+#include "tao\corba.h"
+#include "ace\Thread_Manager.h"
+
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
 
 #include <afxwin.h>         // MFC core and standard components
diff --git a/TAO/examples/mfc/client.dsp b/TAO/examples/mfc/client.dsp
index 567e1489cba..f9fed8bd969 100644
--- a/TAO/examples/mfc/client.dsp
+++ b/TAO/examples/mfc/client.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /W3 /GX /O2 /D "_CONSOLE" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D ACE_HAS_DLL=1 /D ACE_HAS_MFC=1 /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /I "../../orbsvcs" /D "_CONSOLE" /D "WIN32" /D "NDEBUG" /D "ACE_HAS_MFC" /YX /FD /c

 # ADD BASE RSC /l 0x407 /d "NDEBUG"

 # ADD RSC /l 0x407 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -50,7 +50,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 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ace.lib TAO.lib TAO_CosNaming.lib /nologo /subsystem:console /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 acemfc.lib TAOmfc.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../orbsvcs/orbsvcs"

 

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

 

@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_TAO" /D ACE_HAS_DLL=1 /D ACE_HAS_MFC=1 /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /I "../../orbsvcs" /D "_CONSOLE" /D "_TAO" /D "WIN32" /D "_DEBUG" /D "ACE_HAS_MFC" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x407 /d "_DEBUG"

 # ADD RSC /l 0x407 /d "_DEBUG"

@@ -75,7 +75,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 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 acemfcd.lib TAOmfcd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 acemfcd.lib TAOmfcd.lib TAO_CosNamingd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../orbsvcs/orbsvcs"

 

 !ENDIF 

 

@@ -109,6 +109,86 @@ SOURCE=.\w32_testC.h
 # Begin Source File

 

 SOURCE=.\w32_test.idl

+

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

+

+# PROP Ignore_Default_Tool 1

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

+# Begin Custom Build - Compiling $(InputPath)

+InputPath=.\w32_test.idl

+InputName=w32_test

+

+BuildCmds= \

+	..\..\..\bin\Release\tao_idl $(InputName).idl

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+# End Custom Build

+

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

+

+# PROP Ignore_Default_Tool 1

+# Begin Custom Build - Compiling $(InputPath)

+InputPath=.\w32_test.idl

+InputName=w32_test

+

+BuildCmds= \

+	..\..\..\bin\tao_idl $(InputName).idl

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+# End Custom Build

+

+!ENDIF 

+

 # End Source File

 # End Group

 # End Target

diff --git a/TAO/examples/mfc/server.cpp b/TAO/examples/mfc/server.cpp
index 1d54d26234c..84e257e8d0d 100644
--- a/TAO/examples/mfc/server.cpp
+++ b/TAO/examples/mfc/server.cpp
@@ -2,16 +2,13 @@
 
 // server.cpp : Defines the class behaviors for the application.
 
+#include "stdafx.h"
+#include "server.h"
+
 // Demospecific includes
-#include "tao\corba.h"
 #include "w32_test_impl.h"
-#include "ace\Thread_Manager.h"
-
 // Demospecific includes end!
 
-#include "stdafx.h"
-#include "server.h"
-
 #include "MainFrm.h"
 #include "serverDoc.h"
 #include "serverView.h"
diff --git a/TAO/examples/mfc/server.dsp b/TAO/examples/mfc/server.dsp
index 1be3f614cbe..fe6eafdbc35 100644
--- a/TAO/examples/mfc/server.dsp
+++ b/TAO/examples/mfc/server.dsp
@@ -43,7 +43,8 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /D "_WINDOWS" /D "_AFXDLL" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D ACE_HAS_DLL=1 /D ACE_HAS_MFC=1 /Yu"stdafx.h" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../" /I "../../" /I "../../orbsvcs" /D "_WINDOWS" /D "_AFXDLL" /D "WIN32" /D "NDEBUG" /D "ACE_HAS_MFC" /FD /c

+# SUBTRACT CPP /YX /Yc /Yu

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x407 /d "NDEBUG" /d "_AFXDLL"

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

 LINK32=link.exe

 # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_CosNaming.lib /nologo /subsystem:windows /machine:I386

+# ADD LINK32 acemfc.lib TAOmfc.lib TAO_CosNaming.lib /nologo /subsystem:windows /machine:I386 /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../orbsvcs/orbsvcs"

 

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

 

@@ -69,7 +70,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "_WINDOWS" /D "_AFXDLL" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D ACE_HAS_DLL=1 /D ACE_HAS_MFC=1 /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../../" /I "../../" /I "../../orbsvcs" /D "_WINDOWS" /D "_AFXDLL" /D "WIN32" /D "_DEBUG" /D "ACE_HAS_MFC" /FD /c

 # SUBTRACT CPP /YX /Yc /Yu

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

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

 LINK32=link.exe

 # ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 acemfcd.lib TAOmfcd.lib TAO_CosNamingd.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 acemfcd.lib TAOmfcd.lib TAO_CosNamingd.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"../../../ace" /libpath:"../../tao" /libpath:"../../orbsvcs/orbsvcs"

 

 !ENDIF 

 

@@ -194,41 +195,79 @@ SOURCE=.\w32_test.idl
 

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

 

+# PROP Ignore_Default_Tool 1

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

+# Begin Custom Build - Compiling $(InputPath)

+InputPath=.\w32_test.idl

+InputName=w32_test

+

+BuildCmds= \

+	..\..\..\bin\Release\tao_idl $(InputName).idl

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+

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

+   $(BuildCmds)

+# End Custom Build

+

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

 

 # PROP Ignore_Default_Tool 1

-# Begin Custom Build - Invoking TAO-IDL-Compiler

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

+# Begin Custom Build - Compiling $(InputPath)

 InputPath=.\w32_test.idl

 InputName=w32_test

 

 BuildCmds= \

-	tao_idl $(InputName).idl

+	..\..\..\bin\tao_idl $(InputName).idl

 

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

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

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 

-"tao_idl $(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

    $(BuildCmds)

 

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

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

    $(BuildCmds)

 

-"tao_idl $(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

    $(BuildCmds)

 

-"tao_idl $(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

    $(BuildCmds)

 

-"tao_idl $(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

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

    $(BuildCmds)

 # End Custom Build

 

diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.dsp b/TAO/orbsvcs/orbsvcs/CosNaming.dsp
index 23ba7fe3ac2..e279ec523c8 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming.dsp
+++ b/TAO/orbsvcs/orbsvcs/CosNaming.dsp
@@ -196,7 +196,7 @@ InputPath=.\CosNaming.idl
 InputName=CosNaming

 

 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_Naming_Export -Wb,export_include=naming_export.h $(InputName).idl

+	..\..\..\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_Naming_Export -Wb,export_include=Naming\naming_export.h $(InputName).idl

 

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

    $(BuildCmds)