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

Update/correct/standardise version and license text #2254

Merged
merged 1 commit into from
Apr 5, 2022
Merged

Update/correct/standardise version and license text #2254

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 licenses/SOUFFLE-UPL.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2016-21 The Souffle Developers. All Rights reserved
Copyright (c) 2016-22 The Souffle Developers. All Rights reserved
Copyright (c) 2013-16 Oracle and/or its affiliates. All Rights reserved

The Universal Permissive License (UPL), Version 1.0
Expand Down
4 changes: 2 additions & 2 deletions src/include/souffle/CompiledOptions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,8 @@ class CmdOptions {
#endif
std::cerr << " -h -- prints this help page.\n";
std::cerr << "--------------------------------------------------------------------\n";
std::cout << " Copyright (c) 2016-20 The Souffle Developers." << std::endl;
std::cout << " Copyright (c) 2013-16 Oracle and/or its affiliates." << std::endl;
std::cerr << " Copyright (c) 2016-22 The Souffle Developers." << std::endl;
std::cerr << " Copyright (c) 2013-16 Oracle and/or its affiliates." << std::endl;
std::cerr << " All rights reserved.\n";
std::cerr << "====================================================================\n";
}
Expand Down
14 changes: 7 additions & 7 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,8 @@ int main(int argc, char** argv) {
/* Time taking for overall runtime */
auto souffle_start = std::chrono::high_resolution_clock::now();

std::string versionFooter;

/* have all to do with command line arguments in its own scope, as these are accessible through the global
* configuration only */
try {
Expand All @@ -224,11 +226,13 @@ int main(int argc, char** argv) {
footer << "----------------------------------------------------------------------------" << std::endl;
footer << "Version: " << PACKAGE_VERSION << "" << std::endl;
footer << "----------------------------------------------------------------------------" << std::endl;
footer << "Copyright (c) 2016-21 The Souffle Developers." << std::endl;
footer << "Copyright (c) 2016-22 The Souffle Developers." << std::endl;
footer << "Copyright (c) 2013-16 Oracle and/or its affiliates." << std::endl;
footer << "All rights reserved." << std::endl;
footer << "============================================================================" << std::endl;

versionFooter = footer.str();

// command line options, the environment will be filled with the arguments passed to them, or
// the empty string if they take none
// main option, the datalog program itself, has an empty key
Expand Down Expand Up @@ -295,7 +299,7 @@ int main(int argc, char** argv) {
{"help", 'h', "", "", false, "Display this help message."},
{"legacy", '\6', "", "", false, "Enable legacy support."},
{"preprocessor", '\7', "CMD", "", false, "C preprocessor to use."}};
Global::config().processArgs(argc, argv, header.str(), footer.str(), options);
Global::config().processArgs(argc, argv, header.str(), versionFooter, options);

// ------ command line arguments -------------

Expand All @@ -318,11 +322,7 @@ int main(int argc, char** argv) {

/* for the version option, if given print the version text then exit */
if (Global::config().has("version")) {
std::cout << "Souffle: " << PACKAGE_VERSION;
std::cout << "(" << RAM_DOMAIN_SIZE << "bit Domains)";
std::cout << std::endl;
std::cout << "Copyright (c) 2016-19 The Souffle Developers." << std::endl;
std::cout << "Copyright (c) 2013-16 Oracle and/or its affiliates." << std::endl;
std::cout << versionFooter << std::endl;
return 0;
}
Global::config().set("version", PACKAGE_VERSION);
Expand Down