From 0a43a29d2af09d9a8b744950534d897523359a78 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Fri, 4 Sep 2020 16:28:09 -0400 Subject: [PATCH] bitfield.h.j2: restore `bitfield.h`'s original copyright In e72875e ("templates: commonize the licence header"), I made the mistake to overwrite `bitfield.h`'s original copyright with mine, so restore this. The new `licence-header-footer.j2` template is the bottom part of any license header. Signed-off-by: Philippe Proulx --- barectf/templates/c/bitfield.h.j2 | 29 +++++++++++++++++++- barectf/templates/licence-header-footer.j2 | 32 ++++++++++++++++++++++ barectf/templates/licence-header.j2 | 9 +----- 3 files changed, 61 insertions(+), 9 deletions(-) create mode 100644 barectf/templates/licence-header-footer.j2 diff --git a/barectf/templates/c/bitfield.h.j2 b/barectf/templates/c/bitfield.h.j2 index ffc6a9b..e495194 100644 --- a/barectf/templates/c/bitfield.h.j2 +++ b/barectf/templates/c/bitfield.h.j2 @@ -27,7 +27,34 @@ #ifndef _{{ ucprefix }}BITFIELD_H #define _{{ ucprefix }}BITFIELD_H -{% include 'licence-header.j2' %} +/* + * BabelTrace + * + * Bitfields read/write functions. + * + * Copyright (c) 2010-2020 Mathieu Desnoyers + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * +{% include 'licence-header-footer.j2' %} #include diff --git a/barectf/templates/licence-header-footer.j2 b/barectf/templates/licence-header-footer.j2 new file mode 100644 index 0000000..715c149 --- /dev/null +++ b/barectf/templates/licence-header-footer.j2 @@ -0,0 +1,32 @@ +{# + # The MIT License (MIT) + # + # Copyright (c) 2020 Philippe Proulx + # + # Permission is hereby granted, free of charge, to any person obtaining + # a copy of this software and associated documentation files (the + # "Software"), to deal in the Software without restriction, including + # without limitation the rights to use, copy, modify, merge, publish, + # distribute, sublicense, and/or sell copies of the Software, and to + # permit persons to whom the Software is furnished to do so, subject to + # the following conditions: + # + # The above copyright notice and this permission notice shall be + # included in all copies or substantial portions of the Software. + # + # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + # IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + # CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + #} +{% import 'common.j2' as common %} + * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + * + * The following code was generated by barectf v{{ barectf_version.__version__ }} + * on {{ common.gen_date }}. + * + * For more details, see . + */ diff --git a/barectf/templates/licence-header.j2 b/barectf/templates/licence-header.j2 index 1d9abd0..ec02bba 100644 --- a/barectf/templates/licence-header.j2 +++ b/barectf/templates/licence-header.j2 @@ -22,7 +22,6 @@ # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #} -{% import 'common.j2' as common %} /* * The MIT License (MIT) * @@ -48,10 +47,4 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. * - * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - * - * The following code was generated by barectf v{{ barectf_version.__version__ }} - * on {{ common.gen_date }}. - * - * For more details, see . - */ +{% include 'licence-header-footer.j2' %} -- 2.34.1