Moved the SIGC_USING_STD macro definition out of the SIGC_CONFIGURE

2005-01-24  Cedric Gustin <cedric.gustin@swing.be>

	* sigc++config.h.in : Moved the SIGC_USING_STD macro definition
	out of the SIGC_CONFIGURE section. We also need it for MSVC.
	* MSVC_Net2003/.cvsignore : Added .def and .aps files
	* MSVC_Net2003/Makefile.am: Rewrote rule for local copy of
	sigc++config.h (required for 'make distcheck').
	* MSVC_Net2003/libsigc++2_msvcNet2003.sln: Added test_retype and
	test_disconnect_during_emit tests.
	* MSVC_Net2003/tests/test_disconnect_during_emit/*,
	MSVC_Net2003/tests/test_retype/*: Initial commit.

6 files changed, 183 insertions, 15 deletions

diff --git a/MSVC_Net2003/.cvsignore b/MSVC_Net2003/.cvsignore
index b7d6199..a8dc443 100644
--- a/MSVC_Net2003/.cvsignore
+++ b/MSVC_Net2003/.cvsignore
@@ -4,6 +4,9 @@ Debug
 Release
 sigc++config.h
 sigc-2.0.rc
+sigc-2.0.aps
+sigc-2.0.def
+sigc-2.0d.def
 *.ncb 
 *.suo
 
diff --git a/MSVC_Net2003/Makefile.am b/MSVC_Net2003/Makefile.am
index e465969..3d6c370 100644
--- a/MSVC_Net2003/Makefile.am
+++ b/MSVC_Net2003/Makefile.am
@@ -27,5 +27,10 @@ EXTRA_DIST=libsigc++2_msvcNet2003.vcproj libsigc++2_msvcNet2003.sln \
            tests/test_slot/test_slot.vcproj \
            tests/test_trackable/test_trackable.vcproj
 
-sigc++config.h: $(top_builddir)/sigc++config.h
-	cp -f $< $@
+
+# Copy config file generated by the configure script. Dependency is 
+# wht respect to the .h.in file, to prevent an error with 'make distcheck'.
+# See http://sources.redhat.com/automake/automake.html#distcleancheck
+  
+sigc++config.h: $(top_srcdir)/sigc++config.h.in $(top_srcdir)/configure.ac
+	cp -f $(top_builddir)/sigc++config.h $@
diff --git a/MSVC_Net2003/libsigc++2_msvcNet2003.sln b/MSVC_Net2003/libsigc++2_msvcNet2003.sln
index 22618a7..8142136 100644
--- a/MSVC_Net2003/libsigc++2_msvcNet2003.sln
+++ b/MSVC_Net2003/libsigc++2_msvcNet2003.sln
@@ -89,10 +89,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_trackable", "tests\tes
 		{2C30C2D4-314A-400F-A142-E9EEEA800631} = {2C30C2D4-314A-400F-A142-E9EEEA800631}

 	EndProjectSection

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sigc", "libsigc++2_msvcNet2003.vcproj", "{2C30C2D4-314A-400F-A142-E9EEEA800631}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sigc-2.0", "libsigc++2_msvcNet2003.vcproj", "{2C30C2D4-314A-400F-A142-E9EEEA800631}"

 	ProjectSection(ProjectDependencies) = postProject

 	EndProjectSection

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_retype", "tests\test_retype\test_retype.vcproj", "{D5835BCA-D0F1-45FF-81B6-147B9FC75123}"

+	ProjectSection(ProjectDependencies) = postProject

+		{2C30C2D4-314A-400F-A142-E9EEEA800631} = {2C30C2D4-314A-400F-A142-E9EEEA800631}

+	EndProjectSection

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_disconnect_during_emit", "tests\test_disconnect_during_emit\test_disconnect_during_emit.vcproj", "{5CCF0167-D23D-45B9-BCDA-F0B912470126}"

+	ProjectSection(ProjectDependencies) = postProject

+		{2C30C2D4-314A-400F-A142-E9EEEA800631} = {2C30C2D4-314A-400F-A142-E9EEEA800631}

+	EndProjectSection

+EndProject

 Global

 	GlobalSection(SolutionConfiguration) = preSolution

 		Debug = Debug

@@ -175,6 +185,14 @@ Global
 		{2C30C2D4-314A-400F-A142-E9EEEA800631}.Debug.Build.0 = Debug|Win32

 		{2C30C2D4-314A-400F-A142-E9EEEA800631}.Release.ActiveCfg = Release|Win32

 		{2C30C2D4-314A-400F-A142-E9EEEA800631}.Release.Build.0 = Release|Win32

+		{D5835BCA-D0F1-45FF-81B6-147B9FC75123}.Debug.ActiveCfg = Debug|Win32

+		{D5835BCA-D0F1-45FF-81B6-147B9FC75123}.Debug.Build.0 = Debug|Win32

+		{D5835BCA-D0F1-45FF-81B6-147B9FC75123}.Release.ActiveCfg = Release|Win32

+		{D5835BCA-D0F1-45FF-81B6-147B9FC75123}.Release.Build.0 = Release|Win32

+		{5CCF0167-D23D-45B9-BCDA-F0B912470126}.Debug.ActiveCfg = Debug|Win32

+		{5CCF0167-D23D-45B9-BCDA-F0B912470126}.Debug.Build.0 = Debug|Win32

+		{5CCF0167-D23D-45B9-BCDA-F0B912470126}.Release.ActiveCfg = Release|Win32

+		{5CCF0167-D23D-45B9-BCDA-F0B912470126}.Release.Build.0 = Release|Win32

 	EndGlobalSection

 	GlobalSection(ExtensibilityGlobals) = postSolution

 	EndGlobalSection

diff --git a/MSVC_Net2003/tests/test_disconnect_during_emit/.cvsignore b/MSVC_Net2003/tests/test_disconnect_during_emit/.cvsignore
new file mode 100644
index 0000000..0f3a6b1
--- /dev/null
+++ b/MSVC_Net2003/tests/test_disconnect_during_emit/.cvsignore
@@ -0,0 +1,2 @@
+Debug
+Release
diff --git a/MSVC_Net2003/tests/test_disconnect_during_emit/test_disconnect_during_emit.vcproj b/MSVC_Net2003/tests/test_disconnect_during_emit/test_disconnect_during_emit.vcproj
new file mode 100644
index 0000000..b60ca43
--- /dev/null
+++ b/MSVC_Net2003/tests/test_disconnect_during_emit/test_disconnect_during_emit.vcproj
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="7.10"

+	Name="test_disconnect_during_emit"

+	ProjectGUID="{5CCF0167-D23D-45B9-BCDA-F0B912470126}"

+	Keyword="Win32Proj">

+	<Platforms>

+		<Platform

+			Name="Win32"/>

+	</Platforms>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory="Debug"

+			IntermediateDirectory="Debug"

+			ConfigurationType="1"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="$(SolutionDir);$(SolutionDir)\.."

+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

+				MinimalRebuild="TRUE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="3"

+				RuntimeTypeInfo="TRUE"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="TRUE"

+				DebugInformationFormat="4"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLinkerTool"

+				OutputFile="$(OutDir)/test_disconnect_during_emit.exe"

+				LinkIncremental="2"

+				GenerateDebugInformation="TRUE"

+				ProgramDatabaseFile="$(OutDir)/test_disconnect.pdb"

+				SubSystem="1"

+				TargetMachine="1"/>

+			<Tool

+				Name="VCMIDLTool"/>

+			<Tool

+				Name="VCPostBuildEventTool"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"/>

+			<Tool

+				Name="VCWebDeploymentTool"/>

+			<Tool

+				Name="VCManagedWrapperGeneratorTool"/>

+			<Tool

+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory="Release"

+			IntermediateDirectory="Release"

+			ConfigurationType="1"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="$(SolutionDir);$(SolutionDir)\.."

+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

+				RuntimeLibrary="2"

+				RuntimeTypeInfo="TRUE"

+				UsePrecompiledHeader="0"

+				WarningLevel="3"

+				Detect64BitPortabilityProblems="TRUE"

+				DebugInformationFormat="3"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLinkerTool"

+				OutputFile="$(OutDir)/test_disconnect_during_emit.exe"

+				LinkIncremental="1"

+				GenerateDebugInformation="TRUE"

+				SubSystem="1"

+				OptimizeReferences="2"

+				EnableCOMDATFolding="2"

+				TargetMachine="1"/>

+			<Tool

+				Name="VCMIDLTool"/>

+			<Tool

+				Name="VCPostBuildEventTool"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"/>

+			<Tool

+				Name="VCWebDeploymentTool"/>

+			<Tool

+				Name="VCManagedWrapperGeneratorTool"/>

+			<Tool

+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

+			<File

+				RelativePath="..\..\blank.cpp">

+			</File>

+			<File

+				RelativePath="..\..\..\tests\test_disconnect_during_emit.cc">

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl;inc;xsd"

+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/MSVC_Net2003/tests/test_retype/test_retype.vcproj b/MSVC_Net2003/tests/test_retype/test_retype.vcproj
index 441e12d..a7501e9 100644
--- a/MSVC_Net2003/tests/test_retype/test_retype.vcproj
+++ b/MSVC_Net2003/tests/test_retype/test_retype.vcproj
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"

 	Version="7.10"

 	Name="test_retype"

-	ProjectGUID="{D5835BCA-D0F1-45FF-81B6-147B9FC75123}"

+	ProjectGUID="{5CCF0167-D23D-45B9-BCDA-F0B912470126}"

 	Keyword="Win32Proj">

 	<Platforms>

 		<Platform

@@ -19,11 +19,13 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

+				AdditionalIncludeDirectories="$(SolutionDir);$(SolutionDir)\.."

 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

 				MinimalRebuild="TRUE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="5"

-				UsePrecompiledHeader="3"

+				RuntimeLibrary="3"

+				RuntimeTypeInfo="TRUE"

+				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="TRUE"

 				DebugInformationFormat="4"/>

@@ -34,7 +36,7 @@
 				OutputFile="$(OutDir)/test_retype.exe"

 				LinkIncremental="2"

 				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/test_retype.pdb"

+				ProgramDatabaseFile="$(OutDir)/test_disconnect.pdb"

 				SubSystem="1"

 				TargetMachine="1"/>

 			<Tool

@@ -66,9 +68,11 @@
 			CharacterSet="2">

 			<Tool

 				Name="VCCLCompilerTool"

+				AdditionalIncludeDirectories="$(SolutionDir);$(SolutionDir)\.."

 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="4"

-				UsePrecompiledHeader="3"

+				RuntimeLibrary="2"

+				RuntimeTypeInfo="TRUE"

+				UsePrecompiledHeader="0"

 				WarningLevel="3"

 				Detect64BitPortabilityProblems="TRUE"

 				DebugInformationFormat="3"/>

@@ -113,13 +117,10 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">

 			<File

+				RelativePath="..\..\blank.cpp">

+			</File>

+			<File

 				RelativePath="..\..\..\tests\test_retype.cc">

-				<FileConfiguration

-					Name="Debug|Win32">

-					<Tool

-						Name="VCCLCompilerTool"

-						UsePrecompiledHeader="0"/>

-				</FileConfiguration>

 			</File>

 		</Filter>

 		<Filter