[packchk] --xsd option checks schema compliance for pdsc files listed as dependencies (-i) as well #1716 #1132 (#1133) (#1957)

Skip -i included pdsc files for XSD check
See #1716

Co-authored-by: Thorsten de Buhr <[email protected]>
Co-authored-by: Evgueni Driouk <[email protected]>

Author: 3 people

tools/packchk/include/CreateModel.h

@@ -24,7 +24,7 @@ class CreateModel
   ~CreateModel();
 
   bool CheckForOtherPdscFiles(const std::string& pdscFullPath);
-  bool AddPdsc(const std::string& pdscFile, bool bSkipCheckForOtherPdsc = false);
+  bool AddPdsc(const std::string& pdscFile, bool bSkipCheckForOtherPdsc = false, bool validatePdsc = false);
   bool AddRefPdsc(const std::set<std::string>& pdscRefFiles);
   bool SetPackXsd(const std::string& packXsdFile);
   bool ReadAllPdsc();

tools/packchk/src/CreateModel.cpp

@@ -91,7 +91,7 @@ bool CreateModel::PrintPdscFiles(std::list<std::string>& pdscFiles)
  * @param bSkipCheckForOtherPdsc skip check if there are other PDSC files in package
  * @return passed / failed
  */
-bool CreateModel::AddPdsc(const string& pdscFile, bool bSkipCheckForOtherPdsc /* = false */)
+bool CreateModel::AddPdsc(const string& pdscFile, bool bSkipCheckForOtherPdsc /* = false */, bool validatePdsc /* = false */)
 {
   if(pdscFile.empty()) {
     LogMsg("M202");
@@ -116,7 +116,7 @@ bool CreateModel::AddPdsc(const string& pdscFile, bool bSkipCheckForOtherPdsc /*
     }
   }
 
-  if(m_validatePdsc) {
+  if(m_validatePdsc && validatePdsc) {
     if(!XmlChecker::Validate(pdscFile, m_schemaFile)) {
       ; // continue checking
     }

tools/packchk/src/PackChk.cpp

@@ -101,7 +101,7 @@ bool PackChk::CheckPackage()
 
   // Add PDSC files to check (currently limited to one)
   const string& pdscFile = m_packOptions.GetPdscFullpath();
-  if(!createModel.AddPdsc(pdscFile, m_packOptions.GetIgnoreOtherPdscFiles())) {
+  if(!createModel.AddPdsc(pdscFile, m_packOptions.GetIgnoreOtherPdscFiles(), true)) {
     return false;
   }