From f399873d8df0cda717d525de02f561c88eb17c01 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sun, 16 Sep 2012 13:21:50 +0200 Subject: Add support for Visual Studio 2012 --- boost/build.bat | 1 + boost/common/boost-common-vc11.sln | 15 ++ boost/common/makefile | 4 +- boost/common/multi-index/makefile | 4 +- boost/common/optional/makefile | 4 +- boost/common/smart-ptr/makefile | 4 +- boost/common/template/makefile | 4 +- boost/common/template/template-vc11.vcxproj | 181 ++++++++++++++++++++ .../common/template/template-vc11.vcxproj.filters | 24 +++ boost/common/unordered/makefile | 4 +- boost/common/uuid/makefile | 4 +- boost/mssql/boost-mssql-vc11.sln | 15 ++ boost/mssql/date-time/makefile | 5 +- boost/mssql/makefile | 4 +- boost/mssql/template/makefile | 5 +- boost/mssql/template/template-vc11.vcxproj | 184 +++++++++++++++++++++ boost/mssql/template/template-vc11.vcxproj.filters | 25 +++ boost/mysql/boost-mysql-vc11.sln | 15 ++ boost/mysql/date-time/makefile | 5 +- boost/mysql/makefile | 4 +- boost/mysql/template/makefile | 5 +- boost/mysql/template/template-vc11.vcxproj | 184 +++++++++++++++++++++ boost/mysql/template/template-vc11.vcxproj.filters | 25 +++ boost/oracle/boost-oracle-vc11.sln | 15 ++ boost/oracle/date-time/makefile | 5 +- boost/oracle/makefile | 4 +- boost/oracle/template/makefile | 5 +- boost/oracle/template/template-vc11.vcxproj | 184 +++++++++++++++++++++ .../oracle/template/template-vc11.vcxproj.filters | 25 +++ boost/pgsql/boost-pgsql-vc11.sln | 15 ++ boost/pgsql/date-time/makefile | 5 +- boost/pgsql/makefile | 4 +- boost/pgsql/template/makefile | 5 +- boost/pgsql/template/template-vc11.vcxproj | 184 +++++++++++++++++++++ boost/pgsql/template/template-vc11.vcxproj.filters | 25 +++ boost/sqlite/boost-sqlite-vc11.sln | 15 ++ boost/sqlite/date-time/makefile | 5 +- boost/sqlite/makefile | 4 +- boost/sqlite/template/makefile | 5 +- boost/sqlite/template/template-vc11.vcxproj | 184 +++++++++++++++++++++ .../sqlite/template/template-vc11.vcxproj.filters | 25 +++ 41 files changed, 1417 insertions(+), 22 deletions(-) create mode 100644 boost/common/boost-common-vc11.sln create mode 100644 boost/common/template/template-vc11.vcxproj create mode 100644 boost/common/template/template-vc11.vcxproj.filters create mode 100644 boost/mssql/boost-mssql-vc11.sln create mode 100644 boost/mssql/template/template-vc11.vcxproj create mode 100644 boost/mssql/template/template-vc11.vcxproj.filters create mode 100644 boost/mysql/boost-mysql-vc11.sln create mode 100644 boost/mysql/template/template-vc11.vcxproj create mode 100644 boost/mysql/template/template-vc11.vcxproj.filters create mode 100644 boost/oracle/boost-oracle-vc11.sln create mode 100644 boost/oracle/template/template-vc11.vcxproj create mode 100644 boost/oracle/template/template-vc11.vcxproj.filters create mode 100644 boost/pgsql/boost-pgsql-vc11.sln create mode 100644 boost/pgsql/template/template-vc11.vcxproj create mode 100644 boost/pgsql/template/template-vc11.vcxproj.filters create mode 100644 boost/sqlite/boost-sqlite-vc11.sln create mode 100644 boost/sqlite/template/template-vc11.vcxproj create mode 100644 boost/sqlite/template/template-vc11.vcxproj.filters (limited to 'boost') diff --git a/boost/build.bat b/boost/build.bat index 132e011..d9a2e4f 100644 --- a/boost/build.bat +++ b/boost/build.bat @@ -38,6 +38,7 @@ set "failed=" if "_%2_" == "_9_" set "vcver=9" if "_%2_" == "_10_" set "vcver=10" +if "_%2_" == "_11_" set "vcver=11" if "_%vcver%_" == "__" ( echo unknown VC++ version %2 diff --git a/boost/common/boost-common-vc11.sln b/boost/common/boost-common-vc11.sln new file mode 100644 index 0000000..436eeea --- /dev/null +++ b/boost/common/boost-common-vc11.sln @@ -0,0 +1,15 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +__projects__ +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution +__solution_configurations__ + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution +__project_configurations__ + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/boost/common/makefile b/boost/common/makefile index 1aecce0..c85a808 100644 --- a/boost/common/makefile +++ b/boost/common/makefile @@ -26,11 +26,12 @@ name := boost-common $(dist): name := $(name) $(dist): export dirs := $(tests) $(dist): export extra_dist := test.bat $(call vc9slns,$(name)) \ -$(call vc10slns,$(name)) +$(call vc10slns,$(name)) $(call vc11slns,$(name)) $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_tests))) $(call meta-automake) $(call meta-vc9slns,$(name)) $(call meta-vc10slns,$(name)) + $(call meta-vc11slns,$(name)) $(call meta-vctest,$(name)-mysql-vc10.sln,test.bat) $(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(build_tests))) @@ -38,6 +39,7 @@ $(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(all_tests))) $(call include,$(bld_root)/meta/vc9sln.make) $(call include,$(bld_root)/meta/vc10sln.make) +$(call include,$(bld_root)/meta/vc11sln.make) $(call include,$(bld_root)/meta/vctest.make) $(call include,$(bld_root)/meta/automake.make) diff --git a/boost/common/multi-index/makefile b/boost/common/multi-index/makefile index 96f4b66..9ffdb0f 100644 --- a/boost/common/multi-index/makefile +++ b/boost/common/multi-index/makefile @@ -66,12 +66,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -107,6 +108,7 @@ endif $(call include,$(bld_root)/dist.make) $(call include,$(bld_root)/meta/vc9proj.make) $(call include,$(bld_root)/meta/vc10proj.make) +$(call include,$(bld_root)/meta/vc11proj.make) $(call include,$(bld_root)/meta/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/boost/common/optional/makefile b/boost/common/optional/makefile index 0b1866d..3f3c1e8 100644 --- a/boost/common/optional/makefile +++ b/boost/common/optional/makefile @@ -66,12 +66,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -107,6 +108,7 @@ endif $(call include,$(bld_root)/dist.make) $(call include,$(bld_root)/meta/vc9proj.make) $(call include,$(bld_root)/meta/vc10proj.make) +$(call include,$(bld_root)/meta/vc11proj.make) $(call include,$(bld_root)/meta/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/boost/common/smart-ptr/makefile b/boost/common/smart-ptr/makefile index 51ef93e..18eeceb 100644 --- a/boost/common/smart-ptr/makefile +++ b/boost/common/smart-ptr/makefile @@ -66,12 +66,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -107,6 +108,7 @@ endif $(call include,$(bld_root)/dist.make) $(call include,$(bld_root)/meta/vc9proj.make) $(call include,$(bld_root)/meta/vc10proj.make) +$(call include,$(bld_root)/meta/vc11proj.make) $(call include,$(bld_root)/meta/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/boost/common/template/makefile b/boost/common/template/makefile index 363c730..d9dc969 100644 --- a/boost/common/template/makefile +++ b/boost/common/template/makefile @@ -66,12 +66,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -107,6 +108,7 @@ endif $(call include,$(bld_root)/dist.make) $(call include,$(bld_root)/meta/vc9proj.make) $(call include,$(bld_root)/meta/vc10proj.make) +$(call include,$(bld_root)/meta/vc11proj.make) $(call include,$(bld_root)/meta/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/boost/common/template/template-vc11.vcxproj b/boost/common/template/template-vc11.vcxproj new file mode 100644 index 0000000..72fb7e3 --- /dev/null +++ b/boost/common/template/template-vc11.vcxproj @@ -0,0 +1,181 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {__uuid__()} + Win32Proj + __value__(name) + + + + Application + true + v110 + Unicode + + + Application + true + v110 + Unicode + + + Application + false + v110 + true + Unicode + + + Application + false + v110 + true + Unicode + + + + + + + + + + + + + + + + + + + true + $(Configuration)\ + driver + + + true + $(Platform)\$(Configuration)\ + driver + + + false + $(Configuration)\ + driver + + + false + $(Platform)\$(Configuration)\ + driver + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;__upcase__(database_)__upcase__(__value__(database));HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) + $(SolutionDir)\..\..\libcommon + 4068;4355;4800;4290;%(DisableSpecificWarnings) + + + $(SolutionDir)\..\..\libcommon\lib\common-d.lib;odb-__value__(database)-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies) + Console + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;__upcase__(database_)__upcase__(__value__(database));HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) + $(SolutionDir)\..\..\libcommon + 4068;4355;4800;4290;%(DisableSpecificWarnings) + + + $(SolutionDir)\..\..\libcommon\lib64\common-d.lib;odb-__value__(database)-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies) + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;_CONSOLE;__upcase__(database_)__upcase__(__value__(database));HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) + $(SolutionDir)\..\..\libcommon + 4068;4355;4800;4290;%(DisableSpecificWarnings) + + + $(SolutionDir)\..\..\libcommon\lib\common.lib;odb-__value__(database).lib;odb-boost.lib;odb.lib;%(AdditionalDependencies) + Console + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;_CONSOLE;__upcase__(database_)__upcase__(__value__(database));HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) + $(SolutionDir)\..\..\libcommon + 4068;4355;4800;4290;%(DisableSpecificWarnings) + + + $(SolutionDir)\..\..\libcommon\lib64\common.lib;odb-__value__(database).lib;odb-boost.lib;odb.lib;%(AdditionalDependencies) + Console + true + true + true + + + +__custom_build_entry__( +test.hxx, +odb test.hxx, +odb.exe --std c++11 __xml__(__shell_quotes__(m4_patsubst(__value__(odb_options), @database@, __value__(database)) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx, +test-odb.hxx;test-odb.ixx;test-odb.cxx) + + +__header_entry__(test-odb.hxx) +__header_entry__(test-odb.ixx) +__header_entries__(extra_headers) + + +__source_entry__(driver.cxx) +__source_entry__(test-odb.cxx) +__source_entries__(extra_sources) + + + + + diff --git a/boost/common/template/template-vc11.vcxproj.filters b/boost/common/template/template-vc11.vcxproj.filters new file mode 100644 index 0000000..f3ee658 --- /dev/null +++ b/boost/common/template/template-vc11.vcxproj.filters @@ -0,0 +1,24 @@ + + + + + {__uuid__()} + cxx + + + {__uuid__()} + h;hxx;ixx;txx + + + +__header_filter_entry__(test.hxx) +__header_filter_entry__(test-odb.hxx) +__header_filter_entry__(test-odb.ixx) +__header_filter_entries__(extra_headers) + + +__source_filter_entry__(driver.cxx) +__source_filter_entry__(test-odb.cxx) +__source_filter_entries__(extra_sources) + + \ No newline at end of file diff --git a/boost/common/unordered/makefile b/boost/common/unordered/makefile index 30603c6..e50f3a7 100644 --- a/boost/common/unordered/makefile +++ b/boost/common/unordered/makefile @@ -66,12 +66,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -107,6 +108,7 @@ endif $(call include,$(bld_root)/dist.make) $(call include,$(bld_root)/meta/vc9proj.make) $(call include,$(bld_root)/meta/vc10proj.make) +$(call include,$(bld_root)/meta/vc11proj.make) $(call include,$(bld_root)/meta/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/boost/common/uuid/makefile b/boost/common/uuid/makefile index e39df77..6d89098 100644 --- a/boost/common/uuid/makefile +++ b/boost/common/uuid/makefile @@ -66,12 +66,13 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(name) $(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \ -$(call vc10projs,$(name)) +$(call vc10projs,$(name)) $(call vc11projs,$(name)) $(dist): $(call dist-data,$(sources) $(headers) $(data_dist)) $(call meta-automake,../template/Makefile.am) $(call meta-vc9projs,../template/template,$(name)) $(call meta-vc10projs,../template/template,$(name)) + $(call meta-vc11projs,../template/template,$(name)) # Test. # @@ -107,6 +108,7 @@ endif $(call include,$(bld_root)/dist.make) $(call include,$(bld_root)/meta/vc9proj.make) $(call include,$(bld_root)/meta/vc10proj.make) +$(call include,$(bld_root)/meta/vc11proj.make) $(call include,$(bld_root)/meta/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/boost/mssql/boost-mssql-vc11.sln b/boost/mssql/boost-mssql-vc11.sln new file mode 100644 index 0000000..436eeea --- /dev/null +++ b/boost/mssql/boost-mssql-vc11.sln @@ -0,0 +1,15 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +__projects__ +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution +__solution_configurations__ + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution +__project_configurations__ + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/boost/mssql/date-time/makefile b/boost/mssql/date-time/makefile index ab68ca6..7c267a0 100644 --- a/boost/mssql/date-time/makefile +++ b/boost/mssql/date-time/makefile @@ -67,12 +67,14 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(subst /,-,$(subst $(src_root)/boost/mssql/,,$(src_base))) $(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ -$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters +$(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-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) # Test. # @@ -108,6 +110,7 @@ endif $(call include,$(bld_root)/dist.make) $(call include,$(bld_root)/meta/vc9proj.make) $(call include,$(bld_root)/meta/vc10proj.make) +$(call include,$(bld_root)/meta/vc11proj.make) $(call include,$(bld_root)/meta/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/boost/mssql/makefile b/boost/mssql/makefile index 3154b10..145bb34 100644 --- a/boost/mssql/makefile +++ b/boost/mssql/makefile @@ -17,11 +17,12 @@ $(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) $(dist): name := boost-mssql $(dist): export dirs := $(tests) -$(dist): export extra_dist := $(name)-vc9.sln $(name)-vc10.sln test.bat +$(dist): export extra_dist := $(name)-vc9.sln $(name)-vc10.sln $(name)-vc11.sln test.bat $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(tests))) $(call meta-automake) $(call meta-vc9sln,$(name)-vc9.sln) $(call meta-vc10sln,$(name)-vc10.sln) + $(call meta-vc11sln,$(name)-vc11.sln) $(call meta-vctest,$(name)-vc10.sln,test.bat) $(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) @@ -29,6 +30,7 @@ $(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) $(call include,$(bld_root)/meta/vc9sln.make) $(call include,$(bld_root)/meta/vc10sln.make) +$(call include,$(bld_root)/meta/vc11sln.make) $(call include,$(bld_root)/meta/vctest.make) $(call include,$(bld_root)/meta/automake.make) diff --git a/boost/mssql/template/makefile b/boost/mssql/template/makefile index 19ff1db..2d03374 100644 --- a/boost/mssql/template/makefile +++ b/boost/mssql/template/makefile @@ -62,12 +62,14 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(subst /,-,$(subst $(src_root)/boost/mssql/,,$(src_base))) $(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ -$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters +$(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-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) # Test. # @@ -103,6 +105,7 @@ endif $(call include,$(bld_root)/dist.make) $(call include,$(bld_root)/meta/vc9proj.make) $(call include,$(bld_root)/meta/vc10proj.make) +$(call include,$(bld_root)/meta/vc11proj.make) $(call include,$(bld_root)/meta/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/boost/mssql/template/template-vc11.vcxproj b/boost/mssql/template/template-vc11.vcxproj new file mode 100644 index 0000000..2cc9f28 --- /dev/null +++ b/boost/mssql/template/template-vc11.vcxproj @@ -0,0 +1,184 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {__uuid__()} + Win32Proj + __value__(name) + + + + Application + true + v110 + Unicode + + + Application + true + v110 + Unicode + + + Application + false + v110 + true + Unicode + + + Application + false + v110 + true + Unicode + + + + + + + + + + + + + + + + + + + true + $(Configuration)\ + driver + + + true + $(Platform)\$(Configuration)\ + driver + + + false + $(Configuration)\ + driver + + + false + $(Platform)\$(Configuration)\ + driver + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) + $(SolutionDir)\..\..\libcommon + 4068;4355;4800;4290;%(DisableSpecificWarnings) + + + $(SolutionDir)\..\..\libcommon\lib\common-d.lib;odb-mssql-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies) + Console + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) + $(SolutionDir)\..\..\libcommon + 4068;4355;4800;4290;%(DisableSpecificWarnings) + + + $(SolutionDir)\..\..\libcommon\lib64\common-d.lib;odb-mssql-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies) + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) + $(SolutionDir)\..\..\libcommon + 4068;4355;4800;4290;%(DisableSpecificWarnings) + + + $(SolutionDir)\..\..\libcommon\lib\common.lib;odb-mssql.lib;odb-boost.lib;odb.lib;%(AdditionalDependencies) + Console + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) + $(SolutionDir)\..\..\libcommon + 4068;4355;4800;4290;%(DisableSpecificWarnings) + + + $(SolutionDir)\..\..\libcommon\lib64\common.lib;odb-mssql.lib;odb-boost.lib;odb.lib;%(AdditionalDependencies) + Console + true + true + true + + +__ifelse__(__value__(odb_options),,, +m4_dnl + +__custom_build_entry__( +test.hxx, +odb test.hxx, +odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx, +test-odb.hxx;test-odb.ixx;test-odb.cxx) + ) + +__ifelse__(__value__(odb_options),,, +__header_entry__(test-odb.hxx) +__header_entry__(test-odb.ixx)) +__header_entries__(extra_headers) + + +__source_entry__(driver.cxx) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__source_entries__(extra_sources) + + + + + diff --git a/boost/mssql/template/template-vc11.vcxproj.filters b/boost/mssql/template/template-vc11.vcxproj.filters new file mode 100644 index 0000000..8ac18a3 --- /dev/null +++ b/boost/mssql/template/template-vc11.vcxproj.filters @@ -0,0 +1,25 @@ + + + + + {__uuid__()} + cxx + + + {__uuid__()} + h;hxx;ixx;txx + + + +__ifelse__(__value__(odb_options),,, +__header_filter_entry__(test.hxx) +__header_filter_entry__(test-odb.hxx) +__header_filter_entry__(test-odb.ixx)) +__header_filter_entries__(extra_headers) + + +__source_filter_entry__(driver.cxx) +__ifelse__(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) +__source_filter_entries__(extra_sources) + + \ No newline at end of file diff --git a/boost/mysql/boost-mysql-vc11.sln b/boost/mysql/boost-mysql-vc11.sln new file mode 100644 index 0000000..436eeea --- /dev/null +++ b/boost/mysql/boost-mysql-vc11.sln @@ -0,0 +1,15 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +__projects__ +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution +__solution_configurations__ + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution +__project_configurations__ + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/boost/mysql/date-time/makefile b/boost/mysql/date-time/makefile index 7889b7f..19e7ccf 100644 --- a/boost/mysql/date-time/makefile +++ b/boost/mysql/date-time/makefile @@ -66,12 +66,14 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(subst /,-,$(subst $(src_root)/boost/mysql/,,$(src_base))) $(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ -$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters +$(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-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) # Test. # @@ -107,6 +109,7 @@ endif $(call include,$(bld_root)/dist.make) $(call include,$(bld_root)/meta/vc9proj.make) $(call include,$(bld_root)/meta/vc10proj.make) +$(call include,$(bld_root)/meta/vc11proj.make) $(call include,$(bld_root)/meta/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/boost/mysql/makefile b/boost/mysql/makefile index 088c25a..217c902 100644 --- a/boost/mysql/makefile +++ b/boost/mysql/makefile @@ -17,11 +17,12 @@ $(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) $(dist): name := boost-mysql $(dist): export dirs := $(tests) -$(dist): export extra_dist := $(name)-vc9.sln $(name)-vc10.sln test.bat +$(dist): export extra_dist := $(name)-vc9.sln $(name)-vc10.sln $(name)-vc11.sln test.bat $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(tests))) $(call meta-automake) $(call meta-vc9sln,$(name)-vc9.sln) $(call meta-vc10sln,$(name)-vc10.sln) + $(call meta-vc11sln,$(name)-vc11.sln) $(call meta-vctest,$(name)-vc10.sln,test.bat) $(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) @@ -29,6 +30,7 @@ $(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) $(call include,$(bld_root)/meta/vc9sln.make) $(call include,$(bld_root)/meta/vc10sln.make) +$(call include,$(bld_root)/meta/vc11sln.make) $(call include,$(bld_root)/meta/vctest.make) $(call include,$(bld_root)/meta/automake.make) diff --git a/boost/mysql/template/makefile b/boost/mysql/template/makefile index 5ec5934..3753564 100644 --- a/boost/mysql/template/makefile +++ b/boost/mysql/template/makefile @@ -62,12 +62,14 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(subst /,-,$(subst $(src_root)/boost/mysql/,,$(src_base))) $(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ -$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters +$(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-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) # Test. # @@ -103,6 +105,7 @@ endif $(call include,$(bld_root)/dist.make) $(call include,$(bld_root)/meta/vc9proj.make) $(call include,$(bld_root)/meta/vc10proj.make) +$(call include,$(bld_root)/meta/vc11proj.make) $(call include,$(bld_root)/meta/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/boost/mysql/template/template-vc11.vcxproj b/boost/mysql/template/template-vc11.vcxproj new file mode 100644 index 0000000..85fd7ac --- /dev/null +++ b/boost/mysql/template/template-vc11.vcxproj @@ -0,0 +1,184 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {__uuid__()} + Win32Proj + __value__(name) + + + + Application + true + v110 + Unicode + + + Application + true + v110 + Unicode + + + Application + false + v110 + true + Unicode + + + Application + false + v110 + true + Unicode + + + + + + + + + + + + + + + + + + + true + $(Configuration)\ + driver + + + true + $(Platform)\$(Configuration)\ + driver + + + false + $(Configuration)\ + driver + + + false + $(Platform)\$(Configuration)\ + driver + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) + $(SolutionDir)\..\..\libcommon + 4068;4355;4800;4290;%(DisableSpecificWarnings) + + + $(SolutionDir)\..\..\libcommon\lib\common-d.lib;odb-mysql-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies) + Console + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) + $(SolutionDir)\..\..\libcommon + 4068;4355;4800;4290;%(DisableSpecificWarnings) + + + $(SolutionDir)\..\..\libcommon\lib64\common-d.lib;odb-mysql-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies) + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) + $(SolutionDir)\..\..\libcommon + 4068;4355;4800;4290;%(DisableSpecificWarnings) + + + $(SolutionDir)\..\..\libcommon\lib\common.lib;odb-mysql.lib;odb-boost.lib;odb.lib;%(AdditionalDependencies) + Console + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) + $(SolutionDir)\..\..\libcommon + 4068;4355;4800;4290;%(DisableSpecificWarnings) + + + $(SolutionDir)\..\..\libcommon\lib64\common.lib;odb-mysql.lib;odb-boost.lib;odb.lib;%(AdditionalDependencies) + Console + true + true + true + + +__ifelse__(__value__(odb_options),,, +m4_dnl + +__custom_build_entry__( +test.hxx, +odb test.hxx, +odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx, +test-odb.hxx;test-odb.ixx;test-odb.cxx) + ) + +__ifelse__(__value__(odb_options),,, +__header_entry__(test-odb.hxx) +__header_entry__(test-odb.ixx)) +__header_entries__(extra_headers) + + +__source_entry__(driver.cxx) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__source_entries__(extra_sources) + + + + + diff --git a/boost/mysql/template/template-vc11.vcxproj.filters b/boost/mysql/template/template-vc11.vcxproj.filters new file mode 100644 index 0000000..8ac18a3 --- /dev/null +++ b/boost/mysql/template/template-vc11.vcxproj.filters @@ -0,0 +1,25 @@ + + + + + {__uuid__()} + cxx + + + {__uuid__()} + h;hxx;ixx;txx + + + +__ifelse__(__value__(odb_options),,, +__header_filter_entry__(test.hxx) +__header_filter_entry__(test-odb.hxx) +__header_filter_entry__(test-odb.ixx)) +__header_filter_entries__(extra_headers) + + +__source_filter_entry__(driver.cxx) +__ifelse__(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) +__source_filter_entries__(extra_sources) + + \ No newline at end of file diff --git a/boost/oracle/boost-oracle-vc11.sln b/boost/oracle/boost-oracle-vc11.sln new file mode 100644 index 0000000..436eeea --- /dev/null +++ b/boost/oracle/boost-oracle-vc11.sln @@ -0,0 +1,15 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +__projects__ +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution +__solution_configurations__ + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution +__project_configurations__ + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/boost/oracle/date-time/makefile b/boost/oracle/date-time/makefile index 63ad18d..c94ca46 100644 --- a/boost/oracle/date-time/makefile +++ b/boost/oracle/date-time/makefile @@ -67,12 +67,14 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(subst /,-,$(subst $(src_root)/boost/oracle/,,$(src_base))) $(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ -$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters +$(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-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) # Test. # @@ -108,6 +110,7 @@ endif $(call include,$(bld_root)/dist.make) $(call include,$(bld_root)/meta/vc9proj.make) $(call include,$(bld_root)/meta/vc10proj.make) +$(call include,$(bld_root)/meta/vc11proj.make) $(call include,$(bld_root)/meta/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/boost/oracle/makefile b/boost/oracle/makefile index 380e746..18f5179 100644 --- a/boost/oracle/makefile +++ b/boost/oracle/makefile @@ -17,11 +17,12 @@ $(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) $(dist): name := boost-oracle $(dist): export dirs := $(tests) -$(dist): export extra_dist := $(name)-vc9.sln $(name)-vc10.sln test.bat +$(dist): export extra_dist := $(name)-vc9.sln $(name)-vc10.sln $(name)-vc11.sln test.bat $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(tests))) $(call meta-automake) $(call meta-vc9sln,$(name)-vc9.sln) $(call meta-vc10sln,$(name)-vc10.sln) + $(call meta-vc11sln,$(name)-vc11.sln) $(call meta-vctest,$(name)-vc10.sln,test.bat) $(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) @@ -29,6 +30,7 @@ $(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) $(call include,$(bld_root)/meta/vc9sln.make) $(call include,$(bld_root)/meta/vc10sln.make) +$(call include,$(bld_root)/meta/vc11sln.make) $(call include,$(bld_root)/meta/vctest.make) $(call include,$(bld_root)/meta/automake.make) diff --git a/boost/oracle/template/makefile b/boost/oracle/template/makefile index c813394..d98a808 100644 --- a/boost/oracle/template/makefile +++ b/boost/oracle/template/makefile @@ -62,12 +62,14 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(subst /,-,$(subst $(src_root)/boost/oracle/,,$(src_base))) $(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ -$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters +$(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-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) # Test. # @@ -103,6 +105,7 @@ endif $(call include,$(bld_root)/dist.make) $(call include,$(bld_root)/meta/vc9proj.make) $(call include,$(bld_root)/meta/vc10proj.make) +$(call include,$(bld_root)/meta/vc11proj.make) $(call include,$(bld_root)/meta/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/boost/oracle/template/template-vc11.vcxproj b/boost/oracle/template/template-vc11.vcxproj new file mode 100644 index 0000000..d29652e --- /dev/null +++ b/boost/oracle/template/template-vc11.vcxproj @@ -0,0 +1,184 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {__uuid__()} + Win32Proj + __value__(name) + + + + Application + true + v110 + Unicode + + + Application + true + v110 + Unicode + + + Application + false + v110 + true + Unicode + + + Application + false + v110 + true + Unicode + + + + + + + + + + + + + + + + + + + true + $(Configuration)\ + driver + + + true + $(Platform)\$(Configuration)\ + driver + + + false + $(Configuration)\ + driver + + + false + $(Platform)\$(Configuration)\ + driver + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) + $(SolutionDir)\..\..\libcommon + 4068;4355;4800;4290;%(DisableSpecificWarnings) + + + $(SolutionDir)\..\..\libcommon\lib\common-d.lib;odb-oracle-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies) + Console + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) + $(SolutionDir)\..\..\libcommon + 4068;4355;4800;4290;%(DisableSpecificWarnings) + + + $(SolutionDir)\..\..\libcommon\lib64\common-d.lib;odb-oracle-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies) + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) + $(SolutionDir)\..\..\libcommon + 4068;4355;4800;4290;%(DisableSpecificWarnings) + + + $(SolutionDir)\..\..\libcommon\lib\common.lib;odb-oracle.lib;odb-boost.lib;odb.lib;%(AdditionalDependencies) + Console + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) + $(SolutionDir)\..\..\libcommon + 4068;4355;4800;4290;%(DisableSpecificWarnings) + + + $(SolutionDir)\..\..\libcommon\lib64\common.lib;odb-oracle.lib;odb-boost.lib;odb.lib;%(AdditionalDependencies) + Console + true + true + true + + +__ifelse__(__value__(odb_options),,, +m4_dnl + +__custom_build_entry__( +test.hxx, +odb test.hxx, +odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx, +test-odb.hxx;test-odb.ixx;test-odb.cxx) + ) + +__ifelse__(__value__(odb_options),,, +__header_entry__(test-odb.hxx) +__header_entry__(test-odb.ixx)) +__header_entries__(extra_headers) + + +__source_entry__(driver.cxx) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__source_entries__(extra_sources) + + + + + diff --git a/boost/oracle/template/template-vc11.vcxproj.filters b/boost/oracle/template/template-vc11.vcxproj.filters new file mode 100644 index 0000000..8ac18a3 --- /dev/null +++ b/boost/oracle/template/template-vc11.vcxproj.filters @@ -0,0 +1,25 @@ + + + + + {__uuid__()} + cxx + + + {__uuid__()} + h;hxx;ixx;txx + + + +__ifelse__(__value__(odb_options),,, +__header_filter_entry__(test.hxx) +__header_filter_entry__(test-odb.hxx) +__header_filter_entry__(test-odb.ixx)) +__header_filter_entries__(extra_headers) + + +__source_filter_entry__(driver.cxx) +__ifelse__(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) +__source_filter_entries__(extra_sources) + + \ No newline at end of file diff --git a/boost/pgsql/boost-pgsql-vc11.sln b/boost/pgsql/boost-pgsql-vc11.sln new file mode 100644 index 0000000..436eeea --- /dev/null +++ b/boost/pgsql/boost-pgsql-vc11.sln @@ -0,0 +1,15 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +__projects__ +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution +__solution_configurations__ + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution +__project_configurations__ + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/boost/pgsql/date-time/makefile b/boost/pgsql/date-time/makefile index b1afc76..5d812bc 100644 --- a/boost/pgsql/date-time/makefile +++ b/boost/pgsql/date-time/makefile @@ -66,12 +66,14 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(subst /,-,$(subst $(src_root)/boost/pgsql/,,$(src_base))) $(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ -$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters +$(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-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) # Test. # @@ -107,6 +109,7 @@ endif $(call include,$(bld_root)/dist.make) $(call include,$(bld_root)/meta/vc9proj.make) $(call include,$(bld_root)/meta/vc10proj.make) +$(call include,$(bld_root)/meta/vc11proj.make) $(call include,$(bld_root)/meta/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/boost/pgsql/makefile b/boost/pgsql/makefile index 6069988..8f3d4ae 100644 --- a/boost/pgsql/makefile +++ b/boost/pgsql/makefile @@ -17,11 +17,12 @@ $(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) $(dist): name := boost-pgsql $(dist): export dirs := $(tests) -$(dist): export extra_dist := $(name)-vc9.sln $(name)-vc10.sln test.bat +$(dist): export extra_dist := $(name)-vc9.sln $(name)-vc10.sln $(name)-vc11.sln test.bat $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(tests))) $(call meta-automake) $(call meta-vc9sln,$(name)-vc9.sln) $(call meta-vc10sln,$(name)-vc10.sln) + $(call meta-vc11sln,$(name)-vc11.sln) $(call meta-vctest,$(name)-vc10.sln,test.bat) $(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) @@ -29,6 +30,7 @@ $(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) $(call include,$(bld_root)/meta/vc9sln.make) $(call include,$(bld_root)/meta/vc10sln.make) +$(call include,$(bld_root)/meta/vc11sln.make) $(call include,$(bld_root)/meta/vctest.make) $(call include,$(bld_root)/meta/automake.make) diff --git a/boost/pgsql/template/makefile b/boost/pgsql/template/makefile index db2426d..35ec75b 100644 --- a/boost/pgsql/template/makefile +++ b/boost/pgsql/template/makefile @@ -66,12 +66,14 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(subst /,-,$(subst $(src_root)/boost/pgsql/,,$(src_base))) $(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ -$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters +$(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-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) # Test. # @@ -107,6 +109,7 @@ endif $(call include,$(bld_root)/dist.make) $(call include,$(bld_root)/meta/vc9proj.make) $(call include,$(bld_root)/meta/vc10proj.make) +$(call include,$(bld_root)/meta/vc11proj.make) $(call include,$(bld_root)/meta/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/boost/pgsql/template/template-vc11.vcxproj b/boost/pgsql/template/template-vc11.vcxproj new file mode 100644 index 0000000..1615292 --- /dev/null +++ b/boost/pgsql/template/template-vc11.vcxproj @@ -0,0 +1,184 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {__uuid__()} + Win32Proj + __value__(name) + + + + Application + true + v110 + Unicode + + + Application + true + v110 + Unicode + + + Application + false + v110 + true + Unicode + + + Application + false + v110 + true + Unicode + + + + + + + + + + + + + + + + + + + true + $(Configuration)\ + driver + + + true + $(Platform)\$(Configuration)\ + driver + + + false + $(Configuration)\ + driver + + + false + $(Platform)\$(Configuration)\ + driver + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) + $(SolutionDir)\..\..\libcommon + 4068;4355;4800;4290;%(DisableSpecificWarnings) + + + $(SolutionDir)\..\..\libcommon\lib\common-d.lib;odb-pgsql-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies) + Console + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) + $(SolutionDir)\..\..\libcommon + 4068;4355;4800;4290;%(DisableSpecificWarnings) + + + $(SolutionDir)\..\..\libcommon\lib64\common-d.lib;odb-pgsql-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies) + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) + $(SolutionDir)\..\..\libcommon + 4068;4355;4800;4290;%(DisableSpecificWarnings) + + + $(SolutionDir)\..\..\libcommon\lib\common.lib;odb-pgsql.lib;odb-boost.lib;odb.lib;%(AdditionalDependencies) + Console + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) + $(SolutionDir)\..\..\libcommon + 4068;4355;4800;4290;%(DisableSpecificWarnings) + + + $(SolutionDir)\..\..\libcommon\lib64\common.lib;odb-pgsql.lib;odb-boost.lib;odb.lib;%(AdditionalDependencies) + Console + true + true + true + + +__ifelse__(__value__(odb_options),,, +m4_dnl + +__custom_build_entry__( +test.hxx, +odb test.hxx, +odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx, +test-odb.hxx;test-odb.ixx;test-odb.cxx) + ) + +__ifelse__(__value__(odb_options),,, +__header_entry__(test-odb.hxx) +__header_entry__(test-odb.ixx)) +__header_entries__(extra_headers) + + +__source_entry__(driver.cxx) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__source_entries__(extra_sources) + + + + + diff --git a/boost/pgsql/template/template-vc11.vcxproj.filters b/boost/pgsql/template/template-vc11.vcxproj.filters new file mode 100644 index 0000000..8ac18a3 --- /dev/null +++ b/boost/pgsql/template/template-vc11.vcxproj.filters @@ -0,0 +1,25 @@ + + + + + {__uuid__()} + cxx + + + {__uuid__()} + h;hxx;ixx;txx + + + +__ifelse__(__value__(odb_options),,, +__header_filter_entry__(test.hxx) +__header_filter_entry__(test-odb.hxx) +__header_filter_entry__(test-odb.ixx)) +__header_filter_entries__(extra_headers) + + +__source_filter_entry__(driver.cxx) +__ifelse__(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) +__source_filter_entries__(extra_sources) + + \ No newline at end of file diff --git a/boost/sqlite/boost-sqlite-vc11.sln b/boost/sqlite/boost-sqlite-vc11.sln new file mode 100644 index 0000000..436eeea --- /dev/null +++ b/boost/sqlite/boost-sqlite-vc11.sln @@ -0,0 +1,15 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +__projects__ +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution +__solution_configurations__ + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution +__project_configurations__ + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/boost/sqlite/date-time/makefile b/boost/sqlite/date-time/makefile index b36f2b7..99c1761 100644 --- a/boost/sqlite/date-time/makefile +++ b/boost/sqlite/date-time/makefile @@ -66,12 +66,14 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(subst /,-,$(subst $(src_root)/boost/sqlite/,,$(src_base))) $(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ -$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters +$(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-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) # Test. # @@ -107,6 +109,7 @@ endif $(call include,$(bld_root)/dist.make) $(call include,$(bld_root)/meta/vc9proj.make) $(call include,$(bld_root)/meta/vc10proj.make) +$(call include,$(bld_root)/meta/vc11proj.make) $(call include,$(bld_root)/meta/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/boost/sqlite/makefile b/boost/sqlite/makefile index 211e3c0..0bb7672 100644 --- a/boost/sqlite/makefile +++ b/boost/sqlite/makefile @@ -17,11 +17,12 @@ $(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) $(dist): name := boost-sqlite $(dist): export dirs := $(tests) -$(dist): export extra_dist := $(name)-vc9.sln $(name)-vc10.sln test.bat +$(dist): export extra_dist := $(name)-vc9.sln $(name)-vc10.sln $(name)-vc11.sln test.bat $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(tests))) $(call meta-automake) $(call meta-vc9sln,$(name)-vc9.sln) $(call meta-vc10sln,$(name)-vc10.sln) + $(call meta-vc11sln,$(name)-vc11.sln) $(call meta-vctest,$(name)-vc10.sln,test.bat) $(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) @@ -29,6 +30,7 @@ $(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) $(call include,$(bld_root)/meta/vc9sln.make) $(call include,$(bld_root)/meta/vc10sln.make) +$(call include,$(bld_root)/meta/vc11sln.make) $(call include,$(bld_root)/meta/vctest.make) $(call include,$(bld_root)/meta/automake.make) diff --git a/boost/sqlite/template/makefile b/boost/sqlite/template/makefile index c57dd91..ccbdf3f 100644 --- a/boost/sqlite/template/makefile +++ b/boost/sqlite/template/makefile @@ -66,12 +66,14 @@ $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std $(dist): export name := $(subst /,-,$(subst $(src_root)/boost/sqlite/,,$(src_base))) $(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ -$(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters +$(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-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) # Test. # @@ -107,6 +109,7 @@ endif $(call include,$(bld_root)/dist.make) $(call include,$(bld_root)/meta/vc9proj.make) $(call include,$(bld_root)/meta/vc10proj.make) +$(call include,$(bld_root)/meta/vc11proj.make) $(call include,$(bld_root)/meta/automake.make) $(call include,$(bld_root)/cxx/standard.make) # cxx_standard diff --git a/boost/sqlite/template/template-vc11.vcxproj b/boost/sqlite/template/template-vc11.vcxproj new file mode 100644 index 0000000..4056905 --- /dev/null +++ b/boost/sqlite/template/template-vc11.vcxproj @@ -0,0 +1,184 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {__uuid__()} + Win32Proj + __value__(name) + + + + Application + true + v110 + Unicode + + + Application + true + v110 + Unicode + + + Application + false + v110 + true + Unicode + + + Application + false + v110 + true + Unicode + + + + + + + + + + + + + + + + + + + true + $(Configuration)\ + driver + + + true + $(Platform)\$(Configuration)\ + driver + + + false + $(Configuration)\ + driver + + + false + $(Platform)\$(Configuration)\ + driver + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) + $(SolutionDir)\..\..\libcommon + 4068;4355;4800;4290;%(DisableSpecificWarnings) + + + $(SolutionDir)\..\..\libcommon\lib\common-d.lib;odb-sqlite-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies) + Console + true + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) + $(SolutionDir)\..\..\libcommon + 4068;4355;4800;4290;%(DisableSpecificWarnings) + + + $(SolutionDir)\..\..\libcommon\lib64\common-d.lib;odb-sqlite-d.lib;odb-boost-d.lib;odb-d.lib;%(AdditionalDependencies) + Console + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) + $(SolutionDir)\..\..\libcommon + 4068;4355;4800;4290;%(DisableSpecificWarnings) + + + $(SolutionDir)\..\..\libcommon\lib\common.lib;odb-sqlite.lib;odb-boost.lib;odb.lib;%(AdditionalDependencies) + Console + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + WIN32;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) + $(SolutionDir)\..\..\libcommon + 4068;4355;4800;4290;%(DisableSpecificWarnings) + + + $(SolutionDir)\..\..\libcommon\lib64\common.lib;odb-sqlite.lib;odb-boost.lib;odb.lib;%(AdditionalDependencies) + Console + true + true + true + + +__ifelse__(__value__(odb_options),,, +m4_dnl + +__custom_build_entry__( +test.hxx, +odb test.hxx, +odb.exe --std c++11 __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -DODB_MSC_VER=1600 -I$(SolutionDir)\..\..\libcommon)) test.hxx, +test-odb.hxx;test-odb.ixx;test-odb.cxx) + ) + +__ifelse__(__value__(odb_options),,, +__header_entry__(test-odb.hxx) +__header_entry__(test-odb.ixx)) +__header_entries__(extra_headers) + + +__source_entry__(driver.cxx) +__ifelse__(__value__(odb_options),,,__source_entry__(test-odb.cxx)) +__source_entries__(extra_sources) + + + + + diff --git a/boost/sqlite/template/template-vc11.vcxproj.filters b/boost/sqlite/template/template-vc11.vcxproj.filters new file mode 100644 index 0000000..8ac18a3 --- /dev/null +++ b/boost/sqlite/template/template-vc11.vcxproj.filters @@ -0,0 +1,25 @@ + + + + + {__uuid__()} + cxx + + + {__uuid__()} + h;hxx;ixx;txx + + + +__ifelse__(__value__(odb_options),,, +__header_filter_entry__(test.hxx) +__header_filter_entry__(test-odb.hxx) +__header_filter_entry__(test-odb.ixx)) +__header_filter_entries__(extra_headers) + + +__source_filter_entry__(driver.cxx) +__ifelse__(__value__(odb_options),,,__source_filter_entry__(test-odb.cxx)) +__source_filter_entries__(extra_sources) + + \ No newline at end of file -- cgit v1.1