diff --git a/win/build-deps.cmd b/win/build-deps.cmd index 3d5b705bd0..ad208015d5 100644 --- a/win/build-deps.cmd +++ b/win/build-deps.cmd @@ -403,16 +403,15 @@ rmdir /s /q "%INSTALL_DIR%\opencascade-%OCCT_VERSION%\samples" del "%INSTALL_DIR%\opencascade-%OCCT_VERSION%\*.bat" :Python +set DEPENDENCY_NAME=Python %PYTHON_VERSION% +set DEPENDENCY_DIR=N/A +set PYTHON_AMD64_POSTFIX=.amd64 +:: NOTE/TODO Beginning from 3.5.0: set PYTHON_AMD64_POSTFIX=-amd64 +IF NOT %TARGET_ARCH%==x64 set PYTHON_AMD64_POSTFIX= +:: NOTE/TODO 3.5.0 doesn't use MSI any longer, but exe: set PYTHON_INSTALLER=python-%PYTHON_VERSION%%PYTHON_AMD64_POSTFIX%.exe +set PYTHON_INSTALLER=python-%PYTHON_VERSION%%PYTHON_AMD64_POSTFIX%.msi + IF "%IFCOS_INSTALL_PYTHON%"=="TRUE" ( - set DEPENDENCY_NAME=Python %PYTHON_VERSION% - set DEPENDENCY_DIR=N/A - - set PYTHON_AMD64_POSTFIX=.amd64 - :: NOTE/TODO Beginning from 3.5.0: set PYTHON_AMD64_POSTFIX=-amd64 - IF NOT %TARGET_ARCH%==x64 set PYTHON_AMD64_POSTFIX= - :: NOTE/TODO 3.5.0 doesn't use MSI any longer, but exe: set PYTHON_INSTALLER=python-%PYTHON_VERSION%%PYTHON_AMD64_POSTFIX%.exe - set PYTHON_INSTALLER=python-%PYTHON_VERSION%%PYTHON_AMD64_POSTFIX%.msi - cd "%DEPS_DIR%" call :DownloadFile https://www.python.org/ftp/python/%PYTHON_VERSION%/%PYTHON_INSTALLER% "%DEPS_DIR%" %PYTHON_INSTALLER% IF NOT %ERRORLEVEL%==0 GOTO :Error