[GR-14768] Adopt macro options changes, integrate changes from 19.

PullRequest: graalpython/527

Author: gilles-duboscq

CHANGELOG.md

@@ -3,6 +3,13 @@
 This changelog summarizes major changes between GraalVM versions of the Python
 language runtime. The main focus is on user-observable behavior of the engine.
 
+## Version 19.0.0
+
+* Fix an issue preventing use of encodings in the installable binary
+* Fix return value of process when `os.exit` is called with a boolean
+* Fix interpretation of foreign objects to prefer interpreting them as integer over double
+* Fix performance regression when repeatedly creating a new function in a loop
+
 ## Version 1.0.0 RC16
 
 * No user-facing changes

LICENSE

@@ -1,7 +1,7 @@
-Product License  - GraalVM Community Edition 1.0 Python Language 
+Product License  - GraalVM Community Edition 20.0 Python Language 
 Component
 
-This is a release of GraalVM Community Edition 1.0 Python Language Component. 
+This is a release of GraalVM Community Edition 20.0 Python Language Component. 
 This particular copy of the software is released under Universal Permissive 
 License (UPL) v. 1.0.
 Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved

ci.jsonnet

@@ -128,7 +128,7 @@
 
   local labsjdk8Mixin = {
     downloads +: {
-      JAVA_HOME: utils.download("labsjdk", "8u202-jvmci-0.59"),
+      JAVA_HOME: utils.download("oraclejdk", "8u212-jvmci-20-b01"),
       EXTRA_JAVA_HOMES : { pathlist: [utils.download("oraclejdk", "11+28")] },
     },
     environment +: {

mx.graalpython/mx_graalpython.py

@@ -907,13 +907,28 @@ def import_python_sources(args):
 # register as a GraalVM language
 #
 # ----------------------------------------------------------------------------------------------------------------------
+mx_sdk.register_graalvm_component(mx_sdk.GraalVmLanguage(
+    suite=SUITE,
+    name='Graal.Python license files',
+    short_name='pynl',
+    dir_name='python',
+    license_files=['LICENSE_GRAALPYTHON.txt'],
+    third_party_license_files=['3rd_party_licenses_graalpython.txt'],
+    truffle_jars=[],
+    support_distributions=[
+        'graalpython:GRAALPYTHON_GRAALVM_LICENSES',
+    ],
+    priority=5
+))
+
+
 mx_sdk.register_graalvm_component(mx_sdk.GraalVmLanguage(
     suite=SUITE,
     name='Graal.Python',
     short_name='pyn',
     dir_name='python',
-    license_files=['LICENSE_GRAALPYTHON'],
-    third_party_license_files=['3rd_party_licenses_graalpython.txt'],
+    license_files=[],
+    third_party_license_files=[],
     truffle_jars=[
         'graalpython:GRAALPYTHON',
     ],
@@ -926,10 +941,8 @@ def import_python_sources(args):
             destination='bin/<exe:graalpython>',
             jar_distributions=['graalpython:GRAALPYTHON-LAUNCHER'],
             main_class='com.oracle.graal.python.shell.GraalPythonMain',
-            build_args=[
-                '--language:python',
-                '--language:llvm',
-            ]
+            build_args=[],
+            language='python',
         )
     ],
 ))

mx.graalpython/native-image.properties

@@ -1,12 +1,7 @@
 # This file contains native-image arguments needed to build graalpython
 #
 
-ImageName = graalpython
-
-Requires = tool:regex language:llvm
-
-LauncherClass = com.oracle.graal.python.shell.GraalPythonMain
-LauncherClassPath = lib/graalvm/launcher-common.jar:lib/graalvm/graalpython-launcher.jar
+Requires = language:regex language:llvm
 
 JavaArgs = -Xmx4G -Dpolyglot.engine.PreinitializeContexts=python
 

mx.graalpython/suite.py

@@ -9,7 +9,7 @@
     "name": "graalpython",
     "versionConflictResolution": "latest",
 
-    "version": "1.0.0-rc18",
+    "version": "20.0.0-beta.01",
     "release": False,
     "groupId": "org.graalvm.graalpython",
     "url": "http://www.graalvm.org/",
@@ -44,7 +44,7 @@
             },
             {
                 "name": "sulong",
-                "version": "87c4ce8eabe466ce13adb10a1bf527b8dc1e8c3b",
+                "version": "445077de669592367c0519ed38e5e1e5cbd7267d",
                 "subdir": True,
                 "urls": [
                     {"url": "https://github.com/oracle/graal", "kind": "git"},
@@ -360,8 +360,6 @@
                     "extracted-dependency:graalpython:GRAALPYTHON_PYTHON_LIB",
                     "file:mx.graalpython/native-image.properties",
                 ],
-                "LICENSE_GRAALPYTHON": "file:LICENSE",
-                "3rd_party_licenses_graalpython.txt": "file:3rd_party_licenses.txt",
             },
             "maven": False,
         },
@@ -375,5 +373,16 @@
             },
             "maven": False,
         },
+
+        "GRAALPYTHON_GRAALVM_LICENSES": {
+            "native": True,
+            "platformDependent": True,
+            "description": "Graal.Python support distribution for the GraalVM license files",
+            "layout": {
+                "LICENSE_GRAALPYTHON.txt": "file:LICENSE",
+                "3rd_party_licenses_graalpython.txt": "file:3rd_party_licenses.txt",
+            },
+            "maven": False,
+        },
     },
 }