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

Move several py scripts from build_files to tools.

Browse Source 
Preliminary step towards adding 'system python' validation for some
build-essential py scripts (!130746).

Pull Request: https://projects.blender.org/blender/blender/pulls/132025
This commit is contained in:
Bastien Montagne
2024-12-17 19:02:45 +01:00
committed by Bastien Montagne
parent ef0fcab8b7
commit e83d87f588
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
GNUmakefile
View File

@@ -463,10 +463,10 @@ test: .FORCE
# #
project_qtcreator: .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 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 project_eclipse: .FORCE
cmake -G"Eclipse CDT4 - Unix Makefiles" -H"$(BLENDER_DIR)" -B"$(BUILD_DIR)" cmake -G"Eclipse CDT4 - Unix Makefiles" -H"$(BLENDER_DIR)" -B"$(BUILD_DIR)"
@@ -480,19 +480,19 @@ check_cppcheck: .FORCE
@$(CMAKE_CONFIG) @$(CMAKE_CONFIG)
@cd "$(BUILD_DIR)" ; \ @cd "$(BUILD_DIR)" ; \
$(PYTHON) \ $(PYTHON) \
"$(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py" "$(BLENDER_DIR)/tools/check_source/static_check_cppcheck.py"
check_struct_comments: .FORCE check_struct_comments: .FORCE
@$(CMAKE_CONFIG) @$(CMAKE_CONFIG)
@cd "$(BUILD_DIR)" ; \ @cd "$(BUILD_DIR)" ; \
$(PYTHON) \ $(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) --checks=struct_comments --match=".*" --jobs=$(NPROCS)
check_clang_array: .FORCE check_clang_array: .FORCE
@$(CMAKE_CONFIG) @$(CMAKE_CONFIG)
@cd "$(BUILD_DIR)" ; \ @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 check_mypy: .FORCE
@$(PYTHON) "$(BLENDER_DIR)/tools/check_source/check_mypy.py" @$(PYTHON) "$(BLENDER_DIR)/tools/check_source/check_mypy.py"

6
tools/check_source/check_mypy_config.py
View File

@@ -43,9 +43,9 @@ PATHS_EXCLUDE = set(
os.path.join(SOURCE_DIR, p.replace("/", os.sep)) os.path.join(SOURCE_DIR, p.replace("/", os.sep))
for p in for p in
( (
"build_files/cmake/clang_array_check.py", "tools/check_source/clang_array_check.py",
"build_files/cmake/cmake_netbeans_project.py", "tools/utils_ide/cmake_netbeans_project.py",
"build_files/cmake/cmake_qtcreator_project.py", "tools/utils_ide/cmake_qtcreator_project.py",
"release/datafiles/blender_icons_geom.py", # Uses `bpy` too much. "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.py", # Uses `bpy` too much.
"tests/utils/bl_run_operators_event_simulate.py", # Uses `bpy` too much. "tests/utils/bl_run_operators_event_simulate.py", # Uses `bpy` too much.

0
build_files/cmake/clang_array_check.py → tools/check_source/clang_array_check.py
View File

2
build_files/cmake/cmake_static_check_clang.py → tools/check_source/static_check_clang.py
View File

@@ -10,7 +10,7 @@ To call this directly:
export CLANG_LIB_DIR=/usr/lib64 export CLANG_LIB_DIR=/usr/lib64
cd {BUILD_DIR} 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
""" """

0
build_files/cmake/cmake_static_check_clang_array.py → tools/check_source/static_check_clang_array.py
View File

0
build_files/cmake/cmake_static_check_cppcheck.py → tools/check_source/static_check_cppcheck.py
View File

0
build_files/cmake/cmake_netbeans_project.py → tools/utils_ide/cmake_netbeans_project.py
View File

2
tools/utils_ide/qtcreator/externaltools/qtc_project_update.py
View File

@@ -31,7 +31,7 @@ SOURCE_DIR = cmake_find_source(PROJECT_DIR)
cmd = ( cmd = (
"python", "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", "--build-dir",
PROJECT_DIR, PROJECT_DIR,
) )