diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2020-02-12 20:51:44 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2020-02-12 20:51:44 +0300 |
| commit | 7d06c193ad79cec3d810be1811929cacc5ad108e (patch) | |
| tree | ea9a3f709d1504ba17f77294f1c423eb783635ae | |
| parent | 9985db9c65fe02fa5d3743021f4985eee17822b8 (diff) | |
Use copyright extracted from LICENSE file for printing utility version
| -rw-r--r-- | LICENSE | 2 | ||||
| -rw-r--r-- | bbot/agent/agent.cxx | 2 | ||||
| -rw-r--r-- | bbot/buildfile | 10 | ||||
| -rw-r--r-- | bbot/worker/worker.cxx | 2 | ||||
| -rwxr-xr-x | doc/cli.sh | 2 |
5 files changed, 14 insertions, 4 deletions
@@ -1,4 +1,4 @@ -Copyright (c) 2014-2020 Code Synthesis Ltd +Copyright (c) 2014-2020 Code Synthesis Ltd. TBC; All rights reserved diff --git a/bbot/agent/agent.cxx b/bbot/agent/agent.cxx index c06edaf..80eeae5 100644 --- a/bbot/agent/agent.cxx +++ b/bbot/agent/agent.cxx @@ -1124,7 +1124,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) " << BBOT_COPYRIGHT << "." << endl << "TBC; All rights reserved" << endl; return 0; diff --git a/bbot/buildfile b/bbot/buildfile index 80c55f7..ce74c7a 100644 --- a/bbot/buildfile +++ b/bbot/buildfile @@ -72,6 +72,16 @@ for t: cxx{**.test...} $d/exe{$n}: $d/libue{bbot}: bin.whole = false } +# Build options. +# +# Pass the copyright notice extracted from the LICENSE file. +# +copyright = $process.run_regex(cat $src_root/LICENSE, \ + 'Copyright \(c\) (.+)\.', \ + '\1') + +obj{agent/agent worker/worker}: cxx.poptions += -DBBOT_COPYRIGHT=\"$copyright\" + # Generated options parser. # if $cli.configured diff --git a/bbot/worker/worker.cxx b/bbot/worker/worker.cxx index a290020..dc19ece 100644 --- a/bbot/worker/worker.cxx +++ b/bbot/worker/worker.cxx @@ -1620,7 +1620,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) " << BBOT_COPYRIGHT << "." << endl << "TBC; All rights reserved" << endl; return 0; @@ -9,7 +9,7 @@ function info () { echo "$*" 1>&2; } function error () { info "$*"; exit 1; } date="$(date +"%B %Y")" -copyright="$(sed -n -re 's%^Copyright \(c\) (.+)$%\1%p' ../LICENSE | head -n 1)" +copyright="$(sed -n -re 's%^Copyright \(c\) (.+)\.$%\1%p' ../LICENSE)" while [ $# -gt 0 ]; do case $1 in |