From 083ef2ecab0a9e206b417133cc7efb259f308652 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 12 Feb 2020 21:29:01 +0300 Subject: Use copyright extracted from COPYRIGHT file for printing utility version --- build/root.build | 6 ++++++ clean/buildfile | 4 ++++ clean/clean.cxx | 2 +- load/buildfile | 4 ++++ load/load.cxx | 2 +- migrate/buildfile | 4 ++++ migrate/migrate.cxx | 2 +- 7 files changed, 21 insertions(+), 3 deletions(-) diff --git a/build/root.build b/build/root.build index 2f3d1ab..51de604 100644 --- a/build/root.build +++ b/build/root.build @@ -50,3 +50,9 @@ tests/{libue libul}{*}: bin.whole = false # Specify the test target for cross-testing. # test.target = $cxx.target + +# Extract the copyright notice from the COPYRIGHT file. +# +copyright = $process.run_regex(cat $src_root/COPYRIGHT, \ + 'Copyright \(c\) (.+)\.', \ + '\1') diff --git a/clean/buildfile b/clean/buildfile index 1fc0d8a..11fa2a2 100644 --- a/clean/buildfile +++ b/clean/buildfile @@ -11,6 +11,10 @@ include ../libbrep/ exe{brep-clean}: {hxx ixx cxx}{* -clean-options} {hxx ixx cxx}{clean-options} \ ../libbrep/lib{brep} $libs +# Build options. +# +obj{clean}: cxx.poptions += -DBREP_COPYRIGHT=\"$copyright\" + # Generated options parser. # if $cli.configured diff --git a/clean/clean.cxx b/clean/clean.cxx index edc8cd9..d7a7731 100644 --- a/clean/clean.cxx +++ b/clean/clean.cxx @@ -61,7 +61,7 @@ namespace brep << "libbbot " << LIBBBOT_VERSION_ID << endl << "libbpkg " << LIBBPKG_VERSION_ID << endl << "libbutl " << LIBBUTL_VERSION_ID << endl - << "Copyright (c) 2014-2019 Code Synthesis Ltd" << endl + << "Copyright (c) " << BREP_COPYRIGHT << "." << endl << "This is free software released under the MIT license." << endl; return 0; diff --git a/load/buildfile b/load/buildfile index 5f6c626..b55489f 100644 --- a/load/buildfile +++ b/load/buildfile @@ -11,6 +11,10 @@ include ../libbrep/ exe{brep-load}: {hxx ixx cxx}{* -load-options} {hxx ixx cxx}{load-options} \ ../libbrep/lib{brep} $libs +# Build options. +# +obj{load}: cxx.poptions += -DBREP_COPYRIGHT=\"$copyright\" + # Generated options parser. # if $cli.configured diff --git a/load/load.cxx b/load/load.cxx index c54e6c6..5638553 100644 --- a/load/load.cxx +++ b/load/load.cxx @@ -1192,7 +1192,7 @@ try << "libbbot " << LIBBBOT_VERSION_ID << endl << "libbpkg " << LIBBPKG_VERSION_ID << endl << "libbutl " << LIBBUTL_VERSION_ID << endl - << "Copyright (c) 2014-2019 Code Synthesis Ltd" << endl + << "Copyright (c) " << BREP_COPYRIGHT << "." << endl << "This is free software released under the MIT license." << endl; return 0; diff --git a/migrate/buildfile b/migrate/buildfile index 28001da..0480cc6 100644 --- a/migrate/buildfile +++ b/migrate/buildfile @@ -11,6 +11,10 @@ exe{brep-migrate}: {hxx ixx cxx}{* -migrate-options} \ {hxx ixx cxx}{ migrate-options} \ ../libbrep/lib{brep} $libs +# Build options. +# +obj{migrate}: cxx.poptions += -DBREP_COPYRIGHT=\"$copyright\" + # Generated options parser. # if $cli.configured diff --git a/migrate/migrate.cxx b/migrate/migrate.cxx index c1e9c29..8b083fc 100644 --- a/migrate/migrate.cxx +++ b/migrate/migrate.cxx @@ -242,7 +242,7 @@ try << "libbbot " << LIBBBOT_VERSION_ID << endl << "libbpkg " << LIBBPKG_VERSION_ID << endl << "libbutl " << LIBBUTL_VERSION_ID << endl - << "Copyright (c) 2014-2019 Code Synthesis Ltd" << endl + << "Copyright (c) " << BREP_COPYRIGHT << "." << endl << "This is free software released under the MIT license." << endl; return 0; -- cgit v1.1