mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2026-01-08 21:47:59 -05:00
GP-4816: Not trying to create python virtual environment during prepdev
is python is not installed
This commit is contained in:
@@ -50,7 +50,7 @@ if ("32".equals(System.getProperty("sun.arch.data.model"))) {
|
||||
* Identify supported Python command
|
||||
***************************************************************************************/
|
||||
project.ext.SUPPORTED_PY_VERSIONS = ['3.12', '3.11', '3.10', '3.9']
|
||||
project.ext.PYTHON3 = findPython3()
|
||||
project.ext.PYTHON3 = findPython3(true)
|
||||
project.ext.PYTHON_DEPS = new HashSet<String>()
|
||||
|
||||
/*********************************************************************************
|
||||
@@ -198,7 +198,7 @@ def checkPip(String pyCmd) {
|
||||
}
|
||||
}
|
||||
|
||||
def findPython3() {
|
||||
def findPython3(boolean useDefault) {
|
||||
for (pyCmd in ['py', 'python3', 'python']) {
|
||||
def pyVer = checkPythonVersion(pyCmd)
|
||||
if (pyVer in SUPPORTED_PY_VERSIONS) {
|
||||
@@ -219,7 +219,8 @@ def findPython3() {
|
||||
// Force use of non-existent python3.9 instead of unsupported python version
|
||||
// which should fail if a python build is performed.
|
||||
println("Warning: Python3 command not found (required for build)")
|
||||
return 'python3.9'
|
||||
|
||||
return useDefault ? 'python3.9' : null
|
||||
}
|
||||
|
||||
/******************************************************************************************
|
||||
|
||||
Reference in New Issue
Block a user