Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated version string #1848

Merged
merged 1 commit into from
Nov 14, 2024
Merged

Updated version string #1848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/svdconv/SVDConv/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions tools/svdconv/SVDConv/src/ParseOptions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))) {
Expand Down
2 changes: 1 addition & 1 deletion tools/svdconv/SVDConv/src/ProductInfo.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}";

Expand Down
1 change: 0 additions & 1 deletion tools/svdconv/SVDConv/src/SVDConv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion tools/svdconv/SVDConv/src/SVDConv.rc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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@"
Expand Down
6 changes: 1 addition & 5 deletions tools/svdconv/SVDConv/src/SvdOptions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
Loading