Basic support for Java 10

[sven/java-package.git] / lib / oracle-jre.sh

diff --git a/lib/oracle-jre.sh b/lib/oracle-jre.sh
index 331f7de17e1f78dc38b0b4da8f522c65a9ce5392..20d93a67e30ddbc060f1b0c6cf892e91e1ed65c1 100644 (file)
--- a/lib/oracle-jre.sh
+++ b/lib/oracle-jre.sh
@@ -3,6 +3,20 @@ j2se_detect_oracle_j2re=oracle_j2re_detect
 oracle_j2re_detect() {
   j2se_release=0
 
+  # JRE 10 release candidate (oracle-java10-jre_10+46_amd64.deb)
+  if [[ $archive_name =~ ^jre-10(\.([0-9]+)\.([0-9]+)|\+[0-9]+)?_linux-x64_bin\.tar\.gz ]]
+  then
+      j2se_release=10
+      j2se_update=${BASH_REMATCH[1]:-.0.0}
+      j2se_arch=x64
+      j2se_version_name="${j2se_release} version ${j2se_release}${j2se_update}"
+      j2se_version=${j2se_release}${j2se_update}${revision}
+      oracle_no_man_jre_bin_jre="appletviewer idlj java javaws jcontrol jjs jrunscript jweblauncher keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200"
+      oracle_jre_bin_hl=" "
+      oracle_jre_bin_jre=" "
+      oracle_jre_lib_hl=" "
+  fi
+
   # JRE 9 GA release (jre-9.0.1_linux-x64_bin.tar.gz)
   if [[ $archive_name =~ ^jre-9(\.([0-9]+)\.([0-9]+))?_linux-x64_bin\.tar\.gz ]]
   then
@@ -87,10 +101,10 @@ EOF
       j2se_remove=oracle_j2re_remove
       j2se_jinfo=oracle_j2re_jinfo
       j2se_control=oracle_j2re_control
-      oracle_jre_bin_hl="java javaws keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 policytool"
-      oracle_jre_bin_jre="javaws policytool"
-      oracle_no_man_jre_bin_jre="ControlPanel jcontrol"
-      oracle_jre_lib_hl="jexec"
+      oracle_jre_bin_hl="${oracle_jre_bin_hl:-java javaws keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 policytool}"
+      oracle_jre_bin_jre="${oracle_jre_bin_jre:-javaws policytool}"
+      oracle_no_man_jre_bin_jre="${oracle_no_man_jre_bin_jre:-ControlPanel jcontrol}"
+      oracle_jre_lib_hl="${oracle_jre_lib_hl:-jexec}"
       j2se_package="$j2se_vendor-java$j2se_release-jre"
       j2se_run
     fi
@@ -108,10 +122,12 @@ install_alternatives $jvm_base$j2se_name/bin $oracle_jre_bin_jre
 install_no_man_alternatives $jvm_base$j2se_name/bin $oracle_no_man_jre_bin_jre
 install_no_man_alternatives $jvm_base$j2se_name/lib $oracle_jre_lib_hl
 
-plugin_dir="$jvm_base$j2se_name/lib/$DEB_BUILD_ARCH"
-for b in $browser_plugin_dirs;do
-    install_browser_plugin "/usr/lib/\$b/plugins" "libjavaplugin.so" "\$b-javaplugin.so" "\$plugin_dir/libnpjp2.so"
-done
+if [[ "${j2se_release}" -lt "10" ]]; then
+    plugin_dir="$jvm_base$j2se_name/lib/$DEB_BUILD_ARCH"
+    for b in $browser_plugin_dirs;do
+        install_browser_plugin "/usr/lib/\$b/plugins" "libjavaplugin.so" "\$b-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+    done
+fi
 EOF
 }
 
@@ -126,10 +142,12 @@ remove_alternatives $jvm_base$j2se_name/bin $oracle_jre_bin_jre
 remove_alternatives $jvm_base$j2se_name/bin $oracle_no_man_jre_bin_jre
 remove_alternatives $jvm_base$j2se_name/lib $oracle_jre_lib_hl
 
-plugin_dir="$jvm_base$j2se_name/lib/$DEB_BUILD_ARCH"
-for b in $browser_plugin_dirs;do
-    remove_browser_plugin "\$b-javaplugin.so" "\$plugin_dir/libnpjp2.so"
-done
+if [[ "${j2se_release}" -lt "10" ]]; then
+    plugin_dir="$jvm_base$j2se_name/lib/$DEB_BUILD_ARCH"
+    for b in $browser_plugin_dirs;do
+        remove_browser_plugin "\$b-javaplugin.so" "\$plugin_dir/libnpjp2.so"
+    done
+fi
 EOF
 }