Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor build scripts #962

Merged
merged 14 commits into from
Dec 18, 2023
Merged

Refactor build scripts #962

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
bbdb78a
Remove build_python_extension parameter
VDovidaytis-HORIS Dec 5, 2023
c4fabd7
Add architecture parameter. Switch python-extension by enable_python_…
VDovidaytis-HORIS Dec 6, 2023
06bddc0
Update release script
VDovidaytis-HORIS Dec 6, 2023
475ef57
Switch off architecture check for Windows
VDovidaytis-HORIS Dec 8, 2023
5d5e9bd
Remove local variable
VDovidaytis-HORIS Dec 8, 2023
60f7400
Update release script
VDovidaytis-HORIS Dec 8, 2023
07a9f1a
Move architecture check to function. Remove currentOS variable.
VDovidaytis-HORIS Dec 8, 2023
5f0bf50
Add command parameter
VDovidaytis-HORIS Dec 8, 2023
767a46b
Fix typo. Switch var for OS.
VDovidaytis-HORIS Dec 8, 2023
ffbd81b
Change variable
VDovidaytis-HORIS Dec 11, 2023
9ee7fa9
Switch to local.properties file instead of build_settings.yml. Refact…
VDovidaytis-HORIS Dec 11, 2023
d9dea59
Refactoring
VDovidaytis-HORIS Dec 12, 2023
8e073d9
Enable python-package for release build
VDovidaytis-HORIS Dec 13, 2023
55a7e34
Remove extra vars
VDovidaytis-HORIS Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update release script
  • Loading branch information
@VDovidaytis-HORIS
VDovidaytis-HORIS committed Dec 6, 2023
commit 06bddc062526b06c5c36daa3c868df9a2e0a3943
15 changes: 14 additions & 1 deletion build_release.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def build_python_packages(build_command, arch=None):
# Runs Python artifacts build commands. If 'arch' argument was passed, adds it to shell command.
python_extension_build_command = [gradle_script_name, "python-extension:build"]
if arch is not None:
python_extension_build_command += [f"-Pbuild_arch={arch}"]
python_extension_build_command += [f"-Parchitecture={arch}"]
command = build_command + [arch]
else:
command = build_command
Expand All @@ -89,6 +89,17 @@ def build_python_packages(build_command, arch=None):
run_command(command)


def get_python_arch(python_bin_path):
get_python_arch_command = [f"{python_bin_path}/python", "-c", "import platform; print(platform.machine())"]
process = subprocess.check_output(get_python_arch_command, stderr=None)
current_python_arch = process.decode().strip()
if current_python_arch == "arm64" or current_python_arch == "x86_64":
return current_python_arch
else:
print_error_and_exit(f"Got wrong Python architecture for {python_bin_path}!\n"
f"Check your settings file or Python installation.")


# Read Python settings file from script argument.
# Paths to Python binaries and include directories will be got from here:
python_settings = read_settings_file()
Expand Down Expand Up @@ -125,6 +136,7 @@ def build_python_packages(build_command, arch=None):
# Collect all predefined parameters:
build_parameters = [
"-Pbuild_release=true",
"-Parchitecture=%s" % (get_python_arch(python_paths["bin_path"])),
"-Ppython_bin_path=%s" % (python_paths["bin_path"]),
"-Ppython_include_path=%s" % (python_paths["include_path"]),
f"-Penable_python_package={enable_python_package}"
Expand Down Expand Up @@ -158,6 +170,7 @@ def build_python_packages(build_command, arch=None):
# Collect all predefined parameters:
build_parameters = [
"-Pbuild_release=true",
"-Parchitecture=%s" % (get_python_arch(python_paths["bin_path"])),
"-Ppython_bin_path=%s" % (python_paths["bin_path"]),
"-Ppython_include_path=%s" % (python_paths["include_path"]),
f"-Penable_python_package={enable_python_package}"
Expand Down