Changed behavior of all DLL projects and utilities (like tao_idl) to put

the dll and executables in $ACE_ROOT/bin.

3 files changed, 29 insertions, 38 deletions

diff --git a/TAO/TAO_IDL/tao_idl.dsp b/TAO/TAO_IDL/tao_idl.dsp
index ec18b108d1c..f97d7a7c848 100644
--- a/TAO/TAO_IDL/tao_idl.dsp
+++ b/TAO/TAO_IDL/tao_idl.dsp
@@ -54,7 +54,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 ace.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"../../ace"

+# ADD LINK32 ace.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\bin\Release\tao_idl.exe" /libpath:"../../ace"

 # SUBTRACT LINK32 /map

 

 !ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

@@ -81,7 +81,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 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"..\..\bin\tao_idl.exe" /pdbtype:sept /libpath:"..\..\ace"

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Alpha Debug"

diff --git a/TAO/examples/POA/Generic_Servant/server.dsp b/TAO/examples/POA/Generic_Servant/server.dsp
index 6834716fdf7..0e0116695d6 100644
--- a/TAO/examples/POA/Generic_Servant/server.dsp
+++ b/TAO/examples/POA/Generic_Servant/server.dsp
@@ -17,13 +17,12 @@ CFG=POA Generic Servant DLL - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "POA Generic Servant DLL - Win32 Release" (based on\

- "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "POA Generic Servant DLL - Win32 Debug" (based on\

- "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "POA Generic Servant DLL - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "POA Generic Servant DLL - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -45,8 +44,8 @@ RSC=rc.exe
 # PROP Target_Dir ""

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

 # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D GENERIC_SERVANT_HAS_DLL=1 /D "GENERIC_SERVANT_BUILD_DLL" /YX /FD /c

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

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

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

 BSC32=bscmake.exe

@@ -54,14 +53,12 @@ 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:windows /dll /machine:I386

-# ADD LINK32 ace.lib tao.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Generic_Servant.dll" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+# ADD LINK32 ace.lib tao.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\..\bin\Generic_Servant.dll" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

 # SUBTRACT LINK32 /pdb:none

 # Begin Special Build Tool

-SOURCE=$(InputPath)

-PostBuild_Desc=Copying DLL to ..\Explicit_Activation and\

-       ..\On_Demand_Activation

-PostBuild_Cmds=copy Generic_Servant.dll ..\Explicit_Activation	copy\

-  Generic_Servant.dll ..\On_Demand_Activation

+SOURCE="$(InputPath)"

+PostBuild_Desc=Copying DLL to ..\Explicit_Activation and        ..\On_Demand_Activation

+PostBuild_Cmds=copy Generic_Servant.dll ..\Explicit_Activation	copy   Generic_Servant.dll ..\On_Demand_Activation

 # End Special Build Tool

 

 !ELSEIF  "$(CFG)" == "POA Generic Servant DLL - Win32 Debug"

@@ -80,8 +77,8 @@ PostBuild_Cmds=copy Generic_Servant.dll ..\Explicit_Activation	copy\
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D GENERIC_SERVANT_HAS_DLL=1 /D "GENERIC_SERVANT_BUILD_DLL" /FD /c

 # SUBTRACT CPP /YX

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

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

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

 BSC32=bscmake.exe

@@ -89,14 +86,8 @@ 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:windows /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 TAOd.lib aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Generic_Servantd.dll" /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-# Begin Special Build Tool

-SOURCE=$(InputPath)

-PostBuild_Desc=Copying DLL to destinations

-PostBuild_Cmds=copy Generic_Servantd.dll ..\Explicit_Activation	copy\

-  Generic_Servantd.dll ..\On_Demand_Activation

-# End Special Build Tool

+# ADD LINK32 TAOd.lib aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\..\bin\Generic_Servantd.dll" /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+# SUBTRACT LINK32 /profile /pdb:none

 

 !ENDIF 

 

@@ -149,14 +140,14 @@ SOURCE=.\Foo.idl
 

 !IF  "$(CFG)" == "POA Generic Servant DLL - Win32 Release"

 

-USERDEP__FOO_I="..\..\..\tao_idl\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL compiler

+# PROP Ignore_Default_Tool 1

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

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Foo.idl

 InputName=Foo

 

 BuildCmds= \

-	..\..\..\tao_idl\Release\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\

-       -Wb,export_include=generic_servant_export.h $(InputName).idl

+	tao_idl -Wb,export_macro=GENERIC_SERVANT_Export        -Wb,export_include=generic_servant_export.h $(InputName).idl

 

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

    $(BuildCmds)

@@ -179,14 +170,14 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "POA Generic Servant DLL - Win32 Debug"

 

-USERDEP__FOO_I="..\..\..\tao_idl\tao_idl.exe"	

+# PROP Ignore_Default_Tool 1

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

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Foo.idl

 InputName=Foo

 

 BuildCmds= \

-	..\..\..\tao_idl\tao_idl -Wb,export_macro=GENERIC_SERVANT_Export\

-       -Wb,export_include=generic_servant_export.h $(InputName).idl

+	tao_idl -Wb,export_macro=GENERIC_SERVANT_Export        -Wb,export_include=generic_servant_export.h $(InputName).idl

 

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

    $(BuildCmds)

diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index f6099d84acb..ef4a88d5764 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -57,7 +57,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:windows /dll /machine:I386

-# ADD LINK32 ace.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 ace.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\bin\TAO.dll" /libpath:"..\..\ace"

 # SUBTRACT LINK32 /incremental:yes

 

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

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

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

-# PROP Intermediate_Dir ".\Debug"

+# PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 CPP=cl.exe

@@ -88,7 +88,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:windows /dll /debug /machine:I386

-# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"TAOd.dll" /libpath:"..\..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\bin\TAOd.dll" /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

@@ -105,9 +105,9 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\\ /I "..\\ /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /MTd /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\\ /I " ..\\ /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /MTd /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\\ /I "..\\ /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /MDd /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\\ /I " ..\\ /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /MDd /c

 # SUBTRACT CPP /YX

 MTL=midl.exe

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

@@ -137,9 +137,9 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /O2 /I "..\..\\ /I "..\\ /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c

+# ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /O2 /I "..\..\\ /I " ..\\ /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\\ /I "..\\ /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\\ /I " ..\\ /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c

 # SUBTRACT CPP /YX

 MTL=midl.exe

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