Merge branch 'main' into outbound/notReportCC_SDCMSIS-1306

Author: thorstendb-ARM

.github/workflows/codeql-analysis.yml

@@ -39,7 +39,7 @@ jobs:
           submodules: true
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+        uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
         with:
           languages: cpp
           queries: security-and-quality
@@ -55,4 +55,4 @@ jobs:
         working-directory: ./build
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+        uses: github/codeql-action/analyze@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9

.github/workflows/scorecard.yml

@@ -70,6 +70,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+        uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
         with:
           sarif_file: results.sarif

.gitignore

@@ -22,7 +22,3 @@
 /build*/
 **/cmake-*
 /.cache
-/tools/projmgr/test
-/tools/projmgr/test
-tools/svdconv/CMakeCache.txt
-tools/svdconv/CMakeFiles/cmake.check_cache

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/include/ValidateSemantic.h

@@ -44,7 +44,8 @@ class ValidateSemantic : public Validate
   bool FindFileFromList(const std::string& systemHeader, const std::set<RteFile*>& targFiles);
   bool CheckDeviceDependencies(RteDeviceItem* device, RteProject* rteProject);
   bool HasExternalGenerator(RteComponentAggregate* aggregate);
-
+  bool FileIsHeader(const std::string& name);
+  
   const std::map<std::string, compiler_s>& GetCompilers() {
     return m_compilers;
   }

tools/packchk/include/ValidateSyntax.h

@@ -88,7 +88,7 @@ class ValidateSyntax : public Validate
   std::map<std::string, std::list<RteDeviceItem*> > m_allItems;
   std::map<std::string, std::list<RteDeviceItem*> > m_allDevices;
   std::string m_pdscFullpath;
-  std::map<std::string, RteBoard*> boardsFound;
+  std::map<std::string, RteBoard*> m_boardsFound;
 
   FEATURE_TABLE m_featureTableDevice;
   FEATURE_TABLE m_featureTableBoard;

tools/packchk/src/CheckFiles.cpp

@@ -148,6 +148,12 @@ bool CheckFiles::GetFileName(RteItem* item, std::string& filename, FileType& fil
     filename = item->GetText();
     return true;
   }
+  else if(tag == "description") {
+    filename = item->GetAttribute("overview");
+    if(filename.length()) {
+      return true;
+    }
+  }
 
   return false;
 }

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;
   }
 

tools/packchk/src/PackChk_Msgs.cpp

@@ -131,8 +131,8 @@ const MsgTable PackChk::msgTable = {
   { "M315", { MsgLevel::LEVEL_ERROR,    CRLF_B, "Invalid URL / Paths to Drives are not allowed in Package URL: '%URL%'" } },
   { "M316", { MsgLevel::LEVEL_WARNING,  CRLF_B, "URL must end with slash '/': '%URL%'" } },
   { "M317", { MsgLevel::LEVEL_WARNING,  CRLF_B, "Condition '%NAME%': No component found for '%NAME2%'" } },
-  { "M318", { MsgLevel::LEVEL_ERROR,    CRLF_B, "" } },
-  { "M319", { MsgLevel::LEVEL_ERROR,    CRLF_B, "" } },
+  { "M318", { MsgLevel::LEVEL_WARNING,  CRLF_B, "Attribute '%TAG%' must not have '%TAG2%'" } },
+  { "M319", { MsgLevel::LEVEL_ERROR,    CRLF_B, "'%TAG%' already defined for '%TAG2%'" } },
   { "M320", { MsgLevel::LEVEL_ERROR,    CRLF_B, "" } },
   { "M321", { MsgLevel::LEVEL_ERROR,    CRLF_B, "DS5 project requires '.project' file." } },
   { "M322", { MsgLevel::LEVEL_ERROR,    CRLF_B, "Associated File/Path not found: '%PATH%'" } },
@@ -152,7 +152,7 @@ const MsgTable PackChk::msgTable = {
                                                 "  No condition id set to specify a rule filtering for a device or set of devices." } },
   { "M336", { MsgLevel::LEVEL_WARNING,  CRLF_B, "Component 'Cclass=%CCLASS%, Cgroup=%CGROUP%, Cversion=%CVER%, condition=%COND%' is member of the Cclass='%CCLASS%' which shall contain device specific components.\n"\
                                                 "  The referenced condition id does not contain a rule filtering for a device or set of devices." } },  // No reference to a device or device not found
-  { "M337", { MsgLevel::LEVEL_WARNING,  CRLF_B, "File with category '%CAT%' has wrong extension '%EXT%': '%PATH%'" } },
+  { "M337", { MsgLevel::LEVEL_WARNING,  CRLF_B, "File with category '%CAT%' has wrong extension '%EXT%': '%PATH%'%MSG%" } },
   { "M338", { MsgLevel::LEVEL_WARNING,  CRLF_B, "No releases found!" } },
   { "M339", { MsgLevel::LEVEL_WARNING,  CRLF_B, "Include Path '%PATH%' must not be a file!" } },
   { "M340", { MsgLevel::LEVEL_WARNING,  CRLF_B, "Include Path '%PATH%' must end with '/'" } },
@@ -172,7 +172,7 @@ const MsgTable PackChk::msgTable = {
   { "M354", { MsgLevel::LEVEL_WARNING3, CRLF_B, "Multiple '%FILECAT%' Files found for Component '%COMP%' for '[%VENDOR%] %MCU%' (Compiler: %COMPILER% [%OPTION%])" } },
   { "M355", { MsgLevel::LEVEL_WARNING3, CRLF_B, "No '%FILECAT%' Directory found for Component '%COMP%' (%COMPID%) for '[%VENDOR%] %MCU%' (Compiler: %COMPILER% [%OPTION%])" } },
   { "M356", { MsgLevel::LEVEL_ERROR,    CRLF_B, "Path '%PATH%' does not specify a file!" } },
-  { "M357", { MsgLevel::LEVEL_WARNING,  CRLF_B, "" } },
+  { "M357", { MsgLevel::LEVEL_WARNING,  CRLF_B, "Config File '%NAME%', which gets copied to project, is also found in the include path to the original pack folder. Do not place config header files in the same directory as regular header files." } },
   { "M358", { MsgLevel::LEVEL_WARNING3, CRLF_B, "Header File '%HFILE%' for '%CFILE%', used by Component '%COMP%' (%COMPID%)\n"\
                                                 "  for Device '[%VENDOR%] %MCU%' (Compiler: %COMPILER% [%OPTION%]) not found on file system in any include paths: %PATH%" } },
   { "M359", { MsgLevel::LEVEL_WARNING,  CRLF_B, "Family has no Device(s) or Subfamilies: '%FAMILY%" } },
@@ -184,7 +184,7 @@ const MsgTable PackChk::msgTable = {
   { "M365", { MsgLevel::LEVEL_ERROR,    CRLF_B, "Redefined %DEVTYPE% '%MCU%' found, see Line %LINE%" } },
   { "M366", { MsgLevel::LEVEL_ERROR,    CRLF_B, "Redefined %DEVTYPEEXIST% as %DEVTYPE% '%MCU%' found, see Line %LINE%" } },
   { "M367", { MsgLevel::LEVEL_ERROR,    CRLF_B, "Redefined %TYPE% '%NAME%' found, see Line %LINE%" } },
-  { "M368", { MsgLevel::LEVEL_ERROR,    CRLF_B, "" } },
+  { "M368", { MsgLevel::LEVEL_ERROR,    CRLF_B, "Cannot check '%NAME%'%MSG%" } },
   { "M369", { MsgLevel::LEVEL_WARNING3, CRLF_B, "Feature is already defined for '%MCU%' and will be added, see Line %LINE%: '%PROP%'" } },
   { "M370", { MsgLevel::LEVEL_WARNING,  CRLF_B, "URL is not conformant: '%URL%':\n  Backslashes are not allowed in URL, use forward slashes." } },
   { "M371", { MsgLevel::LEVEL_ERROR,    CRLF_B, "%SECTION% Feature for '%MCU%': '%FEATURE%' unknown." } },