diff --git a/releng/org.eclipse.justj.releng/build-jre.sh b/releng/org.eclipse.justj.releng/build-jre.sh index 503aff9..4362b33 100755 --- a/releng/org.eclipse.justj.releng/build-jre.sh +++ b/releng/org.eclipse.justj.releng/build-jre.sh @@ -220,7 +220,7 @@ fi # Remove the incubator modules. # -all_modules=$($jdk/$jdk_relative_bin_folder/java --list-modules | sed "s/@.*//g" | grep -v "jdk.incubator" | tr '\n' ',' | sed 's/,$//') +all_modules=$($jdk/$jdk_relative_bin_folder/java --list-modules | sed "s/@.*//g" | grep -v "jdk.incubator" | grep -v "jdk.jlink" | tr '\n' ',' | sed 's/,$//') simrel_modules="java.base,java.compiler,java.datatransfer,java.desktop,java.instrument,java.logging,java.management,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.security.jgss,java.security.sasl,java.sql,java.sql.rowset,java.transaction.xa,java.xml,java.xml.crypto,jdk.attach,jdk.crypto.ec,jdk.jdi,jdk.management,jdk.unsupported,jdk.xml.dom,jdk.zipfs$os_specific_simrel_modules" installer_modules="java.base,java.desktop,java.logging,java.management,java.naming,java.prefs,java.security.jgss,java.sql,java.xml,jdk.xml.dom,jdk.unsupported" @@ -363,7 +363,7 @@ for ((i=0; i<${#jres[@]}; i+=6)); do # Generate the JRE using jlink from the JDK. echo "Generating: $jre_folder" - $jdk/$jdk_relative_bin_folder/jlink --add-modules=$modules $jlink_args --output $jre_folder + $jdk/$jdk_relative_bin_folder/jlink --verbose --add-modules=$modules $jlink_args --output $jre_folder if [[ -f $jdk/$jdk_relative_bin_folder/$unpack200_executable ]]; then cp $jdk/$jdk_relative_bin_folder/$unpack200_executable $jre_folder/bin fi