Merge branch 'main' into issue_1722

Open-CMSIS-Pack · Nov 18, 2024 · 29e0f39 · 29e0f39
2 parents f42ad88 + cff11c0
commit 29e0f39
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 14 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -39,7 +39,7 @@ jobs:
           submodules: true
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
+        uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
         with:
           languages: cpp
           queries: security-and-quality
@@ -55,4 +55,4 @@ jobs:
         working-directory: ./build
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
+        uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
diff --git a/.github/workflows/scorecard.yml b/.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@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
+        uses: github/codeql-action/upload-sarif@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
         with:
           sarif_file: results.sarif
diff --git a/tools/svdconv/SVDConv/CMakeLists.txt b/tools/svdconv/SVDConv/CMakeLists.txt
@@ -7,7 +7,7 @@ dump_cmake_project_version()
 
 set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT svdconv)
 
-set(PROJECT_COPYRIGHT_NOTICE "Copyright (C) 2010-${PROJECT_VERSION_YEAR} ARM Ltd and ARM Germany GmbH. All rights reserved.")
+set(PROJECT_COPYRIGHT_NOTICE "(C) 2010-${PROJECT_VERSION_YEAR} Arm Ltd. and Contributors")
 set(PROJECT_TARGET_FILE_NAME "$<TARGET_FILE_NAME:svdconv>")
 configure_file(src/ProductInfo.h.in ProductInfo.h)
 

diff --git a/tools/svdconv/SVDConv/src/ParseOptions.cpp b/tools/svdconv/SVDConv/src/ParseOptions.cpp
@@ -423,15 +423,15 @@ ParseOptions::Result ParseOptions::ParseOpts(int argc, const char* argv[])
       ( "quiet"                 , "No output on console"                                      , cxxopts::value<bool>()->default_value("false") )
       ( "debug"                 , "Add information to generated files: struct/header/sfd/break" , cxxopts::value<std::vector<std::string>>() )
       ( "n"                     , "SFD Output file name"                                      , cxxopts::value<string>() )
-      ( "version"               , "Show program version")
+      ( "V,version"               , "Show program version")
       ( "h,help"                , "Print usage")
       ;
 
     options.parse_positional({"input"});
     parseResult = options.parse(argc, argv);
 
     if (parseResult.count("version")) {
-      cout << m_options.GetVersion() << endl;
+      cout << m_options.GetHeader() << endl;
       return Result::ExitNoError;
     }
     if ((argc < 2) || (parseResult.count("help"))) {

diff --git a/tools/svdconv/SVDConv/src/ProductInfo.h.in b/tools/svdconv/SVDConv/src/ProductInfo.h.in
@@ -14,7 +14,7 @@ static constexpr const char* MINOR_VERSION = "${PROJECT_VERSION_MINOR}";
 static constexpr const char* PATCH_VERSION = "${PROJECT_VERSION_PATCH}";
 
 static constexpr const char* COMPANY_NAME      = "Arm Ltd.";
-static constexpr const char* PRODUCT_NAME      = "CMSIS SVD Check / Converter";
+static constexpr const char* PRODUCT_NAME      = "CMSIS SVD Check/Converter";
 static constexpr const char* ORIGINAL_FILENAME = "${PROJECT_TARGET_FILE_NAME}";
 static constexpr const char* COPYRIGHT_NOTICE  = "${PROJECT_COPYRIGHT_NOTICE}";
 

diff --git a/tools/svdconv/SVDConv/src/SVDConv.cpp b/tools/svdconv/SVDConv/src/SVDConv.cpp
@@ -123,7 +123,6 @@ int SvdConv::Check(int argc, const char* argv[], const char* envp[])
 
     ParseOptions parseOptions(m_svdOptions);
     const string header = m_svdOptions.GetHeader();
-    LogMsg("M001", TXT(header));
 
     ParseOptions::Result result = parseOptions.Parse(argc, argv);
 

diff --git a/tools/svdconv/SVDConv/src/SVDConv.rc.in b/tools/svdconv/SVDConv/src/SVDConv.rc.in
@@ -49,7 +49,7 @@ BEGIN
             VALUE "FileDescription", "CMSIS-SVD Converter"
             VALUE "FileVersion", "@PROJECT_VERSION_FULL@"
             VALUE "InternalName", "SVDConv.exe"
-            VALUE "LegalCopyright", "Copyright (C) 2010-@PROJECT_VERSION_YEAR@ ARM Ltd and ARM Germany GmbH. All rights reserved."
+            VALUE "LegalCopyright", "(C) 2010-@PROJECT_VERSION_YEAR@ Arm Ltd. and Contributors"
             VALUE "OriginalFilename", "SVDConv.exe"
             VALUE "ProductName", "CMSIS-SVD Converter"
             VALUE "ProductVersion", "@PROJECT_VERSION_FULL@"

diff --git a/tools/svdconv/SVDConv/src/SvdOptions.cpp b/tools/svdconv/SVDConv/src/SvdOptions.cpp
@@ -170,11 +170,7 @@ string SvdOptions::GetHeader()
   string header = string(PRODUCT_NAME);
   header += " ";
   header += GetVersion();
-  header += " (";
-  header += string(__DATE__);
-  header += string(" ");
-  header += string(__TIME__);
-  header += ")\n";
+  header += " ";
   header += string(COPYRIGHT_NOTICE);
   header += "\n";