aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2021-11-01 15:56:22 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-11-19 13:54:41 +0000
commit0f3e3754037e9a5f90f4e310326b079cfc6f6ca5 (patch)
tree64bc52c51e67e87366976e35e2787ec727a0fcc4
parentfe9f47a45eee1b9a5efaf6e42c87f9303c66c8b2 (diff)
setup.py: Remove dead function prepare_sub_modules
It was originally removed in the dev branch via 9c9b506f3b2cc64da6fbbef9f58ccec7ccfe4457 but was accidentally brought back with a 5.15 -> dev merge in 68ec9c643abf30cf22b9932ec82098cdebc08b98 Remove it again. Change-Id: I86d3be455e45feeb5fd08cba49ca0324a6a1a26d Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 554d28f8f2c6104aca88079e9c7999d30eaf629a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--build_scripts/main.py37
1 files changed, 0 insertions, 37 deletions
diff --git a/build_scripts/main.py b/build_scripts/main.py
index 160eb12a8..586e58d0a 100644
--- a/build_scripts/main.py
+++ b/build_scripts/main.py
@@ -271,43 +271,6 @@ def prefix():
return name
-# Initialize, pull and checkout submodules
-def prepare_sub_modules():
- v = get_package_version()
- print(f"Initializing submodules for {PYSIDE_MODULE} version: {v}")
- submodules_dir = os.path.join(setup_script_dir, "sources")
-
- # Create list of [name, desired branch, absolute path, desired
- # branch] and determine whether all submodules are present
- need_init_sub_modules = False
-
- for m in submodules:
- module_name = m[0]
- module_dir = m[1] if len(m) > 1 else ''
- module_dir = os.path.join(submodules_dir, module_dir, module_name)
- # Check for non-empty directory (repository checked out)
- if not os.listdir(module_dir):
- need_init_sub_modules = True
- break
-
- if need_init_sub_modules:
- git_update_cmd = ["git", "submodule", "update", "--init"]
- if run_process(git_update_cmd) != 0:
- m = "Failed to initialize the git submodules: update --init failed"
- raise DistutilsSetupError(m)
- git_pull_cmd = ["git", "submodule", "foreach", "git", "fetch", "--all"]
- if run_process(git_pull_cmd) != 0:
- m = "Failed to initialize the git submodules: git fetch --all failed"
- raise DistutilsSetupError(m)
- else:
- print("All submodules present.")
-
- git_update_cmd = ["git", "submodule", "update"]
- if run_process(git_update_cmd) != 0:
- m = "Failed to checkout the correct git submodules SHA1s."
- raise DistutilsSetupError(m)
-
-
def prepare_build():
# Clean up temp build folder.
for n in ["build"]: