Add tests to the distribution

The distribution makefiles for tests are automatically generated by
the build/dist script. nmakefiles are not yet generated.

3 files changed, 58 insertions, 16 deletions

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