diff options
Diffstat (limited to 'build_files/utils')
-rwxr-xr-x | build_files/utils/make_test.py | 8 | ||||
-rwxr-xr-x | build_files/utils/make_update.py | 11 | ||||
-rwxr-xr-x | build_files/utils/make_utils.py | 8 |
3 files changed, 17 insertions, 10 deletions
diff --git a/build_files/utils/make_test.py b/build_files/utils/make_test.py index b89afc738ce..a8a6afc43cc 100755 --- a/build_files/utils/make_test.py +++ b/build_files/utils/make_test.py @@ -30,11 +30,11 @@ cmake_command = args.cmake_command config = args.config build_dir = args.build_directory -if shutil.which(ctest_command) is None: +if make_utils.command_missing(ctest_command): sys.stderr.write("ctest not found, can't run tests\n") sys.exit(1) -if shutil.which(git_command) is None: +if make_utils.command_missing(git_command): sys.stderr.write("git not found, can't run tests\n") sys.exit(1) @@ -45,11 +45,11 @@ lib_tests_dirpath = os.path.join('..', 'lib', "tests") if not os.path.exists(lib_tests_dirpath): print("Tests files not found, downloading...") - if shutil.which(svn_command) is None: + if make_utils.command_missing(svn_command): sys.stderr.write("svn not found, can't checkout test files\n") sys.exit(1) - if shutil.which(cmake_command) is None: + if make_utils.command_missing(cmake_command): sys.stderr.write("cmake not found, can't checkout test files\n") sys.exit(1) diff --git a/build_files/utils/make_update.py b/build_files/utils/make_update.py index 2cbbd1ffd72..3ecfa218432 100755 --- a/build_files/utils/make_update.py +++ b/build_files/utils/make_update.py @@ -30,7 +30,6 @@ def parse_arguments(): parser.add_argument("--git-command", default="git") return parser.parse_args() - # Setup for precompiled libraries and tests from svn. def svn_update(args, release_version): svn_non_interactive = [args.svn_command, '--non-interactive'] @@ -56,7 +55,7 @@ def svn_update(args, release_version): if not os.path.exists(lib_platform_dirpath): print_stage("Checking out Precompiled Libraries") - if shutil.which(args.svn_command) is None: + if make_utils.command_missing(args.svn_command): sys.stderr.write("svn not found, can't checkout libraries\n") sys.exit(1) @@ -70,7 +69,7 @@ def svn_update(args, release_version): if not os.path.exists(lib_tests_dirpath): print_stage("Checking out Tests") - if shutil.which(args.svn_command) is None: + if make_utils.command_missing(args.svn_command): sys.stderr.write("svn not found, can't checkout tests\n") sys.exit(1) @@ -91,7 +90,7 @@ def svn_update(args, release_version): if os.path.isdir(dirpath) and \ (os.path.exists(svn_dirpath) or os.path.exists(svn_root_dirpath)): - if shutil.which(args.svn_command) is None: + if make_utils.command_missing(args.svn_command): sys.stderr.write("svn not found, can't update libraries\n") sys.exit(1) @@ -102,7 +101,7 @@ def svn_update(args, release_version): # Update blender repository. def blender_update_skip(args): - if shutil.which(args.git_command) is None: + if make_utils.command_missing(args.git_command): sys.stderr.write("git not found, can't update code\n") sys.exit(1) @@ -136,7 +135,7 @@ def blender_update(args): # Update submodules. def submodules_update(args, release_version): print_stage("Updating Submodules") - if shutil.which(args.git_command) is None: + if make_utils.command_missing(args.git_command): sys.stderr.write("git not found, can't update code\n") sys.exit(1) diff --git a/build_files/utils/make_utils.py b/build_files/utils/make_utils.py index 0c63a18b0ba..5fedd792149 100755 --- a/build_files/utils/make_utils.py +++ b/build_files/utils/make_utils.py @@ -3,6 +3,7 @@ # Utility functions for make update and make tests. import re +import shutil import subprocess import sys @@ -54,3 +55,10 @@ def svn_libraries_base_url(release_version): else: svn_branch = "trunk" return "https://svn.blender.org/svnroot/bf-blender/" + svn_branch + "/lib/" + +def command_missing(command): + # Support running with Python 2 for macOS + if sys.version_info >= (3, 0): + return shutil.which(command) is None + else: + return False |