From c34af468acc94691d0a5954eae38a89506bc620e Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 17 Sep 2009 18:56:22 +0200 Subject: Generate .gitignore in compiler, test and example makefiles --- examples/cxx/parser/generated/makefile | 26 ++++++++++++++++++++------ examples/cxx/parser/hello/makefile | 20 +++++++++++++++----- examples/cxx/parser/library/makefile | 22 ++++++++++++++++------ examples/cxx/parser/mixed/makefile | 22 ++++++++++++++++------ examples/cxx/parser/mixin/makefile | 22 ++++++++++++++++------ examples/cxx/parser/multiroot/makefile | 22 ++++++++++++++++------ examples/cxx/parser/performance/makefile | 22 ++++++++++++++++------ examples/cxx/parser/polymorphism/makefile | 22 ++++++++++++++++------ examples/cxx/parser/polyroot/makefile | 22 ++++++++++++++++------ examples/cxx/parser/wildcard/makefile | 20 +++++++++++++++----- 10 files changed, 162 insertions(+), 58 deletions(-) (limited to 'examples/cxx/parser') diff --git a/examples/cxx/parser/generated/makefile b/examples/cxx/parser/generated/makefile index 04d5831..031e59e 100644 --- a/examples/cxx/parser/generated/makefile +++ b/examples/cxx/parser/generated/makefile @@ -26,12 +26,15 @@ $(driver): $(obj) $(xerces_c.l) $(obj) $(dep): cpp_options := -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) -gen := $(out_base)/$(xsd:.xsd=-pskel.hxx) \ - $(out_base)/$(xsd:.xsd=-pskel.ixx) \ - $(out_base)/$(xsd:.xsd=-pskel.cxx) \ - $(out_base)/$(xsd:.xsd=-pimpl.hxx) \ - $(out_base)/$(xsd:.xsd=-pimpl.cxx) \ - $(out_base)/$(xsd:.xsd=-driver.cxx) +genf := $(xsd:.xsd=-pskel.hxx) \ + $(xsd:.xsd=-pskel.ixx) \ + $(xsd:.xsd=-pskel.cxx) \ + $(xsd:.xsd=-pimpl.hxx) \ + $(xsd:.xsd=-pimpl.cxx) \ + $(xsd:.xsd=-driver.cxx) + +gen := $(addprefix $(out_base)/,$(genf)) + $(gen): xsd := $(out_root)/xsd/xsd $(gen): xsd_options := --generate-print-impl --generate-test-driver \ @@ -56,6 +59,17 @@ $(clean): $(driver).o.clean \ $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) \ $(addprefix $(out_base)/,$(xsd:.xsd=-pimpl.cxx.xsd.clean)) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := $(xsd:.xsd=-driver) $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/parser/hello/makefile b/examples/cxx/parser/hello/makefile index cfcee47..48f39d2 100644 --- a/examples/cxx/parser/hello/makefile +++ b/examples/cxx/parser/hello/makefile @@ -29,12 +29,11 @@ $(driver): $(obj) $(xerces_c.l) $(obj) $(dep): cpp_options := -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) -skel := $(out_base)/$(xsd:.xsd=-pskel.hxx) \ - $(out_base)/$(xsd:.xsd=-pskel.ixx) \ - $(out_base)/$(xsd:.xsd=-pskel.cxx) +genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) +gen := $(addprefix $(out_base)/,$(genf)) -$(skel): xsd := $(out_root)/xsd/xsd -$(skel): $(out_root)/xsd/xsd +$(gen): xsd := $(out_root)/xsd/xsd +$(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep)) @@ -53,6 +52,17 @@ $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(dep)) \ $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/parser/library/makefile b/examples/cxx/parser/library/makefile index c7f06c4..0d88942 100644 --- a/examples/cxx/parser/library/makefile +++ b/examples/cxx/parser/library/makefile @@ -29,13 +29,12 @@ $(driver): $(obj) $(xerces_c.l) $(obj) $(dep): cpp_options := -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) -skel := $(out_base)/$(xsd:.xsd=-pskel.hxx) \ - $(out_base)/$(xsd:.xsd=-pskel.ixx) \ - $(out_base)/$(xsd:.xsd=-pskel.cxx) +genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) +gen := $(addprefix $(out_base)/,$(genf)) -$(skel): xsd := $(out_root)/xsd/xsd -$(skel): xsd_options := --generate-inline --type-map $(src_base)/library.map -$(skel): $(out_root)/xsd/xsd $(src_base)/library.map +$(gen): xsd := $(out_root)/xsd/xsd +$(gen): xsd_options := --generate-inline --type-map $(src_base)/library.map +$(gen): $(out_root)/xsd/xsd $(src_base)/library.map $(call include-dep,$(dep)) @@ -54,6 +53,17 @@ $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(dep)) \ $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/parser/mixed/makefile b/examples/cxx/parser/mixed/makefile index 642e203..5da80ee 100644 --- a/examples/cxx/parser/mixed/makefile +++ b/examples/cxx/parser/mixed/makefile @@ -29,13 +29,12 @@ $(driver): $(obj) $(xerces_c.l) $(obj) $(dep): cpp_options := -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) -skel := $(out_base)/$(xsd:.xsd=-pskel.hxx) \ - $(out_base)/$(xsd:.xsd=-pskel.ixx) \ - $(out_base)/$(xsd:.xsd=-pskel.cxx) +genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) +gen := $(addprefix $(out_base)/,$(genf)) -$(skel): xsd := $(out_root)/xsd/xsd -$(skel): xsd_options := --type-map $(src_base)/text.map -$(skel): $(out_root)/xsd/xsd $(src_base)/text.map +$(gen): xsd := $(out_root)/xsd/xsd +$(gen): xsd_options := --type-map $(src_base)/text.map +$(gen): $(out_root)/xsd/xsd $(src_base)/text.map $(call include-dep,$(dep)) @@ -54,6 +53,17 @@ $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(dep)) \ $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/parser/mixin/makefile b/examples/cxx/parser/mixin/makefile index 91030be..104db00 100644 --- a/examples/cxx/parser/mixin/makefile +++ b/examples/cxx/parser/mixin/makefile @@ -29,13 +29,12 @@ $(driver): $(obj) $(xerces_c.l) $(obj) $(dep): cpp_options := -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) -skel := $(out_base)/$(xsd:.xsd=-pskel.hxx) \ - $(out_base)/$(xsd:.xsd=-pskel.ixx) \ - $(out_base)/$(xsd:.xsd=-pskel.cxx) +genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) +gen := $(addprefix $(out_base)/,$(genf)) -$(skel): xsd := $(out_root)/xsd/xsd -$(skel): xsd_options := --type-map $(src_base)/schema.map -$(skel): $(out_root)/xsd/xsd $(src_base)/schema.map +$(gen): xsd := $(out_root)/xsd/xsd +$(gen): xsd_options := --type-map $(src_base)/schema.map +$(gen): $(out_root)/xsd/xsd $(src_base)/schema.map $(call include-dep,$(dep)) @@ -54,6 +53,17 @@ $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(dep)) \ $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/parser/multiroot/makefile b/examples/cxx/parser/multiroot/makefile index cfe4fba..988ecbf 100644 --- a/examples/cxx/parser/multiroot/makefile +++ b/examples/cxx/parser/multiroot/makefile @@ -29,13 +29,12 @@ $(driver): $(obj) $(xerces_c.l) $(obj) $(dep): cpp_options := -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) -skel := $(out_base)/$(xsd:.xsd=-pskel.hxx) \ - $(out_base)/$(xsd:.xsd=-pskel.ixx) \ - $(out_base)/$(xsd:.xsd=-pskel.cxx) +genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) +gen := $(addprefix $(out_base)/,$(genf)) -$(skel): xsd := $(out_root)/xsd/xsd -$(skel): xsd_options := --type-map $(src_base)/protocol.map -$(skel): $(out_root)/xsd/xsd $(src_base)/protocol.map +$(gen): xsd := $(out_root)/xsd/xsd +$(gen): xsd_options := --type-map $(src_base)/protocol.map +$(gen): $(out_root)/xsd/xsd $(src_base)/protocol.map $(call include-dep,$(dep)) @@ -54,6 +53,17 @@ $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(dep)) \ $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/parser/performance/makefile b/examples/cxx/parser/performance/makefile index 0a67a71..80e0e60 100644 --- a/examples/cxx/parser/performance/makefile +++ b/examples/cxx/parser/performance/makefile @@ -29,13 +29,12 @@ $(driver): $(obj) $(xerces_c.l) $(obj) $(dep): cpp_options := -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) -skel := $(out_base)/$(xsd:.xsd=-pskel.hxx) \ - $(out_base)/$(xsd:.xsd=-pskel.ixx) \ - $(out_base)/$(xsd:.xsd=-pskel.cxx) +genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) +gen := $(addprefix $(out_base)/,$(genf)) -$(skel): xsd := $(out_root)/xsd/xsd -$(skel): xsd_options := --generate-inline -$(skel): $(out_root)/xsd/xsd +$(gen): xsd := $(out_root)/xsd/xsd +$(gen): xsd_options := --generate-inline +$(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep)) @@ -54,6 +53,17 @@ $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(dep)) \ $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/parser/polymorphism/makefile b/examples/cxx/parser/polymorphism/makefile index 2c4054d..f53700b 100644 --- a/examples/cxx/parser/polymorphism/makefile +++ b/examples/cxx/parser/polymorphism/makefile @@ -29,13 +29,12 @@ $(driver): $(obj) $(xerces_c.l) $(obj) $(dep): cpp_options := -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) -skel := $(out_base)/$(xsd:.xsd=-pskel.hxx) \ - $(out_base)/$(xsd:.xsd=-pskel.ixx) \ - $(out_base)/$(xsd:.xsd=-pskel.cxx) +genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) +gen := $(addprefix $(out_base)/,$(genf)) -$(skel): xsd := $(out_root)/xsd/xsd -$(skel): xsd_options := --generate-polymorphic -$(skel): $(out_root)/xsd/xsd +$(gen): xsd := $(out_root)/xsd/xsd +$(gen): xsd_options := --generate-polymorphic +$(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep)) @@ -54,6 +53,17 @@ $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(dep)) \ $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/parser/polyroot/makefile b/examples/cxx/parser/polyroot/makefile index f1d6f08..a62465d 100644 --- a/examples/cxx/parser/polyroot/makefile +++ b/examples/cxx/parser/polyroot/makefile @@ -29,13 +29,12 @@ $(driver): $(obj) $(xerces_c.l) $(obj) $(dep): cpp_options := -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) -skel := $(out_base)/$(xsd:.xsd=-pskel.hxx) \ - $(out_base)/$(xsd:.xsd=-pskel.ixx) \ - $(out_base)/$(xsd:.xsd=-pskel.cxx) +genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) +gen := $(addprefix $(out_base)/,$(genf)) -$(skel): xsd := $(out_root)/xsd/xsd -$(skel): xsd_options := --generate-polymorphic -$(skel): $(out_root)/xsd/xsd +$(gen): xsd := $(out_root)/xsd/xsd +$(gen): xsd_options := --generate-polymorphic +$(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep)) @@ -54,6 +53,17 @@ $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(dep)) \ $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # diff --git a/examples/cxx/parser/wildcard/makefile b/examples/cxx/parser/wildcard/makefile index 0d574ca..7345926 100644 --- a/examples/cxx/parser/wildcard/makefile +++ b/examples/cxx/parser/wildcard/makefile @@ -29,12 +29,11 @@ $(driver): $(obj) $(xerces_c.l) $(obj) $(dep): cpp_options := -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) -skel := $(out_base)/$(xsd:.xsd=-pskel.hxx) \ - $(out_base)/$(xsd:.xsd=-pskel.ixx) \ - $(out_base)/$(xsd:.xsd=-pskel.cxx) +genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) +gen := $(addprefix $(out_base)/,$(genf)) -$(skel): xsd := $(out_root)/xsd/xsd -$(skel): $(out_root)/xsd/xsd +$(gen): xsd := $(out_root)/xsd/xsd +$(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep)) @@ -53,6 +52,17 @@ $(clean): $(driver).o.clean \ $(addsuffix .cxx.clean,$(dep)) \ $(addprefix $(out_base)/,$(xsd:.xsd=-pskel.cxx.xsd.clean)) +# Generated .gitignore. +# +ifeq ($(out_base),$(src_base)) +$(gen): | $(out_base)/.gitignore +$(driver): | $(out_base)/.gitignore + +$(out_base)/.gitignore: files := driver $(genf) +$(clean): $(out_base)/.gitignore.clean + +$(call include,$(bld_root)/git/gitignore.make) +endif # How to. # -- cgit v1.1