From 770c24812b6823d48bbea2f03942221d1aed964c Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sun, 15 Jun 2014 14:13:55 +0200 Subject: Use single template set of templates for .sln files --- build/bootstrap.make | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) (limited to 'build') diff --git a/build/bootstrap.make b/build/bootstrap.make index 4e0b0c2..7b97d74 100644 --- a/build/bootstrap.make +++ b/build/bootstrap.make @@ -170,6 +170,11 @@ $(foreach d,$(databases),$(call \ meta-vc11proj,$1-vc11.vcxproj,$(if $2,$2,$(notdir \ $1))-$d-vc11.vcxproj,database,$d)$(literal_newline)$(literal_tab))@: +$(dist): meta-vc12projs = \ +$(foreach d,$(databases),$(call \ +meta-vc12proj,$1-vc12.vcxproj,$(if $2,$2,$(notdir \ +$1))-$d-vc12.vcxproj,database,$d)$(literal_newline)$(literal_tab))@: + # $1 project name without the -vcN.vc[x]proj suffix. # vc8projs = $(addprefix $1-,$(addsuffix -vc8.vcproj,$(databases))) @@ -182,33 +187,57 @@ $(addprefix $1-,$(addsuffix -vc10.vcxproj.filters,$(databases))) vc11projs = $(addprefix $1-,$(addsuffix -vc11.vcxproj,$(databases))) \ $(addprefix $1-,$(addsuffix -vc11.vcxproj.filters,$(databases))) +vc12projs = $(addprefix $1-,$(addsuffix -vc12.vcxproj,$(databases))) \ +$(addprefix $1-,$(addsuffix -vc12.vcxproj.filters,$(databases))) + # $1 solution name without the -vcN.sln suffix. # $2 extra project suffix in addition to --vcN.vcproj (optional) # +$(dist): meta-vc8sln1 = \ +$(call meta-vc8sln,$(src_root)/template-vc8.sln,$1-vc8.sln,$2-vc8.vcproj) + $(dist): meta-vc8slns = \ $(foreach d,$(databases),$(call \ -meta-vc8sln,$1-vc8.sln,$1-$d-vc8.sln,$2-$d-vc8.vcproj,database,$d)$(literal_newline)\ +meta-vc8sln,$(src_root)/template-vc8.sln,$1-$d-vc8.sln,$2-$d-vc8.vcproj,database,$d)$(literal_newline)\ $(literal_tab))@: +$(dist): meta-vc9sln1 = \ +$(call meta-vc9sln,$(src_root)/template-vc9.sln,$1-vc9.sln,$2-vc9.vcproj) + $(dist): meta-vc9slns = \ $(foreach d,$(databases),$(call \ -meta-vc9sln,$1-vc9.sln,$1-$d-vc9.sln,$2-$d-vc9.vcproj,database,$d)$(literal_newline)\ +meta-vc9sln,$(src_root)/template-vc9.sln,$1-$d-vc9.sln,$2-$d-vc9.vcproj,database,$d)$(literal_newline)\ $(literal_tab))@: +$(dist): meta-vc10sln1 = \ +$(call meta-vc10sln,$(src_root)/template-vc10.sln,$1-vc10.sln,$2-vc10.vcxproj) + $(dist): meta-vc10slns = \ $(foreach d,$(databases),$(call \ -meta-vc10sln,$1-vc10.sln,$1-$d-vc10.sln,$2-$d-vc10.vcxproj,database,$d)$(literal_newline)\ +meta-vc10sln,$(src_root)/template-vc10.sln,$1-$d-vc10.sln,$2-$d-vc10.vcxproj,database,$d)$(literal_newline)\ $(literal_tab))@: +$(dist): meta-vc11sln1 = \ +$(call meta-vc11sln,$(src_root)/template-vc11.sln,$1-vc11.sln,$2-vc11.vcxproj) + $(dist): meta-vc11slns = \ $(foreach d,$(databases),$(call \ -meta-vc11sln,$1-vc11.sln,$1-$d-vc11.sln,$2-$d-vc11.vcxproj,database,$d)$(literal_newline)\ +meta-vc11sln,$(src_root)/template-vc11.sln,$1-$d-vc11.sln,$2-$d-vc11.vcxproj,database,$d)$(literal_newline)\ +$(literal_tab))@: + +$(dist): meta-vc12sln1 = \ +$(call meta-vc12sln,$(src_root)/template-vc12.sln,$1-vc12.sln,$2-vc12.vcxproj) + +$(dist): meta-vc12slns = \ +$(foreach d,$(databases),$(call \ +meta-vc12sln,$(src_root)/template-vc12.sln,$1-$d-vc12.sln,$2-$d-vc12.vcxproj,database,$d)$(literal_newline)\ $(literal_tab))@: vc8slns = $(addprefix $1-,$(addsuffix -vc8.sln,$(databases))) vc9slns = $(addprefix $1-,$(addsuffix -vc9.sln,$(databases))) vc10slns = $(addprefix $1-,$(addsuffix -vc10.sln,$(databases))) vc11slns = $(addprefix $1-,$(addsuffix -vc11.sln,$(databases))) +vc12slns = $(addprefix $1-,$(addsuffix -vc12.sln,$(databases))) endif -- cgit v1.1