From e5980efc3fbcd8e85f7f84e76d067ff4be5e57b9 Mon Sep 17 00:00:00 2001 From: doylet Date: Thu, 15 May 2025 11:13:46 +1000 Subject: [PATCH] Add python 3.11.12 to env --- Linux/Scripts/dev.sh | 23 ++++++++++++----------- app_manifest_dev.py | 12 ++++++------ 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Linux/Scripts/dev.sh b/Linux/Scripts/dev.sh index b9b52f2..44eb51c 100755 --- a/Linux/Scripts/dev.sh +++ b/Linux/Scripts/dev.sh @@ -1,27 +1,28 @@ #!/bin/bash -# Setup ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +# Setup :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: script_path=$0 script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) root_dir="${devenver_root}" -# Arguments ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +# Arguments :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: clang_dir="$root_dir/LLVM" cmake_dir="$root_dir/CMake" node_dir="$root_dir/NodeJS" python_dir="$root_dir/Python" virustotal_url="https://www.virustotal.com/gui/file" -# Argument parsing :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +# Argument parsing ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: option="$1" shift -if [ "$option" = "clang" ]; then exe_dir="$clang_dir/$1/bin" && PATH="$exe_dir:$PATH" && cmd_line="$exe_dir/$2" && shift && shift; fi -if [ "$option" = "cmake" ]; then exe_dir="$cmake_dir/$1" && PATH="$exe_dir:$PATH" && cmd_line="$exe_dir/$2" && shift && shift; fi -if [ "$option" = "node" ]; then exe_dir="$node_dir/$1/bin" && PATH="$exe_dir:$PATH" && cmd_line="$exe_dir/$2" && shift && shift; fi -if [ "$option" = "python" ]; then exe_dir="$python_dir/$1/install/bin" && PATH="$exe_dir:$PATH" && cmd_line="$exe_dir/$2" && shift && shift; fi -if [ "$option" = "python_env" ]; then PATH="$python_dir/$1/install/bin:$PATH" && shift && cmd_line="$1" && shift; fi -if [ "$option" = "virustotal" ]; then virustotal_hash=$(sha256sum "$1" | awk '{print $1}') && cmd_line="xdg-open $virustotal_url/$virustotal_hash &" && shift; fi +if [ "$option" = "clang" ]; then exe_dir="$clang_dir/$1/bin" && PATH="$exe_dir:$PATH" && cmd_line="$exe_dir/$2" && shift && shift; fi +if [ "$option" = "cmake" ]; then exe_dir="$cmake_dir/$1" && PATH="$exe_dir:$PATH" && cmd_line="$exe_dir/$2" && shift && shift; fi +if [ "$option" = "node" ]; then exe_dir="$node_dir/$1/bin" && PATH="$exe_dir:$PATH" && cmd_line="$exe_dir/$2" && shift && shift; fi +if [ "$option" = "node_env" ]; then PATH="$node_dir/$1/bin:$PATH" && shift && cmd_line="$1" && shift; fi +if [ "$option" = "python" ]; then cmd_prefix="LD_LIBRARY_PATH=$python_dir/$1/install/lib:$LD_LIBRARY_PATH" && exe_dir="$python_dir/$1/install/bin" && PATH="$exe_dir:$PATH" && cmd_line="$exe_dir/$2" && shift && shift; fi +if [ "$option" = "python_env" ]; then cmd_prefix="LD_LIBRARY_PATH=$python_dir/$1/install/lib:$LD_LIBRARY_PATH" && PATH="$python_dir/$1/install/bin:$PATH" && shift && cmd_line="$1" && shift; fi +if [ "$option" = "virustotal" ]; then virustotal_hash=$(sha256sum "$1" | awk '{print $1}') && cmd_line="xdg-open $virustotal_url/$virustotal_hash &" && shift; fi if [ -z "$cmd_line" ]; then option="help"; fi if [ "$option" = "help" ]; then @@ -67,5 +68,5 @@ while [ "${user_args: -1}" = " " ]; do user_args="${user_args% }"; done while [ "${cmd_line: -1}" = " " ]; do cmd_line="${cmd_line% }"; done # Eval :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -echo "DEV: Running '$script_path' with '$cmd_line$user_args'" -eval "$cmd_line$user_args" +echo "DEV: Running '$script_path' with '$cmd_prefix $cmd_line$user_args'" +eval "$cmd_prefix $cmd_line$user_args" diff --git a/app_manifest_dev.py b/app_manifest_dev.py index 26818c6..39ee4ad 100644 --- a/app_manifest_dev.py +++ b/app_manifest_dev.py @@ -1104,8 +1104,8 @@ def get_manifest(is_windows): # -------------------------------------------------------------------------- label = "Python" - date = "20230116" - version = f"3.10.9+{date}" + date = "20250409" + version = f"3.11.12+{date}" download_url = "" download_checksum = "" exe_path = "" @@ -1114,8 +1114,8 @@ def get_manifest(is_windows): if is_windows: download_url = f"https://github.com/indygreg/python-build-standalone/releases/download/{date}/cpython-{version}-x86_64-pc-windows-msvc-shared-pgo-full.tar.zst" - download_checksum = "4cfa6299a78a3959102c461d126e4869616f0a49c60b44220c000fc9aecddd78" - checksum = "6dafb845aba67aba898f5aa8adf6c48061e7ffea1d2ed7d290a1e4386e78f2f0" + download_checksum = "asd" + checksum = "asd" exe_path = "install/python.exe" add_to_devenv_script = [ f"set PYTHONHOME=%~dp0{label}\\{version}\\install", @@ -1123,8 +1123,8 @@ def get_manifest(is_windows): ] else: download_url = f"https://github.com/indygreg/python-build-standalone/releases/download/{date}/cpython-{version}-x86_64_v2-unknown-linux-gnu-pgo+lto-full.tar.zst" - download_checksum = "49f4a8c02efff2debbb258973b1f6efbd568e4be2e5dca07c7dcd754a7bff9cf" - checksum = "ee96234460ff4c5163dc0681dbfaf8cf5f4e65972fde796da7b0ee0d5ce077d5" + download_checksum = "68a3c1c39e9c69c2c89104eef725024cbf5f46acf955eeb28045c7c80814b124" + checksum = "3d1e6c5de538edcea5237cc2b239306dd8767fda942059888c554dc2baf58efb" exe_path = "install/bin/python3" # TODO: Get ZST somehow on linux