griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: strip trailing space for TOML,HTML & XML

Browse Source
This commit is contained in:
Campbell Barton
2025-02-02 13:56:48 +11:00
parent 36531006da
commit 59732c95d8
6 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@@ -1112,13 +1112,13 @@ if(WIN32)
option(WITH_WINDOWS_FIND_MODULES "Use find_package to locate libraries" OFF) option(WITH_WINDOWS_FIND_MODULES "Use find_package to locate libraries" OFF)
mark_as_advanced(WITH_WINDOWS_FIND_MODULES) mark_as_advanced(WITH_WINDOWS_FIND_MODULES)
# The python debugger in Visual Studio for has been broken for years # The python debugger in Visual Studio for has been broken for years
# but the upstream project over at https://github.com/microsoft/PTVS # 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 # 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 # 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 # 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 # working and they spend a whole bunch of time on trying to get it to
# work. So for now rather than removing this functionality # work. So for now rather than removing this functionality
# completely, just disable it. # completely, just disable it.
if(WINDOWS_PYTHON_DEBUG) if(WINDOWS_PYTHON_DEBUG)

4
build_files/cmake/packaging.cmake
View File

@@ -91,9 +91,9 @@ if(WIN32)
set(CPACK_NSIS_MUI_ICON ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.ico) set(CPACK_NSIS_MUI_ICON ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.ico)
set(CPACK_NSIS_COMPRESSOR "/SOLID lzma") set(CPACK_NSIS_COMPRESSOR "/SOLID lzma")
# Eventhough we no longer display this, we still need to set it otherwise it'll throw an error # 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_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) set(CPACK_WIX_PRODUCT_ICON ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.ico)

2
doc/python_api/templates/components/footer_contribute.html
View File

@@ -15,4 +15,4 @@
</li> </li>
</ul> </ul>
</div> </div>
{%- endif %} {%- endif %}

2
doc/python_api/templates/page.html
View File

@@ -3,4 +3,4 @@
{%- block footer -%} {%- block footer -%}
{{ super() }} {{ super() }}
{%- include "components/footer_contribute.html" -%} {%- include "components/footer_contribute.html" -%}
{%- endblock footer -%} {%- endblock footer -%}

2
scripts/templates_toml/blender_manifest.toml
View File

@@ -72,4 +72,4 @@ license = [
# "__pycache__/", # "__pycache__/",
# "/.git/", # "/.git/",
# "/*.zip", # "/*.zip",
# ] # ]

5
tools/utils_maintenance/trailing_space_clean.py
View File

@@ -21,10 +21,15 @@ SOURCE_EXT = (
".glsl", ".glsl",
# Python # Python
".py", ".py",
# TOML.
".toml",
# Text (also CMake) # Text (also CMake)
".txt", ".cmake", ".rst", ".txt", ".cmake", ".rst",
# MS-Windows Scripts. # MS-Windows Scripts.
".bat", ".cmd", ".bat", ".cmd",
# HTML, XML.
".html",
".xml",
) )