From 7b31bf12b9f517e2a9795d63a1701cdf23279d5a Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 8 Jul 2013 14:54:20 +0200 Subject: Add support for Visual Studio 2005 --- mysql/custom/driver.cxx | 3 + mysql/custom/makefile | 5 +- mysql/database/makefile | 5 +- mysql/index/makefile | 5 +- mysql/makefile | 5 +- mysql/mysql-vc8.sln | 15 ++ mysql/native/makefile | 5 +- mysql/template/makefile | 5 +- mysql/template/template-vc8.vcproj | 354 +++++++++++++++++++++++++++++++++++++ mysql/truncation/makefile | 5 +- mysql/types/makefile | 5 +- 11 files changed, 404 insertions(+), 8 deletions(-) create mode 100644 mysql/mysql-vc8.sln create mode 100644 mysql/template/template-vc8.vcproj (limited to 'mysql') diff --git a/mysql/custom/driver.cxx b/mysql/custom/driver.cxx index 95b3517..d9453ec 100644 --- a/mysql/custom/driver.cxx +++ b/mysql/custom/driver.cxx @@ -32,7 +32,10 @@ main (int argc, char* argv[]) o.p = point (1.1111, 2222222222.2); o.pv.push_back (point (1.1234, 2.2345)); o.pv.push_back (point (3.3456, 4.4567)); + // VC8 just cannot roundtrip this. +#if !defined(_MSC_VER) || _MSC_VER >= 1500 o.pv.push_back (point (0.0000001, 0.000000001)); // Scientific notation. +#endif // Persist. // diff --git a/mysql/custom/makefile b/mysql/custom/makefile index f857ea4..428a869 100644 --- a/mysql/custom/makefile +++ b/mysql/custom/makefile @@ -48,12 +48,14 @@ $(dist): headers := $(odb_hdr) $(dist): export extra_headers := traits.hxx query.hxx $(dist): data_dist := test.std $(dist): export name := $(subst /,-,$(subst $(src_root)/mysql/,,$(src_base))) -$(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ +$(dist): export extra_dist := $(data_dist) \ +$(name)-vc8.vcproj $(name)-vc9.vcproj \ $(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters \ $(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters $(dist): $(call dist-data,$(sources) $(headers) $(extra_headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) + $(call meta-vc8proj,../template/template-vc8.vcproj,$(name)-vc8.vcproj) $(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj) $(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj) $(call meta-vc11proj,../template/template-vc11.vcxproj,$(name)-vc11.vcxproj) @@ -85,6 +87,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) diff --git a/mysql/database/makefile b/mysql/database/makefile index d2426f6..7ffed22 100644 --- a/mysql/database/makefile +++ b/mysql/database/makefile @@ -28,12 +28,14 @@ $(out_base)/: $(driver) $(dist): sources := $(cxx_tun) $(dist): data_dist := test.std $(dist): export name := $(subst /,-,$(subst $(src_root)/mysql/,,$(src_base))) -$(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ +$(dist): export extra_dist := $(data_dist) \ +$(name)-vc8.vcproj $(name)-vc9.vcproj \ $(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters \ $(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters $(dist): $(call dist-data,$(sources) $(data_dist)) $(call meta-automake,../template/Makefile.am) + $(call meta-vc8proj,../template/template-vc8.vcproj,$(name)-vc8.vcproj) $(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj) $(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj) $(call meta-vc11proj,../template/template-vc11.vcxproj,$(name)-vc11.vcxproj) @@ -64,6 +66,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) diff --git a/mysql/index/makefile b/mysql/index/makefile index 5c8838e..67991af 100644 --- a/mysql/index/makefile +++ b/mysql/index/makefile @@ -45,12 +45,14 @@ $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(subst /,-,$(subst $(src_root)/mysql/,,$(src_base))) -$(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ +$(dist): export extra_dist := $(data_dist) \ +$(name)-vc8.vcproj $(name)-vc9.vcproj \ $(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters \ $(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) + $(call meta-vc8proj,../template/template-vc8.vcproj,$(name)-vc8.vcproj) $(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj) $(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj) $(call meta-vc11proj,../template/template-vc11.vcxproj,$(name)-vc11.vcxproj) @@ -82,6 +84,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) diff --git a/mysql/makefile b/mysql/makefile index 02bb64f..ed2da6a 100644 --- a/mysql/makefile +++ b/mysql/makefile @@ -17,9 +17,11 @@ $(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) $(dist): name := mysql $(dist): export dirs := $(tests) -$(dist): export extra_dist := $(name)-vc9.sln $(name)-vc10.sln $(name)-vc11.sln test.bat +$(dist): export extra_dist := $(name)-vc8.sln $(name)-vc9.sln \ +$(name)-vc10.sln $(name)-vc11.sln test.bat $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(tests))) $(call meta-automake) + $(call meta-vc8sln,$(name)-vc8.sln) $(call meta-vc9sln,$(name)-vc9.sln) $(call meta-vc10sln,$(name)-vc10.sln) $(call meta-vc11sln,$(name)-vc11.sln) @@ -28,6 +30,7 @@ $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(tests))) $(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) $(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) +$(call include,$(bld_root)/meta/vc8sln.make) $(call include,$(bld_root)/meta/vc9sln.make) $(call include,$(bld_root)/meta/vc10sln.make) $(call include,$(bld_root)/meta/vc11sln.make) diff --git a/mysql/mysql-vc8.sln b/mysql/mysql-vc8.sln new file mode 100644 index 0000000..f38bad2 --- /dev/null +++ b/mysql/mysql-vc8.sln @@ -0,0 +1,15 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +__projects__ +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution +__solution_configurations__ + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution +__project_configurations__ + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/mysql/native/makefile b/mysql/native/makefile index 859c17a..c813fda 100644 --- a/mysql/native/makefile +++ b/mysql/native/makefile @@ -28,12 +28,14 @@ $(out_base)/: $(driver) $(dist): sources := $(cxx_tun) $(dist): data_dist := test.std $(dist): export name := $(subst /,-,$(subst $(src_root)/mysql/,,$(src_base))) -$(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ +$(dist): export extra_dist := $(data_dist) \ +$(name)-vc8.vcproj $(name)-vc9.vcproj \ $(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters \ $(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters $(dist): $(call dist-data,$(sources) $(data_dist)) $(call meta-automake,../template/Makefile.am) + $(call meta-vc8proj,../template/template-vc8.vcproj,$(name)-vc8.vcproj) $(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj) $(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj) $(call meta-vc11proj,../template/template-vc11.vcxproj,$(name)-vc11.vcxproj) @@ -64,6 +66,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) diff --git a/mysql/template/makefile b/mysql/template/makefile index 4109f3e..cef4a16 100644 --- a/mysql/template/makefile +++ b/mysql/template/makefile @@ -45,12 +45,14 @@ $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(subst /,-,$(subst $(src_root)/mysql/,,$(src_base))) -$(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ +$(dist): export extra_dist := $(data_dist) \ +$(name)-vc8.vcproj $(name)-vc9.vcproj \ $(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters \ $(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) + $(call meta-vc8proj,../template/template-vc8.vcproj,$(name)-vc8.vcproj) $(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj) $(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj) $(call meta-vc11proj,../template/template-vc11.vcxproj,$(name)-vc11.vcxproj) @@ -82,6 +84,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) diff --git a/mysql/template/template-vc8.vcproj b/mysql/template/template-vc8.vcproj new file mode 100644 index 0000000..afe88c4 --- /dev/null +++ b/mysql/template/template-vc8.vcproj @@ -0,0 +1,354 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +__source_entry__(driver.cxx) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__source_entries__(extra_sources) + + +__ifelse__(__value__(odb_options),,, +__file_entry_custom_build__( +test.hxx, +odb test.hxx, +odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1400 -I$(SolutionDir)\..\libcommon)) test.hxx, +test-odb.hxx;test-odb.ixx;test-odb.cxx) +__file_entry__(test-odb.hxx) +__file_entry__(test-odb.ixx)) +__file_entries__(extra_headers) + + + + + diff --git a/mysql/truncation/makefile b/mysql/truncation/makefile index 1a1f75b..8cb89e6 100644 --- a/mysql/truncation/makefile +++ b/mysql/truncation/makefile @@ -45,12 +45,14 @@ $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(subst /,-,$(subst $(src_root)/mysql/,,$(src_base))) -$(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ +$(dist): export extra_dist := $(data_dist) \ +$(name)-vc8.vcproj $(name)-vc9.vcproj \ $(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters \ $(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) + $(call meta-vc8proj,../template/template-vc8.vcproj,$(name)-vc8.vcproj) $(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj) $(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj) $(call meta-vc11proj,../template/template-vc11.vcxproj,$(name)-vc11.vcxproj) @@ -82,6 +84,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) diff --git a/mysql/types/makefile b/mysql/types/makefile index 8cdc014..cd0c948 100644 --- a/mysql/types/makefile +++ b/mysql/types/makefile @@ -47,12 +47,14 @@ $(dist): headers := $(odb_hdr) $(dist): export extra_headers := traits.hxx $(dist): data_dist := test.std $(dist): export name := $(subst /,-,$(subst $(src_root)/mysql/,,$(src_base))) -$(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ +$(dist): export extra_dist := $(data_dist) \ +$(name)-vc8.vcproj $(name)-vc9.vcproj \ $(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters \ $(name)-vc11.vcxproj $(name)-vc11.vcxproj.filters $(dist): $(call dist-data,$(sources) $(headers) $(extra_headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) + $(call meta-vc8proj,../template/template-vc8.vcproj,$(name)-vc8.vcproj) $(call meta-vc9proj,../template/template-vc9.vcproj,$(name)-vc9.vcproj) $(call meta-vc10proj,../template/template-vc10.vcxproj,$(name)-vc10.vcxproj) $(call meta-vc11proj,../template/template-vc11.vcxproj,$(name)-vc11.vcxproj) @@ -84,6 +86,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) -- cgit v1.1