From bbc4b2dc8c3babef4881722542153a7e236c28a9 Mon Sep 17 00:00:00 2001 From: Martin McGrane Date: Tue, 8 Mar 2022 14:35:41 +1100 Subject: [PATCH] Update/correct/standardise version and license text --- licenses/SOUFFLE-UPL.txt | 2 +- src/include/souffle/CompiledOptions.h | 4 ++-- src/main.cpp | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/licenses/SOUFFLE-UPL.txt b/licenses/SOUFFLE-UPL.txt index b21c70819eb..6b0c6a02cf9 100644 --- a/licenses/SOUFFLE-UPL.txt +++ b/licenses/SOUFFLE-UPL.txt @@ -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 diff --git a/src/include/souffle/CompiledOptions.h b/src/include/souffle/CompiledOptions.h index 321a06cc29a..ea007e7a2d8 100644 --- a/src/include/souffle/CompiledOptions.h +++ b/src/include/souffle/CompiledOptions.h @@ -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"; } diff --git a/src/main.cpp b/src/main.cpp index 8f29a258fdd..8cb79452a35 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -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 { @@ -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 @@ -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 ------------- @@ -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);