From c87d2f62fc6e4bce0f2a26e5f5949ace142b473c Mon Sep 17 00:00:00 2001 From: doylet Date: Tue, 3 Dec 2024 14:03:41 +1100 Subject: [PATCH] Fix python bin dir not set, improve dev script --- Win/Scripts/dev.bat | 49 +++++++++++++++++++++++++++------------------ app_manifest_dev.py | 2 +- 2 files changed, 31 insertions(+), 20 deletions(-) diff --git a/Win/Scripts/dev.bat b/Win/Scripts/dev.bat index 02ca7dc..1cbbf55 100644 --- a/Win/Scripts/dev.bat +++ b/Win/Scripts/dev.bat @@ -10,6 +10,9 @@ set root_dir=%devenver_root% :: Arguments ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: set clang_dir=%root_dir%\LLVM set cmake_dir=%root_dir%\CMake +set msvc_dir=%root_dir%\msvc +set msvc_vc_dir=%msvc_dir%\msvc_host_x64_target_x64 +set msvc_sdk_dir=%msvc_dir%\sdk_host_x64_target_x64 set node_dir=%root_dir%\NodeJS set raddbg_dir=%root_dir%\raddbg\trunk set raddbg_args=--user:%raddbg_dir%\..\doylet.raddbg_user @@ -27,15 +30,16 @@ set virustotal_url=https://www.virustotal.com/gui/file set option=%1 shift +if "%option%"=="clang" set "exe_dir=%clang_dir%\%1\bin" && set path=%exe_dir%;%path% && set cmd_line=!exe_dir!\%2 && shift && shift +if "%option%"=="cmake" set "exe_dir=%cmake_dir%\%1" && set path=%exe_dir%;%path% && set cmd_line=!exe_dir!\%2 && shift && shift +if "%option%"=="node" set "exe_dir=%node_dir%\%1" && set path=%exe_dir%;%path% && set cmd_line=!exe_dir!\%2 && shift && shift +if "%option%"=="msvc" endlocal && call %msvc_vc_dir%\%1\devcmd.bat && call %msvc_sdk_dir%\%2\devcmd.bat && goto :eof +if "%option%"=="rad_update" set "exe_dir=%rad_update_dir%" && set path=%rad_update_dir%;%path% && set cmd_line=!exe_dir!\update_trunk.bat if "%option%"=="raddbg" set "exe_dir=%raddbg_dir%" && set path=%exe_dir%;%path% && set cmd_line=start /B !exe_dir!\%raddbg_exe% %raddbg_args% if "%option%"=="raddbg_env" endlocal && set path=%raddbg_dir%;%path% && goto :eof if "%option%"=="radlink" set "exe_dir=%radlink_dir%" && set path=%exe_dir%;%path% && set cmd_line=!exe_dir!\%radlink_exe% if "%option%"=="radlink_env" endlocal && set path=%radlink_dir%;%path% && goto :eof -if "%option%"=="rad_update" set "exe_dir=%rad_update_dir%" && set path=%rad_update_dir%;%path% && set cmd_line=!exe_dir!\update_trunk.bat -if "%option%"=="clang" set "exe_dir=%clang_dir%\%1\bin" && set path=%exe_dir%;%path% && set cmd_line=!exe_dir!\%2 && shift && shift -if "%option%"=="cmake" set "exe_dir=%cmake_dir%\%1" && set path=%exe_dir%;%path% && set cmd_line=!exe_dir!\%2 && shift && shift if "%option%"=="remedybg" set "exe_dir=%remedybg_dir%\%1" && set path=%exe_dir%;%path% && set cmd_line=start /B !exe_dir!\%remedybg_exe% && shift -if "%option%"=="node" set "exe_dir=%node_dir%\%1" && set path=%exe_dir%;%path% && set cmd_line=!exe_dir!\%2 && shift && shift if "%option%"=="virustotal" for /f "delims=" %%a in ('powershell -Command "(Get-FileHash \"%1\" -Algorithm SHA256).Hash"') do set virustotal_hash=%%a && shift if "%option%"=="virustotal" set cmd_line=start /B %virustotal_url%/%virustotal_hash% @@ -45,6 +49,8 @@ if "%option%"=="help" ( for /f "delims=" %%a in ('dir /B %cmake_dir%') do set "cmake_versions=%%a !cmake_versions!" for /f "delims=" %%a in ('dir /B %remedybg_dir%') do set "remedybg_versions=%%a !remedybg_versions!" for /f "delims=" %%a in ('dir /B %node_dir%') do set "node_versions=%%a !node_versions!" + for /f "delims=" %%a in ('dir /B %msvc_vc_dir%') do set "msvc_vc_versions=%%a !msvc_vc_versions!" + for /f "delims=" %%a in ('dir /B %msvc_sdk_dir%') do set "msvc_sdk_versions=%%a !msvc_sdk_versions!" echo USAGE: dev [option] [args...] echo. @@ -53,25 +59,30 @@ if "%option%"=="help" ( echo current shell session. echo. echo OPTIONS: - echo cmake [version] [exe] CMake build system: '%cmake_dir%\[version]\[exe] %cmake_args%' - echo Versions: !cmake_versions! + echo cmake [version] [exe] CMake build system: '%cmake_dir%\[version]\[exe] %cmake_args%' + echo Versions: !cmake_versions! echo. - echo clang [version] [exe] CLANG compiler: '%clang_dir%\[version]\[exe] %clang_args%' - echo Example: 'dev clang 18.1.4 clang++.exe --help' - echo Versions: !clang_versions! + echo clang [version] [exe] CLANG compiler: '%clang_dir%\[version]\[exe] %clang_args%' + echo Example: 'dev clang 18.1.4 clang++.exe --help' + echo Versions: !clang_versions! echo. - echo node [version] [exe] Node JS: '%node_dir%\[version]\[exe]' - echo Versions: !node_versions! + echo msvc [vc_version] [sdk_version] MSVC build tools: '%msvc_vc_dir%\[vc_version]' + echo '%msvc_sdk_dir%\[sdk_version]' + echo VC Versions: !msvc_vc_versions! + echo SDK Versions: !msvc_sdk_versions! echo. - echo raddbg RAD debugger: '%raddbg_dir%\%raddbg_exe% %raddbg_args%' - echo raddbg_env [cmd...] '%raddbg_dir%;[PATH]' - echo radlink RAD linker: '%radlink_dir%\%radlink_exe%' - echo radlink_env [cmd...] '%radlink_dir%;[PATH]' - echo rad_update Update the RAD linker and debugger: '%rad_update_dir%\%rad_update_exe%' - echo remedybg [version] C/C++ debugger: '%remedybg_dir%\%remedybg_exe%' - echo Versions: !remedybg_versions! + echo node [version] [exe] Node JS: '%node_dir%\[version]\[exe]' + echo Versions: !node_versions! echo. - echo virustotal [file] Lookup file SHA256 hash on VirusTotal: '%virustotal_url%/[file]' + echo raddbg RAD debugger: '%raddbg_dir%\%raddbg_exe% %raddbg_args%' + echo raddbg_env [cmd...] '%raddbg_dir%;[PATH]' + echo radlink RAD linker: '%radlink_dir%\%radlink_exe%' + echo radlink_env [cmd...] '%radlink_dir%;[PATH]' + echo rad_update Update the RAD linker and debugger: '%rad_update_dir%\%rad_update_exe%' + echo remedybg [version] C/C++ debugger: '%remedybg_dir%\%remedybg_exe%' + echo Versions: !remedybg_versions! + echo. + echo virustotal [file] Lookup file SHA256 hash on VirusTotal: '%virustotal_url%/[file]' goto :eof ) diff --git a/app_manifest_dev.py b/app_manifest_dev.py index 60478c4..4c4911e 100644 --- a/app_manifest_dev.py +++ b/app_manifest_dev.py @@ -972,7 +972,7 @@ def get_manifest(is_windows): exe_path = "install/python.exe" add_to_devenv_script = [ f"set PYTHONHOME=%~dp0{label}\\{version}\\install", - f"set PATH=%~dp0{label}\\{version}\\install\\Script;%PATH%", + f"set PATH=%~dp0{label}\\{version}\\install\\Scripts;%PATH%", ] 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"