From ed7be57e6e70220b06fcd77ca91c4abc09dddabc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= Date: Tue, 12 Jan 2016 10:38:53 +0100 Subject: [PATCH] Fixed Makefile target to build data structures A change in kiwi/schema/kiwi.rnc triggers the build of the schema rng version as well as an auto update of the data structures via python's generateDS. The intermediate xsd schema format is only relevant for the data structure creation process --- Makefile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 41c542f1..9f360374 100644 --- a/Makefile +++ b/Makefile @@ -30,17 +30,14 @@ list_tests: %.py: nosetests $@ -kiwi/xml_parse.py: kiwi/schema/kiwi.xsd - # XML parser code is auto generated from schema using generateDS - # http://pythonhosted.org/generateDS - generateDS.py --external-encoding='utf-8' \ - -o kiwi/xml_parse.py kiwi/schema/kiwi.xsd - -kiwi/schema/kiwi.xsd: kiwi/schema/kiwi.rnc - trang -I rnc -O xsd kiwi/schema/kiwi.rnc kiwi/schema/kiwi.xsd - kiwi/schema/kiwi.rng: kiwi/schema/kiwi.rnc trang -I rnc -O rng kiwi/schema/kiwi.rnc kiwi/schema/kiwi.rng + trang -I rnc -O xsd kiwi/schema/kiwi.rnc kiwi/schema/kiwi.xsd + # XML parser code is auto generated from schema using generateDS + # http://pythonhosted.org/generateDS + generateDS.py -f --external-encoding='utf-8' \ + -o kiwi/xml_parse.py kiwi/schema/kiwi.xsd + rm kiwi/schema/kiwi.xsd tools_bin: mkdir -p tools_bin