add --output-format arguments xml2 & xml3

Author: ludviggunne

cli/cmdlineparser.cpp

@@ -1016,8 +1016,14 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
                 mSettings.outputFormat = Settings::OutputFormat::sarif;
             else if (format == "xml")
                 mSettings.outputFormat = Settings::OutputFormat::xml;
-            else {
-                mLogger.printError("argument to '--output-format=' must be 'text', 'sarif' or 'xml'.");
+            else if (format == "xml2") {
+                mSettings.outputFormat = Settings::OutputFormat::xml;
+                mSettings.xml_version = 2;
+            } else if (format == "xml3") {
+                mSettings.outputFormat = Settings::OutputFormat::xml;
+                mSettings.xml_version = 3;
+            } else {
+                mLogger.printError("argument to '--output-format=' must be 'text', 'sarif', 'xml' (deprecated), 'xml2' or 'xml3'.");
                 return Result::Fail;
             }
             mSettings.plistOutput = "";
@@ -1832,7 +1838,9 @@ void CmdLineParser::printHelp() const
         "                        Specify the output format. The available formats are:\n"
         "                          * text\n"
         "                          * sarif\n"
-        "                          * xml\n"
+        "                          * xml (deprecated)\n"
+        "                          * xml2\n"
+        "                          * xml3\n"
         "    --platform=<type>, --platform=<file>\n"
         "                         Specifies platform specific types and sizes. The\n"
         "                         available builtin platforms are:\n"