From 25fa70d4f18580fb73b689de27698b8b6f322672 Mon Sep 17 00:00:00 2001 From: dhinton Date: Tue, 20 May 2003 04:01:30 +0000 Subject: ChangeLogTag:Tue May 20 01:50:35 UTC 2003 Don Hinton --- ChangeLog | 11 +++++++++++ tests/Test_Output.cpp | 5 +++-- tests/Test_Output.dsp | 25 +++++++++++++++++++++++-- 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 27952ae5b86..66b9e56919f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Tue May 20 01:50:35 UTC 2003 Don Hinton + + * tests/Test_Output.dsp: + Added a post compile step that deletes any Test_Output*dll's in + current directory. This will be removed once the autobuilds have + have a chance to run and clean up the old files. + + * tests/Test_Output.cpp: + Fixed a typo, and changed the close_singleton() method to delete + the instance_ directly and set it = 0; + Tue May 20 01:50:35 UTC 2003 Don Hinton * ace/config-aix-4.x.h: diff --git a/tests/Test_Output.cpp b/tests/Test_Output.cpp index 42c4e752a2c..b175d2dc6fc 100644 --- a/tests/Test_Output.cpp +++ b/tests/Test_Output.cpp @@ -156,7 +156,7 @@ ACE_Test_Output::instance () ACE_NEW_RETURN (ACE_Test_Output::instance_, ACE_Test_Output, 0); - //ACE_REGISTER_FRAMEWORK_COMPONENT(ACE_Test_Output, ACE_Test_Output::instance_) + ACE_REGISTER_FRAMEWORK_COMPONENT(ACE_Test_Output, ACE_Test_Output::instance_) } } return ACE_Test_Output::instance_; @@ -177,7 +177,8 @@ ACE_Test_Output::name (void) void ACE_Test_Output::close_singleton (void) { - delete ACE_Test_Output::instance (); + delete ACE_Test_Output::instance_; + ACE_Test_Output::instance_ = 0; } void diff --git a/tests/Test_Output.dsp b/tests/Test_Output.dsp index aa6326f5bb1..6a44bb5d4c4 100644 --- a/tests/Test_Output.dsp +++ b/tests/Test_Output.dsp @@ -57,6 +57,11 @@ 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 ace.lib /nologo /dll /machine:I386 /libpath:"..\ace" +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Desc=delete old dlls from tests dir +PostBuild_Cmds=del Test_Output*.dll +# End Special Build Tool !ELSEIF "$(CFG)" == "Test_Output DLL - Win32 Debug" @@ -72,7 +77,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DLL_Test DLL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "FRAMEWORK_COMPONENT_DLL_BUILD_DLL" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TEST_OUTPUT_BUILD_DLL" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "FRAMEWORK_COMPONENT_DLL_BUILD_DLL" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TEST_OUTPUT_BUILD_DLL" /FR /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -83,7 +88,13 @@ 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 aced.lib /nologo /dll /debug /machine:I386 /out:"..\bin\Test_Outputd.dll" /pdbtype:sept /libpath:"..\ace" +# ADD LINK32 aced.lib /nologo /dll /debug /machine:I386 /out:"..\bin\Test_Outputd.dll" /libpath:"..\ace" +# SUBTRACT LINK32 /pdb:none +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Desc=delete old dlls from tests dir +PostBuild_Cmds=del Test_Output*.dll +# End Special Build Tool !ELSEIF "$(CFG)" == "Test_Output DLL - Win32 Static Debug" @@ -112,6 +123,11 @@ BSC32=bscmake.exe LINK32=link.exe # ADD BASE LINK32 aced.lib /nologo /dll /debug /machine:I386 /out:"DLL_Testd.dll" /pdbtype:sept /libpath:"../ace" # ADD LINK32 acesd.lib advapi32.lib /nologo /dll /debug /machine:I386 /out:"..\bin\Test_Outputsd.dll" /pdbtype:sept /libpath:"..\ace" +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Desc=delete old dlls from tests dir +PostBuild_Cmds=del Test_Output*.dll +# End Special Build Tool !ELSEIF "$(CFG)" == "Test_Output DLL - Win32 Static Release" @@ -140,6 +156,11 @@ BSC32=bscmake.exe LINK32=link.exe # ADD BASE LINK32 ace.lib /nologo /dll /machine:I386 /out:"DLL_Test.dll" /libpath:"../ace" # ADD LINK32 aces.lib advapi32.lib /nologo /dll /machine:I386 /out:"..\bin\Test_Outputs.dll" /libpath:"..\ace" +# Begin Special Build Tool +SOURCE="$(InputPath)" +PostBuild_Desc=delete old dlls from tests dir +PostBuild_Cmds=del Test_Output*.dll +# End Special Build Tool !ENDIF -- cgit v1.2.1