From e83d87f588c22e3695dba19cedcd07b3eac55aff Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Tue, 17 Dec 2024 19:02:45 +0100 Subject: [PATCH] Move several py scripts from `build_files` to `tools`. Preliminary step towards adding 'system python' validation for some build-essential py scripts (!130746). Pull Request: https://projects.blender.org/blender/blender/pulls/132025 --- GNUmakefile | 10 +++++----- tools/check_source/check_mypy_config.py | 6 +++--- .../cmake => tools/check_source}/clang_array_check.py | 0 .../check_source/static_check_clang.py | 2 +- .../check_source/static_check_clang_array.py | 0 .../check_source/static_check_cppcheck.py | 0 .../utils_ide}/cmake_netbeans_project.py | 0 .../qtcreator/externaltools/qtc_project_update.py | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) rename {build_files/cmake => tools/check_source}/clang_array_check.py (100%) rename build_files/cmake/cmake_static_check_clang.py => tools/check_source/static_check_clang.py (99%) rename build_files/cmake/cmake_static_check_clang_array.py => tools/check_source/static_check_clang_array.py (100%) rename build_files/cmake/cmake_static_check_cppcheck.py => tools/check_source/static_check_cppcheck.py (100%) rename {build_files/cmake => tools/utils_ide}/cmake_netbeans_project.py (100%) diff --git a/GNUmakefile b/GNUmakefile index f57ce357bdb..91bcaa0ca05 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -463,10 +463,10 @@ test: .FORCE # project_qtcreator: .FORCE - $(PYTHON) build_files/cmake/cmake_qtcreator_project.py --build-dir "$(BUILD_DIR)" + $(PYTHON) tools/utils_ide/cmake_qtcreator_project.py --build-dir "$(BUILD_DIR)" project_netbeans: .FORCE - $(PYTHON) build_files/cmake/cmake_netbeans_project.py "$(BUILD_DIR)" + $(PYTHON) tools/utils_ide/cmake_netbeans_project.py "$(BUILD_DIR)" project_eclipse: .FORCE cmake -G"Eclipse CDT4 - Unix Makefiles" -H"$(BLENDER_DIR)" -B"$(BUILD_DIR)" @@ -480,19 +480,19 @@ check_cppcheck: .FORCE @$(CMAKE_CONFIG) @cd "$(BUILD_DIR)" ; \ $(PYTHON) \ - "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py" + "$(BLENDER_DIR)/tools/check_source/static_check_cppcheck.py" check_struct_comments: .FORCE @$(CMAKE_CONFIG) @cd "$(BUILD_DIR)" ; \ $(PYTHON) \ - "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_clang.py" \ + "$(BLENDER_DIR)/tools/check_source/static_check_clang.py" \ --checks=struct_comments --match=".*" --jobs=$(NPROCS) check_clang_array: .FORCE @$(CMAKE_CONFIG) @cd "$(BUILD_DIR)" ; \ - $(PYTHON) "$(BLENDER_DIR)/build_files/cmake/cmake_static_check_clang_array.py" + $(PYTHON) "$(BLENDER_DIR)/tools/check_source/static_check_clang_array.py" check_mypy: .FORCE @$(PYTHON) "$(BLENDER_DIR)/tools/check_source/check_mypy.py" diff --git a/tools/check_source/check_mypy_config.py b/tools/check_source/check_mypy_config.py index c61977d15e3..e81a31ab58f 100644 --- a/tools/check_source/check_mypy_config.py +++ b/tools/check_source/check_mypy_config.py @@ -43,9 +43,9 @@ PATHS_EXCLUDE = set( os.path.join(SOURCE_DIR, p.replace("/", os.sep)) for p in ( - "build_files/cmake/clang_array_check.py", - "build_files/cmake/cmake_netbeans_project.py", - "build_files/cmake/cmake_qtcreator_project.py", + "tools/check_source/clang_array_check.py", + "tools/utils_ide/cmake_netbeans_project.py", + "tools/utils_ide/cmake_qtcreator_project.py", "release/datafiles/blender_icons_geom.py", # Uses `bpy` too much. "tests/utils/bl_run_operators.py", # Uses `bpy` too much. "tests/utils/bl_run_operators_event_simulate.py", # Uses `bpy` too much. diff --git a/build_files/cmake/clang_array_check.py b/tools/check_source/clang_array_check.py similarity index 100% rename from build_files/cmake/clang_array_check.py rename to tools/check_source/clang_array_check.py diff --git a/build_files/cmake/cmake_static_check_clang.py b/tools/check_source/static_check_clang.py similarity index 99% rename from build_files/cmake/cmake_static_check_clang.py rename to tools/check_source/static_check_clang.py index 2b6d3ccd1f6..c5b73e4b86e 100644 --- a/build_files/cmake/cmake_static_check_clang.py +++ b/tools/check_source/static_check_clang.py @@ -10,7 +10,7 @@ To call this directly: export CLANG_LIB_DIR=/usr/lib64 cd {BUILD_DIR} -python ../blender/build_files/cmake/cmake_static_check_clang.py --match=".*" --checks=struct_comments +python ../blender/tools/check_source/static_check_clang.py --match=".*" --checks=struct_comments """ diff --git a/build_files/cmake/cmake_static_check_clang_array.py b/tools/check_source/static_check_clang_array.py similarity index 100% rename from build_files/cmake/cmake_static_check_clang_array.py rename to tools/check_source/static_check_clang_array.py diff --git a/build_files/cmake/cmake_static_check_cppcheck.py b/tools/check_source/static_check_cppcheck.py similarity index 100% rename from build_files/cmake/cmake_static_check_cppcheck.py rename to tools/check_source/static_check_cppcheck.py diff --git a/build_files/cmake/cmake_netbeans_project.py b/tools/utils_ide/cmake_netbeans_project.py similarity index 100% rename from build_files/cmake/cmake_netbeans_project.py rename to tools/utils_ide/cmake_netbeans_project.py diff --git a/tools/utils_ide/qtcreator/externaltools/qtc_project_update.py b/tools/utils_ide/qtcreator/externaltools/qtc_project_update.py index ef274e8404f..58eaf0481f6 100755 --- a/tools/utils_ide/qtcreator/externaltools/qtc_project_update.py +++ b/tools/utils_ide/qtcreator/externaltools/qtc_project_update.py @@ -31,7 +31,7 @@ SOURCE_DIR = cmake_find_source(PROJECT_DIR) cmd = ( "python", - os.path.join(SOURCE_DIR, "build_files/cmake/cmake_qtcreator_project.py"), + os.path.join(SOURCE_DIR, "tools/utils_ide/cmake_qtcreator_project.py"), "--build-dir", PROJECT_DIR, )