From 453c663fb0cc0197c04f0c91899f59cd11b8709f Mon Sep 17 00:00:00 2001
From: amai2012 <amai2012@users.noreply.github.com>
Date: Wed, 6 Jun 2018 15:25:09 +0200
Subject: [PATCH] #8611 Rename xmlV2.rng. Renaming it to cppcheck-errors.rng
 (#1278)

---
 .travis.yml                      | 4 ++--
 Makefile                         | 8 ++++----
 xmlV2.rng => cppcheck-errors.rng | 0
 tools/dmake.cpp                  | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename xmlV2.rng => cppcheck-errors.rng (100%)

diff --git a/.travis.yml b/.travis.yml
index 38e8a4e1d..a5a0fd789 100644
--- 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
index e2d525bb5..29ccb147e 100644
--- 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/xmlV2.rng b/cppcheck-errors.rng
similarity index 100%
rename from xmlV2.rng
rename to cppcheck-errors.rng
diff --git a/tools/dmake.cpp b/tools/dmake.cpp
index b749e484e..964111c5a 100644
--- 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";