From 59732c95d852510c674f058eee34e51f49203935 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 2 Feb 2025 13:56:48 +1100 Subject: [PATCH] Cleanup: strip trailing space for TOML,HTML & XML --- CMakeLists.txt | 12 ++++++------ build_files/cmake/packaging.cmake | 4 ++-- .../templates/components/footer_contribute.html | 2 +- doc/python_api/templates/page.html | 2 +- scripts/templates_toml/blender_manifest.toml | 2 +- tools/utils_maintenance/trailing_space_clean.py | 5 +++++ 6 files changed, 16 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a6e71984519..9f3df906f57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1112,13 +1112,13 @@ if(WIN32) option(WITH_WINDOWS_FIND_MODULES "Use find_package to locate libraries" OFF) mark_as_advanced(WITH_WINDOWS_FIND_MODULES) -# The python debugger in Visual Studio for has been broken for years -# but the upstream project over at https://github.com/microsoft/PTVS -# show hopeful signs of life once in a while, so there is hope that +# The python debugger in Visual Studio for has been broken for years +# but the upstream project over at https://github.com/microsoft/PTVS +# show hopeful signs of life once in a while, so there is hope that # at one point this will start working again. That being said people -# do keep turning this option on and end up disappointed it isn't -# working and they spend a whole bunch of time on trying to get it to -# work. So for now rather than removing this functionality +# do keep turning this option on and end up disappointed it isn't +# working and they spend a whole bunch of time on trying to get it to +# work. So for now rather than removing this functionality # completely, just disable it. if(WINDOWS_PYTHON_DEBUG) diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake index 03dffd98085..fa46ebaa673 100644 --- a/build_files/cmake/packaging.cmake +++ b/build_files/cmake/packaging.cmake @@ -91,9 +91,9 @@ if(WIN32) set(CPACK_NSIS_MUI_ICON ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.ico) set(CPACK_NSIS_COMPRESSOR "/SOLID lzma") - + # Eventhough we no longer display this, we still need to set it otherwise it'll throw an error - # during the msi build. + # during the msi build. set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/release/license/spdx/GPL-3.0-or-later.txt) set(CPACK_WIX_PRODUCT_ICON ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.ico) diff --git a/doc/python_api/templates/components/footer_contribute.html b/doc/python_api/templates/components/footer_contribute.html index 3a34cf9ed0a..3f6ea8cb78f 100644 --- a/doc/python_api/templates/components/footer_contribute.html +++ b/doc/python_api/templates/components/footer_contribute.html @@ -15,4 +15,4 @@ -{%- endif %} \ No newline at end of file +{%- endif %} diff --git a/doc/python_api/templates/page.html b/doc/python_api/templates/page.html index f220bfeee4b..aeddec2f1c7 100644 --- a/doc/python_api/templates/page.html +++ b/doc/python_api/templates/page.html @@ -3,4 +3,4 @@ {%- block footer -%} {{ super() }} {%- include "components/footer_contribute.html" -%} -{%- endblock footer -%} \ No newline at end of file +{%- endblock footer -%} diff --git a/scripts/templates_toml/blender_manifest.toml b/scripts/templates_toml/blender_manifest.toml index 843ff2836a2..c425027c1cd 100644 --- a/scripts/templates_toml/blender_manifest.toml +++ b/scripts/templates_toml/blender_manifest.toml @@ -72,4 +72,4 @@ license = [ # "__pycache__/", # "/.git/", # "/*.zip", -# ] \ No newline at end of file +# ] diff --git a/tools/utils_maintenance/trailing_space_clean.py b/tools/utils_maintenance/trailing_space_clean.py index 549f4469ec0..aee63881c71 100755 --- a/tools/utils_maintenance/trailing_space_clean.py +++ b/tools/utils_maintenance/trailing_space_clean.py @@ -21,10 +21,15 @@ SOURCE_EXT = ( ".glsl", # Python ".py", + # TOML. + ".toml", # Text (also CMake) ".txt", ".cmake", ".rst", # MS-Windows Scripts. ".bat", ".cmd", + # HTML, XML. + ".html", + ".xml", )