license fix

robotology · Jan 20, 2025 · 2b13ec8 · 2b13ec8
1 parent 5c9b7e0
commit 2b13ec8
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 15 deletions.
diff --git a/src/guis/CMakeLists.txt b/src/guis/CMakeLists.txt
@@ -19,4 +19,3 @@ if(YARP_COMPILE_EXECUTABLES)
     add_subdirectory(yarplaserscannergui)
     add_subdirectory(yarpopencvdisplay)
 endif()
-
diff --git a/src/guis/yarpscope/plugin/res.qrc b/src/guis/yarpscope/plugin/res.qrc
@@ -3,9 +3,9 @@
     <file>YARPScopeToolBar.qml</file>
     <file>YARPScopeMenu.qml</file>
     <file>YARPScopeAbout.qml</file>
-    <file alias="images/pause.png">../../../data/icons/256x256/pause.png</file>
-    <file alias="images/play.png">../../../data/icons/256x256/play.png</file>
-    <file alias="images/action-clear.png">../../../data/icons/256x256/action-clear.png</file>
-    <file alias="images/action-rescale.png">../../../data/icons/256x256/action-rescale.png</file>
+    <file alias="images/pause.png">../../../../data/icons/256x256/pause.png</file>
+    <file alias="images/play.png">../../../../data/icons/256x256/play.png</file>
+    <file alias="images/action-clear.png">../../../../data/icons/256x256/action-clear.png</file>
+    <file alias="images/action-rescale.png">../../../../data/icons/256x256/action-rescale.png</file>
 </qresource>
 </RCC>
diff --git a/src/guis/yarpview/plugin/res.qrc b/src/guis/yarpview/plugin/res.qrc
@@ -1,7 +1,7 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource prefix="/YARPView">
-    <file alias="stop.svg">../../../data/icons/scalable/actions-media-stop_B.svg</file>
-    <file alias="record.svg">../../../data/icons/scalable/volume-recorder_B.svg</file>
+    <file alias="stop.svg">../../../../data/icons/scalable/actions-media-stop_B.svg</file>
+    <file alias="record.svg">../../../../data/icons/scalable/volume-recorder_B.svg</file>
     <file>YARPViewMenu.qml</file>
     <file>YARPViewStatusBar.qml</file>
     <file>VideoSurface.qml</file>

diff --git a/src/guis/yarpview/src/res.qrc b/src/guis/yarpview/src/res.qrc
@@ -1,7 +1,7 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource prefix="/">
-    <file alias="logo.svg">../../../data/icons/scalable/actions-preview_B.svg</file>
-    <file alias="logo.png">../../../data/icons/512x512/actions-preview_B.png</file>
+    <file alias="logo.svg">../../../../data/icons/scalable/actions-preview_B.svg</file>
+    <file alias="logo.png">../../../../data/icons/512x512/actions-preview_B.png</file>
     <file>qml/QtYARPView/main.qml</file>
     <file>qml/QtYARPView/mainCompact.qml</file>
 </qresource>

diff --git a/tests/misc/check_license.pl b/tests/misc/check_license.pl
@@ -21,7 +21,7 @@ sub print_if_verbose
 chomp(my @skip_files = <$handle>);
 close $handle;
 
-my $copyright_iit = "(2006-2021|2006-2022|2006-2023|2023|2023-2023|2024|2024-2024) Istituto Italiano di Tecnologia \\(IIT\\)";
+my $copyright_iit = "(2006-2021|2006-2022|2006-2023|2023|2023-2023|2024|2024-2024|2025|2025-2025) Istituto Italiano di Tecnologia \\(IIT\\)";
 my $copyright_robocub = "2006-2010 RobotCub Consortium";
 
 my $str_bsd3_cpp = <<END;
@@ -427,8 +427,8 @@ END
 
     # GPL3+
     if ("$txt" =~ /$str_gpl3_or_later/s) {
-        if ("$filename" =~ /src\/yarpviz\/.*\.(cpp|h|qml)/ ||
-            "$filename" =~ /src\/yarpscope\/.*\.(cpp|h|qml)/ ||
+        if ("$filename" =~ /src\/guis\/yarpviz\/.*\.(cpp|h|qml)/ ||
+            "$filename" =~ /src\/guis\/yarpscope\/.*\.(cpp|h|qml)/ ||
             "$filename" =~ /example\/ContainerExample\/.*\.(cpp|h|qml)/) {
             # yarpviz and yarpscope are necessarily GPL3+
             print_if_verbose "[OK - GPL3+ (.$1)] $filename\n";

diff --git a/tests/misc/check_style_skip.txt b/tests/misc/check_style_skip.txt
@@ -5,6 +5,6 @@ bindings/java/examples/matlab/simulink/yarpWriteDoubles.mdl
 cmake/MacOSXBundleInfo.plist.in
 cmake/MacOSXFrameworkInfo.plist.in
 src/devices/DynamixelAX12Ftdi/ax12.cfg
-src/yarpdataplayer/src/RC/yarpdataplayer_resource.rc
-src/yarpmotorgui/sequencewindow.ui
-src/yarpmotorgui/jointitem.ui
+src/guis/yarpdataplayer/src/RC/yarpdataplayer_resource.rc
+src/guis/yarpmotorgui/sequencewindow.ui
+src/guis/yarpmotorgui/jointitem.ui
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,4 +19,3 @@ if(YARP_COMPILE_EXECUTABLES)
		add_subdirectory(yarplaserscannergui)
		add_subdirectory(yarpopencvdisplay)
		endif()