From 503caaf4d81dbd0a599bd498f1accae15e277123 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Fri, 18 Mar 2022 11:17:25 +0100 Subject: [PATCH] Fix copyright test ButtonPrompt.qml, PinPrompt.qml, TextPrompt.qml were introduced in 4eca819 and are derived from GreeterPrompt.qml. clickable.json should be ignored since it is just metadata. --- qml/Greeter/ButtonPrompt.qml | 17 +++++++++++++++++ qml/Greeter/PinPrompt.qml | 17 +++++++++++++++++ qml/Greeter/TextPrompt.qml | 17 +++++++++++++++++ tests/copyright/check_copyright.sh | 14 +++++++++----- 4 files changed, 60 insertions(+), 5 deletions(-) diff --git a/qml/Greeter/ButtonPrompt.qml b/qml/Greeter/ButtonPrompt.qml index 5e5099ed52..2a923846f8 100644 --- a/qml/Greeter/ButtonPrompt.qml +++ b/qml/Greeter/ButtonPrompt.qml @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2016 Canonical, Ltd. + * Copyright (C) 2021 Capsia <43005909+capsia37@users.noreply.github.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + import QtQuick 2.4 import Ubuntu.Components 1.3 import "../Components" diff --git a/qml/Greeter/PinPrompt.qml b/qml/Greeter/PinPrompt.qml index 1dad6b5ed7..d3024694de 100644 --- a/qml/Greeter/PinPrompt.qml +++ b/qml/Greeter/PinPrompt.qml @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2016 Canonical, Ltd. + * Copyright (C) 2021 Capsia <43005909+capsia37@users.noreply.github.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + import QtQuick 2.4 import Ubuntu.Components 1.3 import "../Components" diff --git a/qml/Greeter/TextPrompt.qml b/qml/Greeter/TextPrompt.qml index 45092cde56..9d19591ca6 100644 --- a/qml/Greeter/TextPrompt.qml +++ b/qml/Greeter/TextPrompt.qml @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2016 Canonical, Ltd. + * Copyright (C) 2021 Capsia <43005909+capsia37@users.noreply.github.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + import QtQuick 2.4 import Ubuntu.Components 1.3 import "../Components" diff --git a/tests/copyright/check_copyright.sh b/tests/copyright/check_copyright.sh index be59895ccf..35108fd593 100755 --- a/tests/copyright/check_copyright.sh +++ b/tests/copyright/check_copyright.sh @@ -34,9 +34,9 @@ usage() # image files ignore_pat="\\.sci$|\\.svg$|\\.png$|\\.jpg$" # git/bzr files -ignore_pat="$ignore_pat|/\\.bzr/|\\.bzrignore$|\\.gitignore$|/\\.bazaar/Makefile$|/\\.bzr-builddeb/default\\.conf$" +ignore_pat="$ignore_pat|/\\.git/|/\\.bzr/|\\.bzrignore$|\\.gitignore$|/\\.bazaar/Makefile$|/\\.bzr-builddeb/default\\.conf$" # info files -ignore_pat="$ignore_pat|/README$|/CODING$|/LGPL_EXCEPTION\\.txt$" +ignore_pat="$ignore_pat|/README(.md)?$|/CODING$|/LGPL_EXCEPTION\\.txt$" # cmake files ignore_pat="$ignore_pat|/CMakeLists\\.txt$|\\.cmake$" # card creator test files @@ -48,13 +48,15 @@ ignore_pat="$ignore_pat|/tests/.*/.*\\.desktop$" # xml files ignore_pat="$ignore_pat|\\.xml$" # /data/ files -ignore_pat="$ignore_pat|/data/.*\\.conf$|/data/.*\\.in|/data/.*\\.url-dispatcher$|/data/.*\\.pkla$" +ignore_pat="$ignore_pat|/data/.*\\.conf$|/data/.*\\.in|/data/.*\\.url-dispatcher$|/data/.*\\.pkla$|/data/.*\\.sensors$" # polkit files ignore_pat="$ignore_pat|\\.pkla$" # /debian/ files ignore_pat="$ignore_pat|/debian/" -# qmldir files -ignore_pat="$ignore_pat|/qmldir$" +# click data files +ignore_pat="$ignore_pat|/clickable.json$" +# qml generated files +ignore_pat="$ignore_pat|/qmldir$|\\.qmltypes$" # Doxygen files ignore_pat="$ignore_pat|/Doxyfile.in$" # Wizard license files @@ -65,6 +67,8 @@ ignore_pat="$ignore_pat|\\.qrc$" ignore_pat="$ignore_pat|/doc/devices\\.conf$" # Jenkins configuration ignore_pat="$ignore_pat|/Jenkinsfile" +# upstart jobs +ignore_pat="$ignore_pat|/plugins/.*\\.conf$" # # We don't use the -i option of licensecheck to add ignore_dir to the pattern because Jenkins creates directories