[GR-35982] Add detection of python3 binary.

PullRequest: mx/1426
graalvm · Jan 7, 2022 · 29c0deb · 29c0deb
2 parents 1705f16 + 9a3397b
commit 29c0deb
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/common.json b/common.json
@@ -9,13 +9,17 @@
     "openjdk11":          {"name": "openjdk",   "version": "11.0.11+9", "platformspecific": true },
     "oraclejdk11":        {"name": "oraclejdk", "version": "11.0.11+9", "platformspecific": true },
     "labsjdk-ce-11":      {"name": "labsjdk",   "version": "ce-11.0.13+8-jvmci-22.0-b02", "platformspecific": true },
+    "labsjdk-ce-11-llvm": {"name": "labsjdk",   "version": "ce-11.0.14+7-jvmci-22.1-b00-sulong", "platformspecific": true },
     "labsjdk-ee-11":      {"name": "labsjdk",   "version": "ee-11.0.14+5-jvmci-22.0-b02", "platformspecific": true },
+    "labsjdk-ee-11-llvm": {"name": "labsjdk",   "version": "ee-11.0.14+6-jvmci-22.1-b00-sulong", "platformspecific": true },
 
     "oraclejdk17":        {"name": "oraclejdk", "version": "17.0.1+12", "platformspecific": true },
     "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17.0.2+5-jvmci-22.0-b02", "platformspecific": true },
     "labsjdk-ce-17Debug": {"name": "labsjdk",   "version": "ce-17.0.2+5-jvmci-22.0-b02-debug", "platformspecific": true },
+    "labsjdk-ce-17-llvm": {"name": "labsjdk",   "version": "ce-17.0.2+6-jvmci-22.1-b00-sulong", "platformspecific": true },
     "labsjdk-ee-17":      {"name": "labsjdk",   "version": "ee-17.0.2+5-jvmci-22.0-b02", "platformspecific": true },
-    "labsjdk-ee-17Debug": {"name": "labsjdk",   "version": "ee-17.0.2+5-jvmci-22.0-b02-debug", "platformspecific": true }
+    "labsjdk-ee-17Debug": {"name": "labsjdk",   "version": "ee-17.0.2+5-jvmci-22.0-b02-debug", "platformspecific": true },
+    "labsjdk-ee-17-llvm": {"name": "labsjdk",   "version": "ee-17.0.2+6-jvmci-22.1-b00-sulong", "platformspecific": true }
   },
 
   "COMMENT.devkits" : "The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)",

diff --git a/mx b/mx
@@ -60,7 +60,18 @@ else
         if [ $? -eq 0 ]; then
             python_exe=python2
         else
-            python_exe=python
+            type python > /dev/null 2>&1
+            if [ $? -eq 0 ]; then
+                python_exe=python
+            else
+                type python3 > /dev/null 2>&1
+                if [ $? -eq 0 ]; then
+                    python_exe=python3
+                else
+                    echo "Cannot find Python on PATH"
+                    exit 1
+                fi
+            fi
         fi
     fi
 fi

diff --git a/mx.py b/mx.py
@@ -15295,9 +15295,9 @@ def canonicalizeprojects(args):
                             ignoredDeps.discard(dep)
                         if pkg in dep.extended_java_packages():
                             ignoredDeps.discard(dep)
-
             genDeps = frozenset([dependency(name, context=p) for name in getattr(p, "generatedDependencies", [])])
             incorrectGenDeps = genDeps - ignoredDeps
+
             ignoredDeps -= genDeps
             if incorrectGenDeps:
                 p.abort('{0} should declare following as normal dependencies, not generatedDependencies: {1}'.format(p, ', '.join([d.name for d in incorrectGenDeps])))
@@ -17876,7 +17876,7 @@ def alarm_handler(signum, frame):
 
 
 # The version must be updated for every PR (checked in CI)
-version = VersionSpec("5.317.6")  # GR-35989
+version = VersionSpec("5.317.7")  # GR-35982
 
 currentUmask = None
 _mx_start_datetime = datetime.utcnow()