diff --git a/tools/svdconv/SVDConv/CMakeLists.txt b/tools/svdconv/SVDConv/CMakeLists.txt index 3692a963e..dd457ba76 100644 --- 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 "$") configure_file(src/ProductInfo.h.in ProductInfo.h) diff --git a/tools/svdconv/SVDConv/src/ParseOptions.cpp b/tools/svdconv/SVDConv/src/ParseOptions.cpp index d68f2a3e5..96ecb76b2 100644 --- a/tools/svdconv/SVDConv/src/ParseOptions.cpp +++ b/tools/svdconv/SVDConv/src/ParseOptions.cpp @@ -423,7 +423,7 @@ ParseOptions::Result ParseOptions::ParseOpts(int argc, const char* argv[]) ( "quiet" , "No output on console" , cxxopts::value()->default_value("false") ) ( "debug" , "Add information to generated files: struct/header/sfd/break" , cxxopts::value>() ) ( "n" , "SFD Output file name" , cxxopts::value() ) - ( "version" , "Show program version") + ( "V,version" , "Show program version") ( "h,help" , "Print usage") ; @@ -431,7 +431,7 @@ ParseOptions::Result ParseOptions::ParseOpts(int argc, const char* argv[]) 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 index dd3a186c2..324045fd8 100644 --- 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 index 978790017..c149f70fe 100644 --- 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 index 9c2f49f34..391beda9d 100644 --- 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 index 28af12012..6c85fbdda 100644 --- 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";