Generate xsd+rng in target directory

3 files changed, 34 insertions, 32 deletions

diff --git a/config-model/src/main/Makefile b/config-model/src/main/Makefile
index b1c37f4889f..f63f7dd832f 100644
--- a/config-model/src/main/Makefile
+++ b/config-model/src/main/Makefile
@@ -1,42 +1,46 @@
 # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#all: services.xsd hosts.xsd
+
+srcdir=resources/schema
+outputdir=../../target/generated-sources/trang/resources/schema
 
 trangjar=../../target/trang.jar
 
-all: resources/schema/services.rng resources/schema/hosts.rng resources/schema/container-include.rng resources/schema/services.xsd resources/schema/hosts.xsd resources/schema/container-include.xsd resources/schema/deployment.xsd
+all: ${outputdir} ${outputdir}/services.rng ${outputdir}/hosts.rng ${outputdir}/container-include.rng ${outputdir}/services.xsd ${outputdir}/hosts.xsd ${outputdir}/container-include.xsd ${outputdir}/deployment.xsd
+
+${outputdir}:
+	mkdir -p ${outputdir}
 
-resources/schema/services.rng: resources/schema/services.rnc resources/schema/common.rnc resources/schema/admin.rnc resources/schema/clients.rnc resources/schema/docproc.rnc resources/schema/routing.rnc resources/schema/clients-v2.rnc resources/schema/content.rnc resources/schema/genericmodule.rnc resources/schema/legacygenericcluster.rnc resources/schema/genericcluster.rnc resources/schema/legacygenericmodule.rnc resources/schema/containercluster.rnc
-	java -jar $(trangjar) -I rnc -O rng resources/schema/services.rnc resources/schema/services.rng
+${outputdir}/services.rng: ${srcdir}/services.rnc ${srcdir}/common.rnc ${srcdir}/admin.rnc ${srcdir}/clients.rnc ${srcdir}/docproc.rnc ${srcdir}/routing.rnc ${srcdir}/clients-v2.rnc ${srcdir}/content.rnc ${srcdir}/genericmodule.rnc ${srcdir}/legacygenericcluster.rnc ${srcdir}/genericcluster.rnc ${srcdir}/legacygenericmodule.rnc ${srcdir}/containercluster.rnc
+	java -jar $(trangjar) -I rnc -O rng ${srcdir}/services.rnc ${outputdir}/services.rng
 
-resources/schema/services.xsd: resources/schema/services.rng
-	java -jar $(trangjar) -I rng -O xsd resources/schema/services.rng resources/schema/services.xsd
+${outputdir}/services.xsd: ${outputdir}/services.rng
+	java -jar $(trangjar) -I rng -O xsd ${outputdir}/services.rng ${outputdir}/services.xsd
 
 
-resources/schema/container-include.rng: resources/schema/common.rnc resources/schema/containercluster.rnc
-	java -jar $(trangjar) -I rnc -O rng resources/schema/container-include.rnc resources/schema/container-include.rng
+${outputdir}/container-include.rng: ${srcdir}/common.rnc ${srcdir}/containercluster.rnc
+	java -jar $(trangjar) -I rnc -O rng ${srcdir}/container-include.rnc ${outputdir}/container-include.rng
 
-resources/schema/container-include.xsd: resources/schema/container-include.rng
-	java -jar $(trangjar) -I rng -O xsd resources/schema/container-include.rng resources/schema/container-include.xsd
+${outputdir}/container-include.xsd: ${outputdir}/container-include.rng
+	java -jar $(trangjar) -I rng -O xsd ${outputdir}/container-include.rng ${outputdir}/container-include.xsd
 
 
-resources/schema/hosts.rng: resources/schema/hosts.rnc
-	java -jar $(trangjar) -I rnc -O rng resources/schema/hosts.rnc resources/schema/hosts.rng
+${outputdir}/hosts.rng: ${srcdir}/hosts.rnc
+	java -jar $(trangjar) -I rnc -O rng ${srcdir}/hosts.rnc ${outputdir}/hosts.rng
 
-resources/schema/hosts.xsd: resources/schema/hosts.rng
-	java -jar $(trangjar) -I rng -O xsd resources/schema/hosts.rng resources/schema/hosts.xsd
+${outputdir}/hosts.xsd: ${outputdir}/hosts.rng
+	java -jar $(trangjar) -I rng -O xsd ${outputdir}/hosts.rng ${outputdir}/hosts.xsd
 
-resources/schema/deployment.rng: resources/schema/deployment.rnc
-	java -jar $(trangjar) -I rnc -O rng resources/schema/deployment.rnc resources/schema/deployment.rng
+${outputdir}/deployment.rng: ${srcdir}/deployment.rnc
+	java -jar $(trangjar) -I rnc -O rng ${srcdir}/deployment.rnc ${outputdir}/deployment.rng
 
-resources/schema/deployment.xsd: resources/schema/deployment.rng
-	java -jar $(trangjar) -I rng -O xsd resources/schema/deployment.rng resources/schema/deployment.xsd
+${outputdir}/deployment.xsd: ${outputdir}/deployment.rng
+	java -jar $(trangjar) -I rng -O xsd ${outputdir}/deployment.rng ${outputdir}/deployment.xsd
 
-resources/schema/validation-overrides.rng: resources/schema/validation-overrides.rnc
-	java -jar $(trangjar) -I rnc -O rng resources/schema/validation-overrides.rnc resources/schema/validation-overrides.rng
+${outputdir}/validation-overrides.rng: ${srcdir}/validation-overrides.rnc
+	java -jar $(trangjar) -I rnc -O rng ${srcdir}/validation-overrides.rnc ${outputdir}/validation-overrides.rng
 
-resources/schema/deployment.xsd: resources/schema/validation-overrides.rng
-	java -jar $(trangjar) -I rng -O xsd resources/schema/validation-overrides.rng resources/schema/validation-overrides.xsd
+${outputdir}/deployment.xsd: ${outputdir}/validation-overrides.rng
+	java -jar $(trangjar) -I rng -O xsd ${outputdir}/validation-overrides.rng ${outputdir}/validation-overrides.xsd
 
 clean:
-	rm -f resources/schema/*.rng
-	rm -f resources/schema/*.xsd
+	rm -rf ${outputdir}
diff --git a/config-model/src/main/resources/schema/.gitignore b/config-model/src/main/resources/schema/.gitignore
deleted file mode 100644
index b60c856f91a..00000000000
--- a/config-model/src/main/resources/schema/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.rng
-*.xsd
diff --git a/config-model/src/test/sh/test-schema.sh b/config-model/src/test/sh/test-schema.sh
index 18d35f2fbf6..eded82c9205 100755
--- a/config-model/src/test/sh/test-schema.sh
+++ b/config-model/src/test/sh/test-schema.sh
@@ -8,26 +8,26 @@ popd
 jar="target/jing.jar"
 mainclass="com/thaiopensource/relaxng/util/Driver"
 
-cmd="java -jar $jar src/main/resources/schema/services.rng src/test/schema-test-files/services.xml"
+cmd="java -jar $jar target/generated-sources/trang/resources/schema/services.rng src/test/schema-test-files/services.xml"
 echo $cmd
 $cmd
 
-cmd="java -jar $jar src/main/resources/schema/services.rng src/test/schema-test-files/standalone-container.xml"
+cmd="java -jar $jar target/generated-sources/trang/resources/schema/services.rng src/test/schema-test-files/standalone-container.xml"
 echo $cmd
 $cmd
 
-cmd="java -jar $jar src/main/resources/schema/services.rng src/test/schema-test-files/services-hosted.xml"
+cmd="java -jar $jar target/generated-sources/trang/resources/schema/services.rng src/test/schema-test-files/services-hosted.xml"
 echo $cmd
 $cmd
 
-cmd="java -jar $jar src/main/resources/schema/services.rng src/test/schema-test-files/services-hosted-infrastructure.xml"
+cmd="java -jar $jar target/generated-sources/trang/resources/schema/services.rng src/test/schema-test-files/services-hosted-infrastructure.xml"
 echo $cmd
 $cmd
 
-cmd="java -jar $jar src/main/resources/schema/deployment.rng src/test/schema-test-files/deployment.xml"
+cmd="java -jar $jar target/generated-sources/trang/resources/schema/deployment.rng src/test/schema-test-files/deployment.xml"
 echo $cmd
 $cmd
 
-cmd="java -jar $jar src/main/resources/schema/validation-overrides.rng src/test/schema-test-files/validation-overrides.xml"
+cmd="java -jar $jar target/generated-sources/trang/resources/schema/validation-overrides.rng src/test/schema-test-files/validation-overrides.xml"
 echo $cmd
 $cmd