ChangeLogTag: Wed Apr 30 13:29:46 2003 Simon McQueen <sm@prismtechnologies.com>

4 files changed, 8 insertions, 468 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 9056a80ab7b..e75e86a40e9 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,11 @@
+Wed Apr 30 13:29:46 2003  Simon McQueen  <sm@prismtechnologies.com>
+
+        * tests\temp\assembly\assembly.dsw:
+        * tests\temp\assembly\client.dsp:
+        * tests\temp\assembly\server.dsp:
+
+          Files removed to prevent errors in the msvc 6 builds.
+
 Tue Apr 29 16:53:17 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* README: Added XML_Helpers to the list of "tools" that need to
diff --git a/TAO/CIAO/tests/temp/assembly/assembly.dsw b/TAO/CIAO/tests/temp/assembly/assembly.dsw
deleted file mode 100644
index 2b42646ed51..00000000000
--- a/TAO/CIAO/tests/temp/assembly/assembly.dsw
+++ /dev/null
@@ -1,98 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "server EXE"=server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name PortableServer DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name tao DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL_EXE EXE

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ace DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name CIAO_Server DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name CIAO_Container DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name CIAO_Client DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL_EXE EXE

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name tao DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ace DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "client EXE"=client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name tao DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL_EXE EXE

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ace DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name CIAO_Server DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name CIAO_Container DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name CIAO_Client DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name TAO_IDL_EXE EXE

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name tao DLL

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name ace DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/CIAO/tests/temp/assembly/client.dsp b/TAO/CIAO/tests/temp/assembly/client.dsp
deleted file mode 100644
index f32a5c62178..00000000000
--- a/TAO/CIAO/tests/temp/assembly/client.dsp
+++ /dev/null
@@ -1,179 +0,0 @@
-# Microsoft Developer Studio Project File - Name="client EXE" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=client EXE - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "client.mak" CFG="client EXE - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "client EXE - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "client EXE - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

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

-

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir ""

-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\..\CIAO" /I "..\..\..\..\CIAO\ciao" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _CONSOLE=1 /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x809

-# ADD RSC /l 0x409 /i "..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\..\CIAO" /i "..\..\..\..\CIAO\ciao" /i "..\..\..\.." /i "..\..\..\..\tao" /i "..\..\..\..\.." /d NDEBUG=1

-BSC32=bscmake.exe

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 /machine:IX86

-# ADD LINK32 advapi32.lib user32.lib CIAO_Server.lib TAO_PortableServer.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib CIAO_Client.lib ACE.lib /nologo /version:1.3 /subsystem:console /machine:I386 /out:"client.exe" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\CIAO\ciao" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

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

-

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Target_Dir ""

-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /Gy /I "..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\..\CIAO" /I "..\..\..\..\CIAO\ciao" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _CONSOLE=1 /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x809

-# ADD RSC /l 0x409 /i "..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\..\CIAO" /i "..\..\..\..\CIAO\ciao" /i "..\..\..\.." /i "..\..\..\..\tao" /i "..\..\..\..\.." /d _DEBUG=1

-BSC32=bscmake.exe

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 /machine:IX86

-# ADD LINK32 advapi32.lib user32.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib CIAO_Clientd.lib ACEd.lib /nologo /version:1.3 /subsystem:console /incremental:no /debug /machine:I386 /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\CIAO\ciao" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "client EXE - Win32 Release"

-# Name "client EXE - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;cxx;c"

-# Begin Source File

-

-SOURCE=.\client.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\controlC.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hh"

-# Begin Source File

-

-SOURCE=.\controlC.h

-# End Source File

-# End Group

-# Begin Group "Inline Files"

-

-# PROP Default_Filter "i;inl"

-# Begin Source File

-

-SOURCE=.\controlC.i

-# End Source File

-# End Group

-# Begin Group "Documentation"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\README

-# End Source File

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter "idl"

-# Begin Source File

-

-SOURCE=.\control.idl

-

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

-

-# PROP Ignore_Default_Tool 1

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

-OutDir=.\Release

-InputPath=.\control.idl

-InputName=control

-

-BuildCmds= \

-	..\..\..\..\..\bin\Release\tao_idl -o $(OutDir) -I..\..\..\.. -I..\..\..\ciao -I..\..\..\.. -Ge 1 -Sc $(InputPath)

-

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

-   $(BuildCmds)

-

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

-   $(BuildCmds)

-

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

-   $(BuildCmds)

-

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

-   $(BuildCmds)

-

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

-   $(BuildCmds)

-

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

-   $(BuildCmds)

-# End Custom Build

-

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

-

-# PROP Ignore_Default_Tool 1

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

-OutDir=.

-InputPath=.\control.idl

-InputName=control

-

-BuildCmds= \

-	..\..\..\..\..\bin\tao_idl -o $(OutDir) -I..\..\..\.. -I..\..\..\ciao -I..\..\..\.. -Ge 1 -Sc $(InputPath)

-

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

-   $(BuildCmds)

-

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

-   $(BuildCmds)

-

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

-   $(BuildCmds)

-

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

-   $(BuildCmds)

-

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

-   $(BuildCmds)

-

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

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/CIAO/tests/temp/assembly/server.dsp b/TAO/CIAO/tests/temp/assembly/server.dsp
deleted file mode 100644
index 96ed305a7e0..00000000000
--- a/TAO/CIAO/tests/temp/assembly/server.dsp
+++ /dev/null
@@ -1,191 +0,0 @@
-# Microsoft Developer Studio Project File - Name="server EXE" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=server EXE - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "server.mak" CFG="server EXE - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "server EXE - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "server EXE - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

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

-

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Target_Dir ""

-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\..\CIAO" /I "..\..\..\..\CIAO\ciao" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D NDEBUG=1 /D WIN32=1 /D _CONSOLE=1 /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x809

-# ADD RSC /l 0x409 /i "..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\..\CIAO" /i "..\..\..\..\CIAO\ciao" /i "..\..\..\.." /i "..\..\..\..\tao" /i "..\..\..\..\.." /d NDEBUG=1

-BSC32=bscmake.exe

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 /machine:IX86

-# ADD LINK32 advapi32.lib user32.lib CIAO_Server.lib TAO_PortableServer.lib TAO_Security.lib CIAO_Container.lib TAO.lib TAO_IFR_Client.lib CIAO_Client.lib ACE.lib /nologo /version:1.3 /subsystem:console /machine:I386 /out:"server.exe" /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\CIAO\ciao" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

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

-

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

-# PROP Target_Dir ""

-# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /Zi /Od /Gy /I "..\..\..\..\orbsvcs\orbsvcs" /I "..\..\..\..\CIAO" /I "..\..\..\..\CIAO\ciao" /I "..\..\..\.." /I "..\..\..\..\tao" /I "..\..\..\..\.." /D _DEBUG=1 /D WIN32=1 /D _CONSOLE=1 /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x809

-# ADD RSC /l 0x409 /i "..\..\..\..\orbsvcs\orbsvcs" /i "..\..\..\..\CIAO" /i "..\..\..\..\CIAO\ciao" /i "..\..\..\.." /i "..\..\..\..\tao" /i "..\..\..\..\.." /d _DEBUG=1

-BSC32=bscmake.exe

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 /machine:IX86

-# ADD LINK32 advapi32.lib user32.lib CIAO_Serverd.lib TAO_PortableServerd.lib TAO_Securityd.lib CIAO_Containerd.lib TAOd.lib TAO_IFR_Clientd.lib CIAO_Clientd.lib ACEd.lib /nologo /version:1.3 /subsystem:console /incremental:no /debug /machine:I386 /libpath:"..\..\..\..\tao\PortableServer" /libpath:"..\..\..\..\orbsvcs\orbsvcs" /libpath:"..\..\..\..\tao\IFR_Client" /libpath:"..\..\..\..\CIAO\ciao" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "server EXE - Win32 Release"

-# Name "server EXE - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;cxx;c"

-# Begin Source File

-

-SOURCE=.\controlC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\controlS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\server.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hh"

-# Begin Source File

-

-SOURCE=.\controlC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\controlS.h

-# End Source File

-# End Group

-# Begin Group "Inline Files"

-

-# PROP Default_Filter "i;inl"

-# Begin Source File

-

-SOURCE=.\controlC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\controlS.i

-# End Source File

-# End Group

-# Begin Group "Documentation"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\README

-# End Source File

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter "idl"

-# Begin Source File

-

-SOURCE=.\control.idl

-

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

-

-# PROP Ignore_Default_Tool 1

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

-OutDir=.\Release

-InputPath=.\control.idl

-InputName=control

-

-BuildCmds= \

-	..\..\..\..\..\bin\Release\tao_idl -o $(OutDir) -I..\..\..\.. -I..\..\..\ciao -I..\..\..\.. -Ge 1 -Sc $(InputPath)

-

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

-   $(BuildCmds)

-

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

-   $(BuildCmds)

-

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

-   $(BuildCmds)

-

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

-   $(BuildCmds)

-

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

-   $(BuildCmds)

-

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

-   $(BuildCmds)

-# End Custom Build

-

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

-

-# PROP Ignore_Default_Tool 1

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

-OutDir=.

-InputPath=.\control.idl

-InputName=control

-

-BuildCmds= \

-	..\..\..\..\..\bin\tao_idl -o $(OutDir) -I..\..\..\.. -I..\..\..\ciao -I..\..\..\.. -Ge 1 -Sc $(InputPath)

-

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

-   $(BuildCmds)

-

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

-   $(BuildCmds)

-

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

-   $(BuildCmds)

-

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

-   $(BuildCmds)

-

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

-   $(BuildCmds)

-

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

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# End Group

-# End Target

-# End Project