Merge pull request #21852 from vespa-engine/arnej/avoid-using-makev7.566.21

replace call to "make" with a simple script

3 files changed, 46 insertions, 47 deletions

diff --git a/config-model/pom.xml b/config-model/pom.xml
index dc7bec27a3b..e50c1177e7e 100644
--- a/config-model/pom.xml
+++ b/config-model/pom.xml
@@ -460,7 +460,7 @@
             </goals>
             <phase>generate-sources</phase>
             <configuration>
-              <executable>make</executable>
+              <executable>./make-xsd-files.sh</executable>
               <workingDirectory>src/main/</workingDirectory>
             </configuration>
           </execution>
diff --git a/config-model/src/main/Makefile b/config-model/src/main/Makefile
deleted file mode 100644
index 7b16bedb4c7..00000000000
--- a/config-model/src/main/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-srcdir=resources/schema
-outputdir=../../target/generated-sources/trang/resources/schema
-
-trangjar=../../target/trang.jar
-
-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}/validation-overrides.xsd
-
-${outputdir}:
-	mkdir -p ${outputdir}
-
-${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}/genericcluster.rnc ${srcdir}/legacygenericmodule.rnc ${srcdir}/containercluster.rnc
-	java -jar $(trangjar) -I rnc -O rng ${srcdir}/services.rnc ${outputdir}/services.rng
-
-${outputdir}/services.xsd: ${outputdir}/services.rng
-	java -jar $(trangjar) -I rng -O xsd ${outputdir}/services.rng ${outputdir}/services.xsd
-
-
-${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
-
-${outputdir}/container-include.xsd: ${outputdir}/container-include.rng
-	java -jar $(trangjar) -I rng -O xsd ${outputdir}/container-include.rng ${outputdir}/container-include.xsd
-
-
-${outputdir}/hosts.rng: ${srcdir}/hosts.rnc
-	java -jar $(trangjar) -I rnc -O rng ${srcdir}/hosts.rnc ${outputdir}/hosts.rng
-
-${outputdir}/hosts.xsd: ${outputdir}/hosts.rng
-	java -jar $(trangjar) -I rng -O xsd ${outputdir}/hosts.rng ${outputdir}/hosts.xsd
-
-${outputdir}/deployment.rng: ${srcdir}/deployment.rnc
-	java -jar $(trangjar) -I rnc -O rng ${srcdir}/deployment.rnc ${outputdir}/deployment.rng
-
-${outputdir}/deployment.xsd: ${outputdir}/deployment.rng
-	java -jar $(trangjar) -I rng -O xsd ${outputdir}/deployment.rng ${outputdir}/deployment.xsd
-
-${outputdir}/validation-overrides.rng: ${srcdir}/validation-overrides.rnc
-	java -jar $(trangjar) -I rnc -O rng ${srcdir}/validation-overrides.rnc ${outputdir}/validation-overrides.rng
-
-${outputdir}/validation-overrides.xsd: ${outputdir}/validation-overrides.rng
-	java -jar $(trangjar) -I rng -O xsd ${outputdir}/validation-overrides.rng ${outputdir}/validation-overrides.xsd
-
-clean:
-	rm -rf ${outputdir}
diff --git a/config-model/src/main/make-xsd-files.sh b/config-model/src/main/make-xsd-files.sh
new file mode 100755
index 00000000000..27057a9599d
--- /dev/null
+++ b/config-model/src/main/make-xsd-files.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+set -e
+
+srcdir=resources/schema
+outputdir=../../target/generated-sources/trang/resources/schema
+
+trangjar=../../target/trang.jar
+
+outputs="services hosts container-include deployment validation-overrides"
+
+gen_xsd() {
+    echo "Generating XML schema: $1.rnc -> $1.rng -> $1.xsd"
+    java -jar ${trangjar} -I rnc -O rng ${srcdir}/$1.rnc ${outputdir}/$1.rng
+    java -jar ${trangjar} -I rng -O xsd ${outputdir}/$1.rng ${outputdir}/$1.xsd
+    echo "generated ok."
+}
+
+regenall() {
+    mkdir -p $outputdir
+    for x in $outputs; do gen_xsd $x; done
+}
+
+need_regen() {
+    for out in $outputs; do
+        outfile=${outputdir}/${out}.xsd
+        if [ -f ${outfile} ]; then
+            for infile in ${srcdir}/*.*; do
+                if [ ${infile} -nt ${outfile} ]; then
+                    echo "Updated input: ${infile} - regenerating all"
+                    return 0
+                fi
+            done
+        else
+            echo "Missing output: ${outfile} - regenerating all"
+            return 0
+        fi
+    done
+    echo "No updates for schema files"
+    return 1
+}
+
+if need_regen; then
+    regenall
+fi