diff options
Diffstat (limited to 'tests/cxx/parser')
37 files changed, 689 insertions, 145 deletions
diff --git a/tests/cxx/parser/built-in/makefile b/tests/cxx/parser/built-in/makefile index 49eb681..c6146e9 100644 --- a/tests/cxx/parser/built-in/makefile +++ b/tests/cxx/parser/built-in/makefile @@ -16,9 +16,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -32,6 +34,7 @@ skel := $(addprefix $(out_base)/,$(skelf)) $(skel): xsde := $(out_root)/xsde/xsde $(skel): $(out_root)/xsde/xsde +$(skel) $(dist) $(dist-win): xsde_options += $(call include-dep,$(dep)) @@ -52,6 +55,18 @@ $(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src $(call message,test $(out_base)/$*,$(driver) $(src_base)/test-$*.xml | diff -u $(src_base)/test-$*.std -) +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -xsd "$(xsd)" \ +-cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/duplicate/makefile b/tests/cxx/parser/duplicate/makefile index 8c7b717..1d3cfd4 100644 --- a/tests/cxx/parser/duplicate/makefile +++ b/tests/cxx/parser/duplicate/makefile @@ -5,6 +5,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make +cxx := xsd := test.xsd obj := $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.o) $(xsd:.xsd=-pimpl.o) $(xsd:.xsd=-pdriver.o)) @@ -13,9 +14,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/$(xsd:.xsd=-pdriver) -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/$(xsd:.xsd=-pdriver) +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -30,8 +33,8 @@ genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) \ gen := $(addprefix $(out_base)/,$(genf)) $(gen): xsde := $(out_root)/xsde/xsde -$(gen): xsde_options += --generate-print-impl --generate-test-driver \ ---force-overwrite +$(gen) $(dist) $(dist-win): xsde_options += --generate-print-impl \ +--generate-test-driver --force-overwrite $(gen): $(out_root)/xsde/xsde $(call include-dep,$(dep)) @@ -47,6 +50,19 @@ $(test): driver := $(driver) $(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) + +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -xsd "$(xsd)" \ +-cxx "$(cxx)" -gen "$(genf)" -opt "$(xsde_options)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/enumeration/makefile b/tests/cxx/parser/enumeration/makefile index 0997aab..91fa48b 100644 --- a/tests/cxx/parser/enumeration/makefile +++ b/tests/cxx/parser/enumeration/makefile @@ -7,6 +7,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make xsd := test.xsd cxx := driver.cxx +hxx := gender.hxx obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=-pskel.o)) dep := $(obj:.o=.o.d) @@ -14,9 +15,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -30,7 +33,7 @@ skelf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) skel := $(addprefix $(out_base)/,$(skelf)) $(skel): xsde := $(out_root)/xsde/xsde -$(skel): xsde_options += --type-map $(src_base)/test.map +$(skel) $(dist) $(dist-win): xsde_options += --type-map $(src_base)/test.map $(skel): $(out_root)/xsde/xsde $(src_base)/test.map @@ -48,6 +51,20 @@ $(test): driver := $(driver) $(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) + +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -xsd "$(xsd)" \ +-cxx "$(cxx)" -hxx "$(hxx)" -gen "$(skelf)" -opt "$(xsde_options)" \ +-out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/error-handling/codes/makefile b/tests/cxx/parser/error-handling/codes/makefile index 370db75..444b46b 100644 --- a/tests/cxx/parser/error-handling/codes/makefile +++ b/tests/cxx/parser/error-handling/codes/makefile @@ -14,9 +14,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -29,8 +31,8 @@ skelf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) skel := $(addprefix $(out_base)/,$(skelf)) $(skel): xsde := $(out_root)/xsde/xsde -$(skel): xsde_options += --no-exceptions --type-map $(src_base)/test.map - +$(skel) $(dist) $(dist-win): xsde_options += --no-exceptions \ +--type-map $(src_base)/test.map $(skel): $(out_root)/xsde/xsde $(src_base)/test.map $(call include-dep,$(dep)) @@ -46,6 +48,19 @@ $(test): driver := $(driver) $(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) + +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -xsd "$(xsd)" \ +-cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/error-handling/exceptions/makefile b/tests/cxx/parser/error-handling/exceptions/makefile index e1a038c..c347a1e 100644 --- a/tests/cxx/parser/error-handling/exceptions/makefile +++ b/tests/cxx/parser/error-handling/exceptions/makefile @@ -14,9 +14,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -29,8 +31,7 @@ skelf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) skel := $(addprefix $(out_base)/,$(skelf)) $(skel): xsde := $(out_root)/xsde/xsde -$(skel): xsde_options += --type-map $(src_base)/test.map - +$(skel) $(dist) $(dist-win): xsde_options += --type-map $(src_base)/test.map $(skel): $(out_root)/xsde/xsde $(src_base)/test.map @@ -47,6 +48,19 @@ $(test): driver := $(driver) $(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) + +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -xsd "$(xsd)" \ +-cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/error-handling/makefile b/tests/cxx/parser/error-handling/makefile index a9eaa6f..739e16f 100644 --- a/tests/cxx/parser/error-handling/makefile +++ b/tests/cxx/parser/error-handling/makefile @@ -5,18 +5,31 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make +# NOTE: remember to update dist/tests/cxx/parser/error-handling/{makefile, +# nmakefile} if you change anything here. +# + +all_tests := codes exceptions + ifeq ($(xsde_exceptions),y) -tests := exceptions +build_tests := exceptions else -tests := codes +build_tests := codes endif default := $(out_base)/ test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win clean := $(out_base)/.clean -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) +$(default): $(addprefix $(out_base)/,$(addsuffix /,$(build_tests))) +$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(build_tests))) +$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_tests))) +$(dist-win): $(addprefix $(out_base)/,$(addsuffix /.dist-win,$(all_tests))) -$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) +ifneq ($(filter $(MAKECMDGOALS),dist dist-win),) +$(foreach t,$(all_tests),$(call import,$(src_base)/$t/makefile)) +else +$(foreach t,$(build_tests),$(call import,$(src_base)/$t/makefile)) +endif diff --git a/tests/cxx/parser/generated-impl/makefile b/tests/cxx/parser/generated-impl/makefile index 7d5d6f6..aeda4a4 100644 --- a/tests/cxx/parser/generated-impl/makefile +++ b/tests/cxx/parser/generated-impl/makefile @@ -5,6 +5,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make +cxx := xsd := test.xsd obj := $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.o) $(xsd:.xsd=-pimpl.o) $(xsd:.xsd=-pdriver.o)) @@ -13,9 +14,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/$(xsd:.xsd=-pdriver) -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/$(xsd:.xsd=-pdriver) +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -30,8 +33,8 @@ genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) \ gen := $(addprefix $(out_base)/,$(genf)) $(gen): xsde := $(out_root)/xsde/xsde -$(gen): xsde_options += --generate-print-impl --generate-test-driver \ ---force-overwrite +$(gen) $(dist) $(dist-win): xsde_options += --generate-print-impl \ +--generate-test-driver --force-overwrite $(gen): $(out_root)/xsde/xsde $(call include-dep,$(dep)) @@ -47,6 +50,19 @@ $(test): driver := $(driver) $(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) + +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -xsd "$(xsd)" \ +-cxx "$(cxx)" -gen "$(genf)" -opt "$(xsde_options)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/list/makefile b/tests/cxx/parser/list/makefile index e709106..ce422ed 100644 --- a/tests/cxx/parser/list/makefile +++ b/tests/cxx/parser/list/makefile @@ -14,9 +14,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -30,6 +32,7 @@ skel := $(addprefix $(out_base)/,$(skelf)) $(skel): xsde := $(out_root)/xsde/xsde $(skel): $(out_root)/xsde/xsde +$(skel) $(dist) $(dist-win): xsde_options += $(call include-dep,$(dep)) @@ -44,6 +47,19 @@ $(test): driver := $(driver) $(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) + +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -xsd "$(xsd)" \ +-cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/makefile b/tests/cxx/parser/makefile index 1f749df..8b11959 100644 --- a/tests/cxx/parser/makefile +++ b/tests/cxx/parser/makefile @@ -5,19 +5,27 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make -tests := generated-impl duplicate +# NOTE: remember to update dist/tests/cxx/parser/{makefile,nmakefile} if +# you change anything here. +# + +all_tests := generated-impl duplicate built-in recursive test-template \ +union enumeration list polymorphism reset validation error-handling \ +name-clash/inheritance + +build_tests := generated-impl duplicate ifeq ($(xsde_iostream),y) ifeq ($(xsde_exceptions),y) -tests += \ -built-in \ -recursive \ -test-template \ +build_tests += \ +built-in \ +recursive \ +test-template \ union ifeq ($(xsde_reuse_style),tiein) -tests += \ -enumeration \ +build_tests += \ +enumeration \ list endif @@ -25,33 +33,40 @@ endif # exceptions ifeq ($(xsde_polymorphic),y) ifeq ($(xsde_reuse_style),tiein) -tests += polymorphism +build_tests += polymorphism endif endif -tests += reset +build_tests += reset endif # iostream ifeq ($(xsde_parser_validation),y) -tests += validation +build_tests += validation ifeq ($(xsde_iostream),y) -tests += error-handling +build_tests += error-handling ifeq ($(xsde_exceptions),y) -tests += name-clash/inheritance +build_tests += name-clash/inheritance endif endif endif default := $(out_base)/ test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win clean := $(out_base)/.clean -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) +$(default): $(addprefix $(out_base)/,$(addsuffix /,$(build_tests))) +$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(build_tests))) +$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_tests))) +$(dist-win): $(addprefix $(out_base)/,$(addsuffix /.dist-win,$(all_tests))) -$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) +ifneq ($(filter $(MAKECMDGOALS),dist dist-win),) +$(foreach t,$(all_tests),$(call import,$(src_base)/$t/makefile)) +else +$(foreach t,$(build_tests),$(call import,$(src_base)/$t/makefile)) +endif diff --git a/tests/cxx/parser/name-clash/inheritance/makefile b/tests/cxx/parser/name-clash/inheritance/makefile index 56599cd..04127c4 100644 --- a/tests/cxx/parser/name-clash/inheritance/makefile +++ b/tests/cxx/parser/name-clash/inheritance/makefile @@ -14,9 +14,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -30,6 +32,7 @@ skel := $(addprefix $(out_base)/,$(skelf)) $(skel): xsde := $(out_root)/xsde/xsde $(skel): $(out_root)/xsde/xsde +$(skel) $(dist) $(dist-win): xsde_options += $(call include-dep,$(dep)) @@ -44,6 +47,19 @@ $(test): driver := $(driver) $(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) + +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -xsd "$(xsd)" \ +-cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/polymorphism/makefile b/tests/cxx/parser/polymorphism/makefile index e60f68e..14249b7 100644 --- a/tests/cxx/parser/polymorphism/makefile +++ b/tests/cxx/parser/polymorphism/makefile @@ -14,9 +14,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -29,8 +31,8 @@ skelf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) skel := $(addprefix $(out_base)/,$(skelf)) $(skel): xsde := $(out_root)/xsde/xsde -$(skel): xsde_options += --generate-polymorphic $(skel): $(out_root)/xsde/xsde +$(skel) $(dist) $(dist-win): xsde_options += --generate-polymorphic $(call include-dep,$(dep)) @@ -45,6 +47,19 @@ $(test): driver := $(driver) $(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) + +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -xsd "$(xsd)" \ +-cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/recursive/makefile b/tests/cxx/parser/recursive/makefile index 722bae6..a56168f 100644 --- a/tests/cxx/parser/recursive/makefile +++ b/tests/cxx/parser/recursive/makefile @@ -14,9 +14,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -30,6 +32,7 @@ skel := $(addprefix $(out_base)/,$(skelf)) $(skel): xsde := $(out_root)/xsde/xsde $(skel): $(out_root)/xsde/xsde +$(skel) $(dist) $(dist-win): xsde_options += $(call include-dep,$(dep)) @@ -45,6 +48,18 @@ $(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -xsd "$(xsd)" \ +-cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/reset/makefile b/tests/cxx/parser/reset/makefile index a89ff92..1453430 100644 --- a/tests/cxx/parser/reset/makefile +++ b/tests/cxx/parser/reset/makefile @@ -16,9 +16,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -32,6 +34,7 @@ skel := $(addprefix $(out_base)/,$(skelf)) $(skel): xsde := $(out_root)/xsde/xsde $(skel): $(out_root)/xsde/xsde +$(skel) $(dist) $(dist-win): xsde_options += $(call include-dep,$(dep)) @@ -52,6 +55,18 @@ $(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src $(call message,test $(out_base)/$*,$(driver) $(src_base)/test-$*.xml | diff -u $(src_base)/test-$*.std -) +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -xsd "$(xsd)" \ +-cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/test-template/makefile b/tests/cxx/parser/test-template/makefile index 3d95a16..f5b3846 100644 --- a/tests/cxx/parser/test-template/makefile +++ b/tests/cxx/parser/test-template/makefile @@ -14,9 +14,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -30,6 +32,7 @@ skel := $(addprefix $(out_base)/,$(skelf)) $(skel): xsde := $(out_root)/xsde/xsde $(skel): $(out_root)/xsde/xsde +$(skel) $(dist) $(dist-win): xsde_options += $(call include-dep,$(dep)) @@ -44,6 +47,19 @@ $(test): driver := $(driver) $(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) + +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -xsd "$(xsd)" \ +-cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/union/makefile b/tests/cxx/parser/union/makefile index 42a14e7..35351ed 100644 --- a/tests/cxx/parser/union/makefile +++ b/tests/cxx/parser/union/makefile @@ -14,9 +14,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -30,6 +32,7 @@ skel := $(addprefix $(out_base)/,$(skelf)) $(skel): xsde := $(out_root)/xsde/xsde $(skel): $(out_root)/xsde/xsde +$(skel) $(dist) $(dist-win): xsde_options += $(call include-dep,$(dep)) @@ -44,6 +47,19 @@ $(test): driver := $(driver) $(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) + +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -xsd "$(xsd)" \ +-cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/validation/all/makefile b/tests/cxx/parser/validation/all/makefile index c16798c..bd73f30 100644 --- a/tests/cxx/parser/validation/all/makefile +++ b/tests/cxx/parser/validation/all/makefile @@ -16,9 +16,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -32,6 +34,7 @@ skel := $(addprefix $(out_base)/,$(skelf)) $(skel): xsde := $(out_root)/xsde/xsde $(skel): $(out_root)/xsde/xsde +$(skel) $(dist) $(dist-win): xsde_options += $(call include-dep,$(dep)) @@ -53,6 +56,18 @@ $(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src $(call message,test $(out_base)/$*,$(driver) $(src_base)/test-$*.xml | diff -u $(src_base)/test-$*.std -) +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -xsd "$(xsd)" \ +-cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/validation/any/makefile b/tests/cxx/parser/validation/any/makefile index ffd3d07..11f3017 100644 --- a/tests/cxx/parser/validation/any/makefile +++ b/tests/cxx/parser/validation/any/makefile @@ -16,9 +16,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -32,6 +34,7 @@ skel := $(addprefix $(out_base)/,$(skelf)) $(skel): xsde := $(out_root)/xsde/xsde $(skel): $(out_root)/xsde/xsde +$(skel) $(dist) $(dist-win): xsde_options += $(call include-dep,$(dep)) @@ -53,6 +56,18 @@ $(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src $(call message,test $(out_base)/$*,$(driver) $(src_base)/test-$*.xml | diff -u $(src_base)/test-$*.std -) +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -xsd "$(xsd)" \ +-cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/validation/attribute/makefile b/tests/cxx/parser/validation/attribute/makefile index 078ed49..58b13d6 100644 --- a/tests/cxx/parser/validation/attribute/makefile +++ b/tests/cxx/parser/validation/attribute/makefile @@ -14,9 +14,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -30,6 +32,7 @@ skel := $(addprefix $(out_base)/,$(skelf)) $(skel): xsde := $(out_root)/xsde/xsde $(skel): $(out_root)/xsde/xsde +$(skel) $(dist) $(dist-win): xsde_options += $(call include-dep,$(dep)) @@ -44,6 +47,19 @@ $(test): driver := $(driver) $(test): $(driver) $(src_base)/test-000.xml $(src_base)/test-000.std $(call message,test $$1,$$1 $(src_base)/test-000.xml | diff -u $(src_base)/test-000.std -,$(driver)) + +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -xsd "$(xsd)" \ +-cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/validation/built-in/any-type/makefile b/tests/cxx/parser/validation/built-in/any-type/makefile index a96c8b7..b76f236 100644 --- a/tests/cxx/parser/validation/built-in/any-type/makefile +++ b/tests/cxx/parser/validation/built-in/any-type/makefile @@ -16,9 +16,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -32,6 +34,7 @@ skel := $(addprefix $(out_base)/,$(skelf)) $(skel): xsde := $(out_root)/xsde/xsde $(skel): $(out_root)/xsde/xsde +$(skel) $(dist) $(dist-win): xsde_options += $(call include-dep,$(dep)) @@ -53,6 +56,18 @@ $(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src $(call message,test $(out_base)/$*,$(driver) $(src_base)/test-$*.xml | diff -u $(src_base)/test-$*.std -) +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -xsd "$(xsd)" \ +-cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/validation/built-in/binary/makefile b/tests/cxx/parser/validation/built-in/binary/makefile index 4157bd0..8693be4 100644 --- a/tests/cxx/parser/validation/built-in/binary/makefile +++ b/tests/cxx/parser/validation/built-in/binary/makefile @@ -13,9 +13,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -37,6 +39,18 @@ $(test): driver := $(driver) $(test): $(driver) $(call message,test $$1,$$1,$(driver)) + +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cxx "$(cxx)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/validation/built-in/boolean/makefile b/tests/cxx/parser/validation/built-in/boolean/makefile index 46adc3d..a4a7b2b 100644 --- a/tests/cxx/parser/validation/built-in/boolean/makefile +++ b/tests/cxx/parser/validation/built-in/boolean/makefile @@ -13,9 +13,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -37,6 +39,18 @@ $(test): driver := $(driver) $(test): $(driver) $(call message,test $$1,$$1,$(driver)) + +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cxx "$(cxx)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/validation/built-in/byte/makefile b/tests/cxx/parser/validation/built-in/byte/makefile index 02e2641..265d7cd 100644 --- a/tests/cxx/parser/validation/built-in/byte/makefile +++ b/tests/cxx/parser/validation/built-in/byte/makefile @@ -13,9 +13,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -37,6 +39,18 @@ $(test): driver := $(driver) $(test): $(driver) $(call message,test $$1,$$1,$(driver)) + +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cxx "$(cxx)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/validation/built-in/date-time/makefile b/tests/cxx/parser/validation/built-in/date-time/makefile index 00bceae..6fc6389 100644 --- a/tests/cxx/parser/validation/built-in/date-time/makefile +++ b/tests/cxx/parser/validation/built-in/date-time/makefile @@ -13,9 +13,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -37,6 +39,17 @@ $(test): driver := $(driver) $(test): $(driver) $(call message,test $$1,$$1,$(driver)) +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cxx "$(cxx)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/validation/built-in/float/makefile b/tests/cxx/parser/validation/built-in/float/makefile index c24330e..3668966 100644 --- a/tests/cxx/parser/validation/built-in/float/makefile +++ b/tests/cxx/parser/validation/built-in/float/makefile @@ -13,9 +13,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -37,6 +39,18 @@ $(test): driver := $(driver) $(test): $(driver) $(call message,test $$1,$$1,$(driver)) + +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cxx "$(cxx)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/validation/built-in/int/makefile b/tests/cxx/parser/validation/built-in/int/makefile index 9ab788d..999250c 100644 --- a/tests/cxx/parser/validation/built-in/int/makefile +++ b/tests/cxx/parser/validation/built-in/int/makefile @@ -13,9 +13,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -37,6 +39,18 @@ $(test): driver := $(driver) $(test): $(driver) $(call message,test $$1,$$1,$(driver)) + +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cxx "$(cxx)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/validation/built-in/integer/makefile b/tests/cxx/parser/validation/built-in/integer/makefile index d89e2f5..ce75af2 100644 --- a/tests/cxx/parser/validation/built-in/integer/makefile +++ b/tests/cxx/parser/validation/built-in/integer/makefile @@ -13,9 +13,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -37,6 +39,18 @@ $(test): driver := $(driver) $(test): $(driver) $(call message,test $$1,$$1,$(driver)) + +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cxx "$(cxx)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/validation/built-in/long-long/makefile b/tests/cxx/parser/validation/built-in/long-long/makefile index c973217..aa4939f 100644 --- a/tests/cxx/parser/validation/built-in/long-long/makefile +++ b/tests/cxx/parser/validation/built-in/long-long/makefile @@ -13,9 +13,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -37,6 +39,18 @@ $(test): driver := $(driver) $(test): $(driver) $(call message,test $$1,$$1,$(driver)) + +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cxx "$(cxx)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/validation/built-in/long/makefile b/tests/cxx/parser/validation/built-in/long/makefile index 2e63122..9816c09 100644 --- a/tests/cxx/parser/validation/built-in/long/makefile +++ b/tests/cxx/parser/validation/built-in/long/makefile @@ -13,9 +13,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -37,6 +39,18 @@ $(test): driver := $(driver) $(test): $(driver) $(call message,test $$1,$$1,$(driver)) + +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cxx "$(cxx)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/validation/built-in/makefile b/tests/cxx/parser/validation/built-in/makefile index b5bbc4f..4c8638f 100644 --- a/tests/cxx/parser/validation/built-in/makefile +++ b/tests/cxx/parser/validation/built-in/makefile @@ -5,29 +5,43 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make -tests := binary boolean byte date-time float int integer qname short \ +# NOTE: remember to update dist/tests/cxx/parser/validation/built-in/ +# {makefile,nmakefile} if you change anything here. +# + +all_tests := binary boolean byte date-time float int integer qname short \ +string uri any-type long long-long + +build_tests := binary boolean byte date-time float int integer qname short \ string uri ifeq ($(xsde_iostream),y) ifeq ($(xsde_exceptions),y) ifeq ($(xsde_reuse_style),tiein) -tests += any-type +build_tests += any-type endif endif endif ifeq ($(xsde_longlong),y) -tests += long-long +build_tests += long-long else -tests += long +build_tests += long endif default := $(out_base)/ test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win clean := $(out_base)/.clean -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) +$(default): $(addprefix $(out_base)/,$(addsuffix /,$(build_tests))) +$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(build_tests))) +$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_tests))) +$(dist-win): $(addprefix $(out_base)/,$(addsuffix /.dist-win,$(all_tests))) -$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) +ifneq ($(filter $(MAKECMDGOALS),dist dist-win),) +$(foreach t,$(all_tests),$(call import,$(src_base)/$t/makefile)) +else +$(foreach t,$(build_tests),$(call import,$(src_base)/$t/makefile)) +endif diff --git a/tests/cxx/parser/validation/built-in/qname/makefile b/tests/cxx/parser/validation/built-in/qname/makefile index e63b9cd..43ff0f6 100644 --- a/tests/cxx/parser/validation/built-in/qname/makefile +++ b/tests/cxx/parser/validation/built-in/qname/makefile @@ -13,9 +13,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -37,6 +39,18 @@ $(test): driver := $(driver) $(test): $(driver) $(call message,test $$1,$$1,$(driver)) + +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cxx "$(cxx)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/validation/built-in/short/makefile b/tests/cxx/parser/validation/built-in/short/makefile index 5a0ae6e..115b462 100644 --- a/tests/cxx/parser/validation/built-in/short/makefile +++ b/tests/cxx/parser/validation/built-in/short/makefile @@ -13,9 +13,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -37,6 +39,18 @@ $(test): driver := $(driver) $(test): $(driver) $(call message,test $$1,$$1,$(driver)) + +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cxx "$(cxx)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/validation/built-in/string/makefile b/tests/cxx/parser/validation/built-in/string/makefile index 0480486..be94ea0 100644 --- a/tests/cxx/parser/validation/built-in/string/makefile +++ b/tests/cxx/parser/validation/built-in/string/makefile @@ -13,9 +13,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -37,6 +39,18 @@ $(test): driver := $(driver) $(test): $(driver) $(call message,test $$1,$$1,$(driver)) + +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cxx "$(cxx)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/validation/built-in/uri/makefile b/tests/cxx/parser/validation/built-in/uri/makefile index 2507214..d71acf9 100644 --- a/tests/cxx/parser/validation/built-in/uri/makefile +++ b/tests/cxx/parser/validation/built-in/uri/makefile @@ -13,9 +13,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -37,6 +39,18 @@ $(test): driver := $(driver) $(test): $(driver) $(call message,test $$1,$$1,$(driver)) + +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cxx "$(cxx)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/validation/choice/makefile b/tests/cxx/parser/validation/choice/makefile index 3ef5134..3e13095 100644 --- a/tests/cxx/parser/validation/choice/makefile +++ b/tests/cxx/parser/validation/choice/makefile @@ -16,9 +16,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -32,6 +34,7 @@ skel := $(addprefix $(out_base)/,$(skelf)) $(skel): xsde := $(out_root)/xsde/xsde $(skel): $(out_root)/xsde/xsde +$(skel) $(dist) $(dist-win): xsde_options += $(call include-dep,$(dep)) @@ -52,6 +55,18 @@ $(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src $(call message,test $(out_base)/$*,$(driver) $(src_base)/test-$*.xml | diff -u $(src_base)/test-$*.std -) +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -xsd "$(xsd)" \ +-cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/validation/makefile b/tests/cxx/parser/validation/makefile index 52ce503..9f674cd 100644 --- a/tests/cxx/parser/validation/makefile +++ b/tests/cxx/parser/validation/makefile @@ -5,20 +5,33 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make -tests := built-in +# NOTE: remember to update dist/tests/cxx/parser/validation/{makefile, +# nmakefile} if you change anything here. +# + +all_tests := built-in all any attribute choice restriction sequence + +build_tests := built-in ifeq ($(xsde_iostream),y) ifeq ($(xsde_exceptions),y) -tests += all any attribute choice restriction sequence +build_tests += all any attribute choice restriction sequence endif endif default := $(out_base)/ test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win clean := $(out_base)/.clean -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) +$(default): $(addprefix $(out_base)/,$(addsuffix /,$(build_tests))) +$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(build_tests))) +$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_tests))) +$(dist-win): $(addprefix $(out_base)/,$(addsuffix /.dist-win,$(all_tests))) -$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) +ifneq ($(filter $(MAKECMDGOALS),dist dist-win),) +$(foreach t,$(all_tests),$(call import,$(src_base)/$t/makefile)) +else +$(foreach t,$(build_tests),$(call import,$(src_base)/$t/makefile)) +endif diff --git a/tests/cxx/parser/validation/restriction/makefile b/tests/cxx/parser/validation/restriction/makefile index 33b6b03..0b73790 100644 --- a/tests/cxx/parser/validation/restriction/makefile +++ b/tests/cxx/parser/validation/restriction/makefile @@ -16,9 +16,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -32,6 +34,7 @@ skel := $(addprefix $(out_base)/,$(skelf)) $(skel): xsde := $(out_root)/xsde/xsde $(skel): $(out_root)/xsde/xsde +$(skel) $(dist) $(dist-win): xsde_options += $(call include-dep,$(dep)) @@ -52,6 +55,18 @@ $(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src $(call message,test $(out_base)/$*,$(driver) $(src_base)/test-$*.xml | diff -u $(src_base)/test-$*.std -) +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -xsd "$(xsd)" \ +-cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ diff --git a/tests/cxx/parser/validation/sequence/makefile b/tests/cxx/parser/validation/sequence/makefile index 1483c97..c86ccbc 100644 --- a/tests/cxx/parser/validation/sequence/makefile +++ b/tests/cxx/parser/validation/sequence/makefile @@ -16,9 +16,11 @@ dep := $(obj:.o=.o.d) xsde.l := $(out_root)/libxsde/xsde/xsde.l xsde.l.cpp-options := $(out_root)/libxsde/xsde/xsde.l.cpp-options -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean +driver := $(out_base)/driver +test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win +clean := $(out_base)/.clean # Build. @@ -32,6 +34,7 @@ skel := $(addprefix $(out_base)/,$(skelf)) $(skel): xsde := $(out_root)/xsde/xsde $(skel): $(out_root)/xsde/xsde +$(skel) $(dist) $(dist-win): xsde_options += $(call include-dep,$(dep)) @@ -52,6 +55,18 @@ $(out_base)/.test-%: $(driver) $(src_base)/test.xsd $(src_base)/test-%.xml $(src $(call message,test $(out_base)/$*,$(driver) $(src_base)/test-$*.xml | diff -u $(src_base)/test-$*.std -) +# Dist. +# +$(dist) $(dist-win): opt := -src $(src_base) -cmd cxx-parser -xsd "$(xsd)" \ +-cxx "$(cxx)" -gen "$(skelf)" -opt "$(xsde_options)" -out $(dist_prefix) + +$(dist): + $(call message,install $(src_base),$(scf_root)/dist $(opt)) + +$(dist-win): + $(call message,install $(src_base),$(scf_root)/dist -win $(opt)) + + # Clean. # $(clean): $(driver).o.clean \ |