From 284844a1284688f383b7e89442fc2c16110d25fd Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Tue, 18 Feb 2020 15:47:51 +0300 Subject: Fix copyright notice extraction for building and documentation generating --- build2/buildfile | 9 +++++---- doc/cli.sh | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build2/buildfile b/build2/buildfile index bfd68cb..549016c 100644 --- a/build2/buildfile +++ b/build2/buildfile @@ -20,11 +20,12 @@ exe{b}: {hxx ixx txx cxx}{** -b-options} {hxx ixx cxx}{b-options} $libs # obj{b}: cxx.poptions += -DBUILD2_HOST_TRIPLET=\"$cxx.target\" -# Pass the copyright notice extracted from the COPYRIGHT file. +# Pass the copyright notice extracted from the LICENSE file. # -copyright = $process.run_regex(cat $src_root/COPYRIGHT, \ - 'Copyright \(c\) (.+)\.', \ - '\1') +copyright = $process.run_regex( \ + cat $src_root/LICENSE, \ + 'Copyright \(c\) (.+) \(see the AUTHORS file\)\.', \ + '\1') obj{b}: cxx.poptions += -DBUILD2_COPYRIGHT=\"$copyright\" diff --git a/doc/cli.sh b/doc/cli.sh index 3597cf7..be19ff0 100755 --- a/doc/cli.sh +++ b/doc/cli.sh @@ -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' ../COPYRIGHT)" +copyright="$(sed -n -re 's%^Copyright \(c\) (.+) \(see the AUTHORS file\)\.$%\1%p' ../LICENSE)" while [ $# -gt 0 ]; do case $1 in -- cgit v1.1