From e72875eb411ebd42123121a7d357c1f50f017eb5 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Thu, 3 Sep 2020 10:17:01 -0400 Subject: [PATCH] templates: commonize the licence header Signed-off-by: Philippe Proulx --- barectf/templates/c/barectf.c.j2 | 34 +-------------- barectf/templates/c/barectf.h.j2 | 34 +-------------- barectf/templates/c/bitfield.h.j2 | 29 +------------ barectf/templates/licence-header.j2 | 57 ++++++++++++++++++++++++++ barectf/templates/metadata/metadata.j2 | 34 ++------------- 5 files changed, 66 insertions(+), 122 deletions(-) create mode 100644 barectf/templates/licence-header.j2 diff --git a/barectf/templates/c/barectf.c.j2 b/barectf/templates/c/barectf.c.j2 index e80eb7f..e27230e 100644 --- a/barectf/templates/c/barectf.c.j2 +++ b/barectf/templates/c/barectf.c.j2 @@ -29,38 +29,8 @@ {% set ucprefix = common.ucprefix %} {% set ctx_struct_name = c_common.ctx_struct_name %} {% set cg_opts = cfg.options.code_generation_options %} -/* - * The MIT License (MIT) - * - * Copyright (c) 2015-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. - * - * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - * - * The following C code was generated by barectf v{{ barectf_version.__version__ }} - * on {{ common.gen_date }}. - * - * For more details, see . - */ +{% include 'licence-header.j2' %} + #include #include diff --git a/barectf/templates/c/barectf.h.j2 b/barectf/templates/c/barectf.h.j2 index 800f49e..6513e27 100644 --- a/barectf/templates/c/barectf.h.j2 +++ b/barectf/templates/c/barectf.h.j2 @@ -33,38 +33,8 @@ #ifndef _{{ ucprefix }}H #define _{{ ucprefix }}H -/* - * The MIT License (MIT) - * - * Copyright (c) 2015-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. - * - * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - * - * The following C code was generated by barectf v{{ barectf_version.__version__ }} - * on {{ common.gen_date }}. - * - * For more details, see . - */ +{% include 'licence-header.j2' %} + #include diff --git a/barectf/templates/c/bitfield.h.j2 b/barectf/templates/c/bitfield.h.j2 index 163c8d6..fd0eb91 100644 --- a/barectf/templates/c/bitfield.h.j2 +++ b/barectf/templates/c/bitfield.h.j2 @@ -28,33 +28,8 @@ #ifndef _{{ ucprefix }}BITFIELD_H #define _{{ ucprefix }}BITFIELD_H -/* - * 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.j2' %} + #include diff --git a/barectf/templates/licence-header.j2 b/barectf/templates/licence-header.j2 new file mode 100644 index 0000000..1d9abd0 --- /dev/null +++ b/barectf/templates/licence-header.j2 @@ -0,0 +1,57 @@ +{# + # 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 MIT License (MIT) + * + * Copyright (c) 2015-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. + * + * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + * + * The following code was generated by barectf v{{ barectf_version.__version__ }} + * on {{ common.gen_date }}. + * + * For more details, see . + */ diff --git a/barectf/templates/metadata/metadata.j2 b/barectf/templates/metadata/metadata.j2 index b3c39b7..4836647 100644 --- a/barectf/templates/metadata/metadata.j2 +++ b/barectf/templates/metadata/metadata.j2 @@ -25,36 +25,9 @@ {% import 'common.j2' as common %} /* CTF 1.8 */ -/* - * The MIT License (MIT) - * - * Copyright (c) 2015-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. - * - * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - * - * The following TSDL code was generated by barectf v{{ barectf_version.__version__ }} - * on {{ common.gen_date }}. - * - * For more details, see . - */ +{% include 'licence-header.j2' %} + + {# # Generates a root field type string named `name` for the field type # `rft` with all the lines except the first one indented with a single @@ -63,7 +36,6 @@ {% macro root_ft(name, rft) %} {{ name }} := {{ rft | ft_str | indent_tab }}; {%- endmacro %} - trace { major = 1; minor = 8; -- 2.34.1