diff -Nru ros-catkin-lint-1.6.16/changelog.txt ros-catkin-lint-1.6.17/changelog.txt --- ros-catkin-lint-1.6.16/changelog.txt 2022-01-10 13:33:36.000000000 +0000 +++ ros-catkin-lint-1.6.17/changelog.txt 2022-03-14 21:19:23.000000000 +0000 @@ -1,3 +1,9 @@ +Version 1.6.17 + * Recognize files created with file() command + * Add support for genmsg + * Update coverage configuration for nose 2 + * Make catkin_lint REUSE 3.0 compliant + Version 1.6.16 * Handle empty XML comments correctly * Recognize Pybind11 CMake macros diff -Nru ros-catkin-lint-1.6.16/.coveragerc ros-catkin-lint-1.6.17/.coveragerc --- ros-catkin-lint-1.6.16/.coveragerc 1970-01-01 00:00:00.000000000 +0000 +++ ros-catkin-lint-1.6.17/.coveragerc 2022-03-14 21:19:23.000000000 +0000 @@ -0,0 +1,6 @@ +[report] +show_missing = True +omit = + src/catkin_lint/_version.py + setup.py + versioneer.py \ No newline at end of file diff -Nru ros-catkin-lint-1.6.16/debian/changelog ros-catkin-lint-1.6.17/debian/changelog --- ros-catkin-lint-1.6.16/debian/changelog 2022-01-10 13:53:33.000000000 +0000 +++ ros-catkin-lint-1.6.17/debian/changelog 2022-03-14 21:27:09.000000000 +0000 @@ -1,3 +1,9 @@ +ros-catkin-lint (1.6.17-1) unstable; urgency=medium + + * [ef640da] New upstream version 1.6.17 + + -- Timo Röhling Mon, 14 Mar 2022 22:27:09 +0100 + ros-catkin-lint (1.6.16-1) unstable; urgency=medium * [c11fa77] New upstream version 1.6.16 diff -Nru ros-catkin-lint-1.6.16/LICENSES/BSD-3-Clause.txt ros-catkin-lint-1.6.17/LICENSES/BSD-3-Clause.txt --- ros-catkin-lint-1.6.16/LICENSES/BSD-3-Clause.txt 1970-01-01 00:00:00.000000000 +0000 +++ ros-catkin-lint-1.6.17/LICENSES/BSD-3-Clause.txt 2022-03-14 21:19:23.000000000 +0000 @@ -0,0 +1,29 @@ +BSD 3-Clause License + +Copyright 2013-2022 Fraunhofer FKIE +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -Nru ros-catkin-lint-1.6.16/.reuse/dep5 ros-catkin-lint-1.6.17/.reuse/dep5 --- ros-catkin-lint-1.6.16/.reuse/dep5 1970-01-01 00:00:00.000000000 +0000 +++ ros-catkin-lint-1.6.17/.reuse/dep5 2022-03-14 21:19:23.000000000 +0000 @@ -0,0 +1,9 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: catkin_lint +Upstream-Contact: Timo Röhling +Source: https://github.com/fkie/catkin_lint + +Files: * +Copyright: 2013-2022 Fraunhofer FKIE +License: BSD-3-Clause + diff -Nru ros-catkin-lint-1.6.16/src/catkin_lint/checks/build.py ros-catkin-lint-1.6.17/src/catkin_lint/checks/build.py --- ros-catkin-lint-1.6.16/src/catkin_lint/checks/build.py 2022-01-10 13:33:36.000000000 +0000 +++ ros-catkin-lint-1.6.17/src/catkin_lint/checks/build.py 2022-03-14 21:19:23.000000000 +0000 @@ -141,6 +141,15 @@ for f in opts["OUTPUT"] + opts["BYPRODUCTS"]: info.generated_files.add(info.binary_relative_path(f)) + def on_file(info, cmd, args): + if args[0] in ["WRITE", "APPEND", "TOUCH"] and len(args) >= 2: + info.generated_files.add(info.binary_relative_path(args[1])) + elif args[0] in ["GENERATE", "CONFIGURE"]: + opts, args = cmake_argparse(args, {"OUTPUT": "?"}) + if opts["OUTPUT"]: + f = opts["OUTPUT"] + info.generated_files.add(info.binary_relative_path(f)) + def on_generate_export_header(info, cmd, args): opts, args = cmake_argparse(args, {"BASE_NAME": "?", "EXPORT_FILE_NAME": "?"}) f = args[0] + "_export.h" @@ -178,6 +187,7 @@ linter.add_command_hook("add_custom_command", on_add_custom_command) linter.add_command_hook("xacro_add_xacro_file", on_xacro_add_xacro_file) linter.add_command_hook("xacro_add_files", on_xacro_add_files) + linter.add_command_hook("file", on_file) def source_files(linter): diff -Nru ros-catkin-lint-1.6.16/src/catkin_lint/linter.py ros-catkin-lint-1.6.17/src/catkin_lint/linter.py --- ros-catkin-lint-1.6.16/src/catkin_lint/linter.py 2022-01-10 13:33:36.000000000 +0000 +++ ros-catkin-lint-1.6.17/src/catkin_lint/linter.py 2022-03-14 21:19:23.000000000 +0000 @@ -708,7 +708,8 @@ "CATKIN_GLOBAL_PYTHON_DESTINATION": "lib/python/packages", "CATKIN_GLOBAL_SHARE_DESTINATION": "share", "PYTHON_INSTALL_DIR": "lib/python/packages", - "CATKIN_ENABLE_TESTING": "CATKIN_ENABLE_TESTING" + "CATKIN_ENABLE_TESTING": "CATKIN_ENABLE_TESTING", + "GENMSG_LANGS_DESTINATION": "etc/ros/genmsg", } try: if os.path.basename(info.path) != manifest.name: diff -Nru ros-catkin-lint-1.6.16/src/catkin_lint/_version.py ros-catkin-lint-1.6.17/src/catkin_lint/_version.py --- ros-catkin-lint-1.6.16/src/catkin_lint/_version.py 2022-01-10 13:33:36.000000000 +0000 +++ ros-catkin-lint-1.6.17/src/catkin_lint/_version.py 2022-03-14 21:19:23.000000000 +0000 @@ -23,9 +23,9 @@ # setup.py/versioneer.py will grep for the variable names, so they must # each be defined on a line of their own. _version.py will just call # get_keywords(). - git_refnames = " (HEAD -> master, tag: 1.6.16)" - git_full = "38407dcd01617c105b2010cd1aad1108dbd09178" - git_date = "2022-01-10 14:33:36 +0100" + git_refnames = " (HEAD -> master, tag: 1.6.17)" + git_full = "0162af5cb1d00b13c1c9fc7ba757b32c272b9685" + git_date = "2022-03-14 22:19:23 +0100" keywords = {"refnames": git_refnames, "full": git_full, "date": git_date} return keywords diff -Nru ros-catkin-lint-1.6.16/test/test_checks_build.py ros-catkin-lint-1.6.17/test/test_checks_build.py --- ros-catkin-lint-1.6.16/test/test_checks_build.py 2022-01-10 13:33:36.000000000 +0000 +++ ros-catkin-lint-1.6.17/test/test_checks_build.py 2022-03-14 21:19:23.000000000 +0000 @@ -488,6 +488,24 @@ project(mock) find_package(catkin REQUIRED) catkin_package() + file(GENERATE OUTPUT ${PROJECT_SOURCE_DIR}/generated/file.cpp CONTENT "content") + add_executable(${PROJECT_NAME} generated/file.cpp) + """, checks=cc.source_files) + self.assertEqual([], result) + result = mock_lint(env, pkg, + """ + project(mock) + find_package(catkin REQUIRED) + catkin_package() + file(WRITE ${PROJECT_SOURCE_DIR}/generated/file.cpp "content") + add_executable(${PROJECT_NAME} generated/file.cpp) + """, checks=cc.source_files) + self.assertEqual([], result) + result = mock_lint(env, pkg, + """ + project(mock) + find_package(catkin REQUIRED) + catkin_package() configure_file(file.in /some/generated/file.cpp) add_executable(${PROJECT_NAME} /some/generated/file.cpp) """, checks=cc.source_files)