[GR-44216] Include native-image in GraalVM JDK.

PullRequest: graal/13772
oracle · Feb 15, 2023 · 886d817 · 886d817
2 parents c3f369a + 82331c1
commit 886d817
Show file tree

Hide file tree

Showing 23 changed files with 35 additions and 95 deletions.
diff --git a/docs/examples/java-kotlin-aot.md b/docs/examples/java-kotlin-aot.md
@@ -33,12 +33,7 @@ This example demonstrates how to compile a Java and Kotlin application ahead-of-
     ```
     Note that your paths are likely to be different depending on the download location.
 
-3. [Install Native Image](../reference-manual/native-image/README.md/#install-native-image) by running.
-    ```bash
-    gu install native-image
-    ```
-
-4. Then execute:
+3. Then execute:
     ```shell
     ./build.sh
     ```

diff --git a/docs/examples/native-image-examples.md b/docs/examples/native-image-examples.md
@@ -41,12 +41,7 @@ Here you will also find a more sophisticated example displaying GraalVM's abilit
     ```
     Note that your paths are likely to be different depending on the download location.
 
-3. Install [Native Image](../reference-manual/native-image/README.md/#install-native-image) support by running:
-    ```bash
-    gu install native-image
-    ```
-
-4. Then execute:
+3. Then execute:
     ```shell
     ./build.sh
     ```

diff --git a/docs/getting-started/graalvm-community/get-started-graalvm-community.md b/docs/getting-started/graalvm-community/get-started-graalvm-community.md
@@ -286,11 +286,7 @@ For more information on running polyglot applications, see [Polyglot Programming
 
 ## Native Image
 
-With GraalVM you can compile Java bytecode into a platform-specific, self-contained, native executable to achieve faster startup and smaller footprint for your application.
-The [Native Image](../../reference-manual/native-image/README.md) functionality is not available by default, but can be easily installed with the [GraalVM Updater](../../reference-manual/graalvm-updater.md) tool:
-```shell
-gu install native-image
-```
+With [Native Image](../../reference-manual/native-image/README.md) you can compile Java bytecode into a platform-specific, self-contained, native executable to achieve faster startup and smaller footprint for your application.
 
 The `HelloWorld` example from above is used here to demonstrate how to generate a native executable:
 ```java

diff --git a/docs/getting-started/graalvm-community/windows.md b/docs/getting-started/graalvm-community/windows.md
@@ -51,7 +51,7 @@ To run GraalVM Community Edition based on OpenJDK 8u292 on a Windows platform, t
 ## Supported Functionalities
 
 The GraalVM Community distribution for Windows platforms includes OpenJDK with the GraalVM compiler enabled, the [GraalVM Updater](../../reference-manual/graalvm-updater.md) tool to install additional functionalities and the developer tools (e.g., Chrome inspector based debugger, Profiler, etc.).
-Currently, the GraalVM environment on Windows can be extended with [Native Image](../../reference-manual/native-image/README.md), [Java on Truffle](../../reference-manual/java-on-truffle/README.md), [LLVM runtime](../../reference-manual/llvm/README.md), WebAssembly, JavaScript and Node.js support.
+Currently, the GraalVM environment on Windows can be extended with [Java on Truffle](../../reference-manual/java-on-truffle/README.md), [LLVM runtime](../../reference-manual/llvm/README.md), WebAssembly, JavaScript, and Node.js support.
 
 ## Prerequisites for Using Native Image on Windows
 On Windows, Native Image requires Visual Studio and Microsoft Visual C++(MSVC).

diff --git a/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md b/docs/getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md
@@ -285,12 +285,7 @@ More details can be found in the [WebAssembly reference manual](../../reference-
 
 ## Native Image
 
-With GraalVM Enterprise you can compile Java bytecode into a platform-specific, self-contained, native executable to achieve faster startup and a smaller footprint for your application.
-
-The [Native Image](../../reference-manual/native-image/README.md) functionality is not available by default, but can be easily installed with the [GraalVM Updater](../../reference-manual/graalvm-updater.md) tool:
-```shell
-gu install native-image
-```
+With [Native Image](../../reference-manual/native-image/README.md) Enterprise you can compile Java bytecode into a platform-specific, self-contained, native executable to achieve faster startup and a smaller footprint for your application.
 
 The `HelloWorld` example from above is used here to demonstrate how to generate a native executable:
 ```java

diff --git a/docs/getting-started/graalvm-enterprise/installation-windows.md b/docs/getting-started/graalvm-enterprise/installation-windows.md
@@ -46,7 +46,7 @@ Repeat the same for the `PATH` environment variable.
 ## Supported Functionalities
 
 The GraalVM Enterprise distribution for Windows platforms includes Oracle JDK with the GraalVM compiler enabled, the [GraalVM Updater](../../reference-manual/graalvm-updater.md) tool to install additional functionalities and the developer tools (e.g., Chrome inspector based debugger, Profiler, etc.).
-Currently, the GraalVM environment on Windows can be extended with [Native Image](../../reference-manual/native-image/README.md), [Java on Truffle](../../reference-manual/java-on-truffle/README.md), [LLVM runtime](../../reference-manual/llvm/README.md), WebAssembly, JavaScript and Node.js support.
+Currently, the GraalVM environment on Windows can be extended with [Java on Truffle](../../reference-manual/java-on-truffle/README.md), [LLVM runtime](../../reference-manual/llvm/README.md), WebAssembly, JavaScript, and Node.js support.
 
 ## Prerequisites for Using Native Image on Windows
 On Windows, Native Image requires Visual Studio and Microsoft Visual C++(MSVC).

diff --git a/docs/graalvm-as-a-platform/implement-language.md b/docs/graalvm-as-a-platform/implement-language.md
@@ -29,7 +29,7 @@ For macOS, use:
 export JAVA_HOME=/path/to/graalvm/Contents/Home
 export PATH=/path/to/graalvm/Contents/Home/bin:$PATH
 ```
-4. Execute `mvn package` from the SimpleLanguage folder to build the language. The command also builds a `slnative` executable in the `simplelanguage/native` directory and a `sl-component.jar` language component which later can be installed into GraalVM using the [GraalVM Updater](../reference-manual/graalvm-updater.md) tool. Please verify ithat the `native-image` plugin is available in your GraalVM distribution to avoid build failure:
+4. Execute `mvn package` from the SimpleLanguage folder to build the language. The command also builds a `slnative` executable in the `simplelanguage/native` directory and a `sl-component.jar` language component which later can be installed into GraalVM using the [GraalVM Updater](../reference-manual/graalvm-updater.md) tool. Please verify that the `native-image` plugin is available in your GraalVM distribution to avoid build failure:
 ```shell
 gu list
 gu install native-image

diff --git a/docs/reference-manual/graalvm-updater.md b/docs/reference-manual/graalvm-updater.md
@@ -101,7 +101,7 @@ Follow these steps to install a component to GraalVM Enterprise, for example, Na
 2. Install a component using the `ComponentId` value:
 
     ```shell
-    gu install native-image
+    gu install nodejs
     ```
    You will see a message to provide your valid email address or input your download token and press `ENTER`. 
    Supposedly, this is your first installation and you have not accepted the license yet. So press `ENTER`.

diff --git a/docs/reference-manual/java-on-truffle/Demos.md b/docs/reference-manual/java-on-truffle/Demos.md
@@ -35,7 +35,6 @@ This design naturally fits the point we are trying to illustrate. We can build a
 
 Prerequisites:
 * [Latest GraalVM](https://www.graalvm.org/downloads/)
-* [Native Image](../native-image/README.md#install-native-image)
 * [Java on Truffle](README.md#install-java-on-truffle)
 
 1. Clone the [project](https://github.com/graalvm/graalvm-demos) with the demo applications and navigate to the `espresso-jshell` directory:

diff --git a/docs/reference-manual/native-image/README.md b/docs/reference-manual/native-image/README.md
@@ -29,25 +29,14 @@ To get used to Native Image terminology and get better understanding of the tech
 
 ### Table of Contents
 
-* [Install Native Image](#install-native-image)
 * [Build a Native Executable](#build-a-native-executable)
 * [Configuring Native Image with Third-Party Libraries](#configuring-native-image-with-third-party-libraries)
 * [License](#license)
 * [Further Reading](#further-reading)
 
-## Install Native Image
-
-Native Image can be added to GraalVM with the [GraalVM Updater](../graalvm-updater.md) tool.
-
-Run this command to install Native Image:
-```shell
-gu install native-image
-```
-The `native-image` tool is installed in the `$JAVA_HOME/bin` directory.
-
 ### Prerequisites
 
-The `native-image` tool depends on the local toolchain (header files for the C library, `glibc-devel`, `zlib`, `gcc`, and/or `libstdc++-static`). 
+The `native-image` tool, available in the `bin` directory of your GraalVM installation, depends on the local toolchain (header files for the C library, `glibc-devel`, `zlib`, `gcc`, and/or `libstdc++-static`). 
 These dependencies can be installed (if not yet installed) using a package manager on your machine.
 Choose your operating system to find instructions to meet the prerequisites.
 

diff --git a/...ference-manual/native-image/guides/build-static-and-mostly-static-executable.md b/...ference-manual/native-image/guides/build-static-and-mostly-static-executable.md
@@ -33,7 +33,7 @@ This guide shows how you can take advantage of Native Image linking options incl
 The following prerequisites should be met:
 
 - Linux AMD64 operating system
-- GraalVM distribution for Java 11 of higher with [Native Image support](../README.md#install-native-image)
+- GraalVM distribution for Java 17 of higher
 - A 64-bit `musl` toolchain, `make`, and `configure`
 - The latest `zlib` library
 

diff --git a/docs/reference-manual/native-image/guides/guides.md b/docs/reference-manual/native-image/guides/guides.md
@@ -38,5 +38,3 @@ Here you will learn how to:
 - <a href="https://quarkus.io/guides/building-native-image" target="_blank">Build a Native Executable from a Quarkus Application</a>
 - <a href="https://helidon.io/docs/v3/#/mp/guides/graalnative" target="_blank">Build a Native Executable from a Helidon MP Application</a>
 - <a href="https://helidon.io/docs/v3/#/se/guides/graalnative" target="_blank">Build a Native Executable from a Helidon SP Application</a>
-
-> Note: To follow these guides, a user is expected to have [GraalVM installed with Native Image support](../README.md#install-native-image). 
diff --git a/...rence-manual/native-image/guides/use-reachability-metadata-repository-gradle.md b/...rence-manual/native-image/guides/use-reachability-metadata-repository-gradle.md
@@ -25,8 +25,6 @@ The goal is to show users the difference, and prove how using shared metadata ca
 
 We recommend that you follow the instructions and create the application step-by-step. Alternatively, you can go right to the [completed example](https://github.com/graalvm/native-build-tools/tree/master/samples/metadata-repo-integration).
 
-> You must have [GraalVM installed with Native Image support](../README.md#install-native-image). 
-
 ## Prepare a Demo Application
 
 1. Create a new Java project with **Gradle** in your favorite IDE, called "H2Example", in the `org.graalvm.example` package.

diff --git a/substratevm/CHANGELOG.md b/substratevm/CHANGELOG.md
@@ -19,6 +19,7 @@ This changelog summarizes major changes to GraalVM Native Image.
 * (GR-43410) Added support for the JFR event `ExecutionSample`.
 * (GR-44058) (GR-44087) Red Hat added support for the JFR events `ObjectAllocationInNewTLAB` and `JavaMonitorInflate`.
 * (GR-42467) The search path for `System.loadLibrary()` by default includes the directory containing the native image.
+* (GR-44216) Native Image is now shipped as part of the GraalVM JDK and thus no longer needs to be installed via `gu install native-image`.
 
 ## Version 22.3.0
 * (GR-35721) Remove old build output style and the `-H:±BuildOutputUseNewStyle` option.

diff --git a/substratevm/mx.substratevm/mx_substratevm.py b/substratevm/mx.substratevm/mx_substratevm.py
@@ -917,7 +917,7 @@ def native_image_context_run(func, func_args=None, config=None, build_if_missing
     support_distributions=['substratevm:SVM_GRAALVM_SUPPORT'],
     stability="earlyadopter",
     jlink=False,
-    installable=True,
+    installable=False,
 ))
 
 mx_sdk_vm.register_graalvm_component(mx_sdk_vm.GraalVmLanguage(
@@ -932,7 +932,7 @@ def native_image_context_run(func, func_args=None, config=None, build_if_missing
     truffle_jars=[],
     builder_jar_distributions=['substratevm:SVM_LIBFFI'],
     support_distributions=['substratevm:SVM_NFI_GRAALVM_SUPPORT'],
-    installable=True,
+    installable=False,
 ))
 
 mx_sdk_vm.register_graalvm_component(mx_sdk_vm.GraalVmJreComponent(
@@ -944,7 +944,7 @@ def native_image_context_run(func, func_args=None, config=None, build_if_missing
     license_files=[],
     third_party_license_files=[],
     support_distributions=['substratevm:SVM_STATIC_LIBRARIES_SUPPORT'],
-    installable=True,
+    installable=False,
 ))
 
 def _native_image_launcher_main_class():
@@ -1023,7 +1023,7 @@ def _native_image_launcher_extra_jvm_args():
         ),
     ],
     provided_executables=['bin/<cmd:rebuild-images>'],
-    installable=True,
+    installable=False,
     stability="earlyadopter",
     jlink=False,
 ))
@@ -1038,7 +1038,7 @@ def _native_image_launcher_extra_jvm_args():
     third_party_license_files=[],
     dependencies=[],
     support_distributions=['substratevm:NATIVE_IMAGE_LICENSE_GRAALVM_SUPPORT'],
-    installable=True,
+    installable=False,
     priority=1,
     stability="earlyadopter",
     jlink=False,
@@ -1223,7 +1223,7 @@ def _native_image_configure_extra_jvm_args():
     ],
     jlink=False,
     installable_id='native-image',
-    installable=True,
+    installable=False,
     priority=10,
 ))
 

diff --git a/vm/ce-release-artifacts.json b/vm/ce-release-artifacts.json
@@ -169,33 +169,6 @@
             }
         ]
     },
-    {
-        "name": "native-image-installable-svm-java19",
-        "core": false,
-        "jdk": "jdk_19",
-        "artifacts": [
-            {
-                "os": "linux",
-                "arch": "amd64"
-            },
-            {
-                "os": "linux",
-                "arch": "aarch64"
-            },
-            {
-                "os": "darwin",
-                "arch": "amd64"
-            },
-            {
-                "os": "darwin",
-                "arch": "aarch64"
-            },
-            {
-                "os": "windows",
-                "arch": "amd64"
-            }
-        ]
-    },
     {
         "name": "native-image-llvm-backend-installable-ce-java19",
         "core": false,

diff --git a/vm/mx.vm/ce b/vm/mx.vm/ce
@@ -1,4 +1,4 @@
 DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/tools,/truffle
-COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,jss,lg,lsp,nfi-libffi,poly,polynative,pro,rgx,sdk,tfl,tflm
-NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,lib:jvmcicompiler
+COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,jss,lg,lsp,nfi-libffi,ni,nic,nil,poly,polynative,pro,rgx,sdk,svm,svmnfi,svmsl,tfl,tflm
+NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,native-image
 DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/ce-aarch64 b/vm/mx.vm/ce-aarch64
@@ -1,4 +1,4 @@
 DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/tools,/truffle
-COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,jss,lg,lsp,nfi-libffi,poly,polynative,pro,rgx,sdk,tfl,tflm
-NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,lib:jvmcicompiler
+COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,jss,lg,lsp,nfi-libffi,ni,nic,nil,poly,polynative,pro,rgx,sdk,svm,svmnfi,svmsl,tfl,tflm
+NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,native-image
 DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/ce-darwin b/vm/mx.vm/ce-darwin
@@ -1,4 +1,4 @@
 DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/tools,/truffle
-COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,jss,lg,lsp,nfi-libffi,poly,polynative,pro,rgx,sdk,tfl,tflm
-NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,lib:jvmcicompiler
+COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,jss,lg,lsp,nfi-libffi,ni,nic,nil,poly,polynative,pro,rgx,sdk,svm,svmnfi,svmsl,tfl,tflm
+NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,native-image
 DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/ce-darwin-aarch64 b/vm/mx.vm/ce-darwin-aarch64
@@ -1,4 +1,4 @@
 DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/tools,/truffle
-COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,jss,lg,lsp,nfi-libffi,poly,polynative,pro,rgx,sdk,tfl,tflm
-NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,lib:jvmcicompiler
+COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,jss,lg,lsp,nfi-libffi,ni,nic,nil,poly,polynative,pro,rgx,sdk,svm,svmnfi,svmsl,tfl,tflm
+NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,native-image
 DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/ce-fastr b/vm/mx.vm/ce-fastr
@@ -1,4 +1,4 @@
 DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/sulong,/tools,/truffle,fastr
-COMPONENTS=R,cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,jss,lg,llp,llrc,llrl,llrn,lsp,nfi-libffi,ni,poly,polynative,pro,rgx,sdk,tfl,tflm
+COMPONENTS=R,cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,jss,lg,llp,llrc,llrl,llrn,lsp,nfi-libffi,ni,nic,poly,polynative,pro,rgx,sdk,tfl,tflm
 NATIVE_IMAGES=lib:jvmcicompiler
 DISABLE_INSTALLABLES=False
diff --git a/vm/mx.vm/ce-win b/vm/mx.vm/ce-win
@@ -1,4 +1,4 @@
 DYNAMIC_IMPORTS=/compiler,/graal-js,/regex,/sdk,/substratevm,/tools,/truffle
-COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,jss,lg,lsp,nfi-libffi,poly,polynative,pro,rgx,sdk,tfl,tflm
-NATIVE_IMAGES=lib:jvmcicompiler
+COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,jss,lg,lsp,nfi-libffi,ni,nic,nil,poly,polynative,pro,rgx,sdk,svm,svmnfi,svmsl,tfl,tflm
+NATIVE_IMAGES=lib:jvmcicompiler,lib:native-image-agent,lib:native-image-diagnostics-agent,native-image
 DISABLE_INSTALLABLES=False