Add support for Visual Studio 20052.2

5 files changed, 401 insertions, 20 deletions

diff --git a/libodb-vc8.sln b/libodb-vc8.sln
new file mode 100644
index 0000000..d6e2b1c
--- /dev/null
+++ b/libodb-vc8.sln
@@ -0,0 +1,26 @@
+

+Microsoft Visual Studio Solution File, Format Version 9.00

+# Visual Studio 2005

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libodb", "odb\libodb-vc8.vcproj", "{513E5721-D318-46B0-8CFB-054042DF87A7}"

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Win32 = Debug|Win32

+		Debug|x64 = Debug|x64

+		Release|Win32 = Release|Win32

+		Release|x64 = Release|x64

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{513E5721-D318-46B0-8CFB-054042DF87A7}.Debug|Win32.ActiveCfg = Debug|Win32

+		{513E5721-D318-46B0-8CFB-054042DF87A7}.Debug|Win32.Build.0 = Debug|Win32

+		{513E5721-D318-46B0-8CFB-054042DF87A7}.Debug|x64.ActiveCfg = Debug|x64

+		{513E5721-D318-46B0-8CFB-054042DF87A7}.Debug|x64.Build.0 = Debug|x64

+		{513E5721-D318-46B0-8CFB-054042DF87A7}.Release|Win32.ActiveCfg = Release|Win32

+		{513E5721-D318-46B0-8CFB-054042DF87A7}.Release|Win32.Build.0 = Release|Win32

+		{513E5721-D318-46B0-8CFB-054042DF87A7}.Release|x64.ActiveCfg = Release|x64

+		{513E5721-D318-46B0-8CFB-054042DF87A7}.Release|x64.Build.0 = Release|x64

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+EndGlobal

diff --git a/makefile b/makefile
index ef2c2da..1025eca 100644
--- a/makefile
+++ b/makefile
@@ -14,7 +14,8 @@ $(default): $(addprefix $(out_base)/,$(addsuffix /,$(dirs)))
 
 $(dist): export dirs := $(dirs)
 $(dist): export docs := GPLv2 LICENSE README NEWS version
-$(dist): data_dist := INSTALL libodb-vc9.sln libodb-vc10.sln libodb-vc11.sln
+$(dist): data_dist := INSTALL libodb-vc8.sln libodb-vc9.sln libodb-vc10.sln \
+libodb-vc11.sln
 $(dist): exec_dist := bootstrap
 $(dist): export extra_dist := $(data_dist) $(exec_dist)
 $(dist): export version = $(shell cat $(src_root)/version)
diff --git a/odb/exceptions.hxx b/odb/exceptions.hxx
index e4d8292..a5f8582 100644
--- a/odb/exceptions.hxx
+++ b/odb/exceptions.hxx
@@ -16,7 +16,7 @@
 
 namespace odb
 {
-  struct LIBODB_EXPORT null_pointer: exception
+  struct LIBODB_EXPORT null_pointer: odb::exception
   {
     virtual const char*
     what () const throw ();
@@ -24,19 +24,19 @@ namespace odb
 
   // Transaction exceptions.
   //
-  struct LIBODB_EXPORT already_in_transaction: exception
+  struct LIBODB_EXPORT already_in_transaction: odb::exception
   {
     virtual const char*
     what () const throw ();
   };
 
-  struct LIBODB_EXPORT not_in_transaction: exception
+  struct LIBODB_EXPORT not_in_transaction: odb::exception
   {
     virtual const char*
     what () const throw ();
   };
 
-  struct LIBODB_EXPORT transaction_already_finalized: exception
+  struct LIBODB_EXPORT transaction_already_finalized: odb::exception
   {
     virtual const char*
     what () const throw ();
@@ -44,19 +44,19 @@ namespace odb
 
   // Session exceptions.
   //
-  struct LIBODB_EXPORT already_in_session: exception
+  struct LIBODB_EXPORT already_in_session: odb::exception
   {
     virtual const char*
     what () const throw ();
   };
 
-  struct LIBODB_EXPORT not_in_session: exception
+  struct LIBODB_EXPORT not_in_session: odb::exception
   {
     virtual const char*
     what () const throw ();
   };
 
-  struct LIBODB_EXPORT session_required: exception
+  struct LIBODB_EXPORT session_required: odb::exception
   {
     virtual const char*
     what () const throw ();
@@ -64,7 +64,7 @@ namespace odb
 
   // Database operations exceptions.
   //
-  struct LIBODB_EXPORT recoverable: exception
+  struct LIBODB_EXPORT recoverable: odb::exception
   {
   };
 
@@ -86,43 +86,43 @@ namespace odb
     what () const throw ();
   };
 
-  struct LIBODB_EXPORT object_not_persistent: exception
+  struct LIBODB_EXPORT object_not_persistent: odb::exception
   {
     virtual const char*
     what () const throw ();
   };
 
-  struct LIBODB_EXPORT object_already_persistent: exception
+  struct LIBODB_EXPORT object_already_persistent: odb::exception
   {
     virtual const char*
     what () const throw ();
   };
 
-  struct LIBODB_EXPORT object_changed: exception
+  struct LIBODB_EXPORT object_changed: odb::exception
   {
     virtual const char*
     what () const throw ();
   };
 
-  struct LIBODB_EXPORT result_not_cached: exception
+  struct LIBODB_EXPORT result_not_cached: odb::exception
   {
     virtual const char*
     what () const throw ();
   };
 
-  struct LIBODB_EXPORT database_exception: exception
+  struct LIBODB_EXPORT database_exception: odb::exception
   {
   };
 
   // Polymorphism support exceptions.
   //
-  struct LIBODB_EXPORT abstract_class: exception
+  struct LIBODB_EXPORT abstract_class: odb::exception
   {
     virtual const char*
     what () const throw ();
   };
 
-  struct LIBODB_EXPORT no_type_info: exception
+  struct LIBODB_EXPORT no_type_info: odb::exception
   {
     virtual const char*
     what () const throw ();
@@ -130,7 +130,7 @@ namespace odb
 
   // Prepared query support exceptions.
   //
-  struct LIBODB_EXPORT prepared_already_cached: exception
+  struct LIBODB_EXPORT prepared_already_cached: odb::exception
   {
     prepared_already_cached (const char* name);
     ~prepared_already_cached () throw ();
@@ -149,7 +149,7 @@ namespace odb
     std::string what_;
   };
 
-  struct LIBODB_EXPORT prepared_type_mismatch: exception
+  struct LIBODB_EXPORT prepared_type_mismatch: odb::exception
   {
     prepared_type_mismatch (const char* name);
     ~prepared_type_mismatch () throw ();
@@ -170,7 +170,7 @@ namespace odb
 
   // Schema catalog exceptions.
   //
-  struct LIBODB_EXPORT unknown_schema: exception
+  struct LIBODB_EXPORT unknown_schema: odb::exception
   {
     unknown_schema (const std::string& name);
     ~unknown_schema () throw ();
diff --git a/odb/libodb-vc8.vcproj b/odb/libodb-vc8.vcproj
new file mode 100644
index 0000000..00a668e
--- /dev/null
+++ b/odb/libodb-vc8.vcproj
@@ -0,0 +1,351 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="libodb"
+	ProjectGUID="{513E5721-D318-46B0-8CFB-054042DF87A7}"
+	RootNamespace="libodb"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".."
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4251"
+				Optimization="0"
+				AdditionalIncludeDirectories=".."
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+				CommandLine="if not exist ..\lib mkdir ..\lib"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\bin\odb-d-__value__(interface_version)-vc8.dll"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)\lib\odb-d.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory=".."
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4251"
+				Optimization="0"
+				AdditionalIncludeDirectories=".."
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+				CommandLine="if not exist ..\lib64 mkdir ..\lib64"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\bin64\odb-d-__value__(interface_version)-vc8.dll"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)\lib64\odb-d.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".."
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4251"
+				AdditionalIncludeDirectories=".."
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+				CommandLine="if not exist ..\lib mkdir ..\lib"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\bin\odb-__value__(interface_version)-vc8.dll"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)\lib\odb.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory=".."
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/wd4355 /wd4800 /wd4290 /wd4251"
+				AdditionalIncludeDirectories=".."
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBODB_DYNAMIC_LIB"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+				CommandLine="if not exist ..\lib64 mkdir ..\lib64"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\bin64\odb-__value__(interface_version)-vc8.dll"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)\lib64\odb.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cxx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+__source_entries__(sources)
+__source_entries__(win32_threads_sources)
+__source_entries__(win32_dll_sources)
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hxx;ixx;txx"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+__file_entries__(headers)
+__file_entry__(details\config-vc.h)
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/odb/makefile b/odb/makefile
index 70128cb..6a2cca4 100644
--- a/odb/makefile
+++ b/odb/makefile
@@ -131,7 +131,8 @@ h,$(win32_headers),$(filter-out $h,$(subst $(src_base)/,,$(shell find \
 $(src_base)/details/win32 -name '*.hxx' -o -name '*.ixx' -o -name '*.txx'))))
 
 $(dist): data_dist := details/config-vc.h
-$(dist): export extra_dist := $(data_dist) libodb-vc9.vcproj \
+$(dist): export extra_dist := $(data_dist) \
+libodb-vc8.vcproj libodb-vc9.vcproj \
 libodb-vc10.vcxproj libodb-vc10.vcxproj.filters \
 libodb-vc11.vcxproj libodb-vc11.vcxproj.filters
 $(dist): export interface_version = $(shell sed -e \
@@ -142,6 +143,7 @@ $(dist):
 $(win32_threads_sources) $(win32_dll_sources) $(headers) \
 $(posix_threads_headers) $(win32_headers) $(win32_threads_headers) \
 $(data_dist) details/config.h.in)
+	$(call meta-vc8proj,$(src_base)/libodb-vc8.vcproj)
 	$(call meta-vc9proj,$(src_base)/libodb-vc9.vcproj)
 	$(call meta-vc10proj,$(src_base)/libodb-vc10.vcxproj)
 	$(call meta-vc11proj,$(src_base)/libodb-vc11.vcxproj)
@@ -169,6 +171,7 @@ endif
 # How to.
 #
 $(call include,$(bld_root)/dist.make)
+$(call include,$(bld_root)/meta/vc8proj.make)
 $(call include,$(bld_root)/meta/vc9proj.make)
 $(call include,$(bld_root)/meta/vc10proj.make)
 $(call include,$(bld_root)/meta/vc11proj.make)