#8611 Rename xmlV2.rng. Renaming it to cppcheck-errors.rng (danmar#1278)

amai2012 · web-flow · commit 453c663fb0cc · 2018-06-06T15:25:09.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -76,9 +76,9 @@ script:
 # run extra tests
   - tools/generate_and_run_more_tests.sh
 # Validate XML
-#  - make validateXMLV2
+#  - make validateXML doesn't work in this context unfortunately
   - ${CPPCHECK} --errorlist >/tmp/errorlist.xml
-  - xmllint --noout --relaxng xmlV2.rng /tmp/errorlist.xml
+  - xmllint --noout --relaxng cppcheck-errors.rng /tmp/errorlist.xml
 # check test/cfg
   - make checkcfg
   - make validateCFG
diff --git a/Makefile b/Makefile
@@ -322,10 +322,10 @@ validatePlatforms: ${PlatformFilesCHECKED}
 /tmp/example.xml: cppcheck
 	cppcheck --xml --inconclusive -j 4 cli externals gui lib test 2>/tmp/example.xml
 createXMLExamples:/tmp/errorlist.xml /tmp/example.xml
-.PHONY: validateXMLV2
-validateXMLV2: createXMLExamples
-	xmllint --noout --relaxng xmlV2.rng /tmp/errorlist.xml
-	xmllint --noout --relaxng xmlV2.rng /tmp/example.xml
+.PHONY: validateXML
+validateXML: createXMLExamples
+	xmllint --noout --relaxng cppcheck-errors.rng /tmp/errorlist.xml
+	xmllint --noout --relaxng cppcheck-errors.rng /tmp/example.xml
 
 ###### Build
 
diff --git a/cppcheck-errors.rng b/cppcheck-errors.rng
diff --git a/tools/dmake.cpp b/tools/dmake.cpp
@@ -420,10 +420,10 @@ int main(int argc, char **argv)
     fout << "/tmp/example.xml: cppcheck\n";
     fout << "\tcppcheck --xml --inconclusive -j 4 cli externals gui lib test 2>/tmp/example.xml\n";
     fout << "createXMLExamples:/tmp/errorlist.xml /tmp/example.xml\n";
-    fout << ".PHONY: validateXMLV2\n";
-    fout << "validateXMLV2: createXMLExamples\n";
-    fout << "\txmllint --noout --relaxng xmlV2.rng /tmp/errorlist.xml\n";
-    fout << "\txmllint --noout --relaxng xmlV2.rng /tmp/example.xml\n";
+    fout << ".PHONY: validateXML\n";
+    fout << "validateXML: createXMLExamples\n";
+    fout << "\txmllint --noout --relaxng cppcheck-errors.rng /tmp/errorlist.xml\n";
+    fout << "\txmllint --noout --relaxng cppcheck-errors.rng /tmp/example.xml\n";
 
     fout << "\n###### Build\n\n";
 
