j2se_release=0
# Update or GA release (jdk-7u15-linux-i586.tar.gz)
- if [[ $archive_name =~ jdk-([0-9]+)(u([0-9]+))?-linux-(i586|x64|amd64)\.(bin|tar\.gz) ]]
+ if [[ $archive_name =~ jdk-([0-9]+)(u([0-9]+))?-linux-(i586|x64|amd64|arm-vfp-hflt)\.(bin|tar\.gz) ]]
then
j2se_release=${BASH_REMATCH[1]}
j2se_update=${BASH_REMATCH[3]}
j2se_arch=${BASH_REMATCH[4]}
if [[ $j2se_update != "" ]]
then
- j2se_type="Update"
+ j2se_version_name="$j2se_release Update $j2se_update"
j2se_version=${j2se_release}u${j2se_update}
else
- j2se_type=""
+ j2se_version_name="$j2se_release GA"
j2se_version=${j2se_release}
fi
fi
# Early Access Release (jdk-8-ea-bin-b103-linux-i586-15_aug_2013.tar.gz)
- if [[ $archive_name =~ jdk-([0-9]+)-ea-bin-(b[0-9]+)-linux-(i586|x64|amd64).*\.(bin|tar\.gz) ]]
+ if [[ $archive_name =~ jdk-([0-9]+)(u([0-9]+))?-(ea|fcs)(-bin)?-(b[0-9]+)-linux-(i586|x64|amd64|arm-vfp-hflt).*\.(bin|tar\.gz) ]]
then
j2se_release=${BASH_REMATCH[1]}
- j2se_update=${BASH_REMATCH[2]}
- j2se_arch=${BASH_REMATCH[3]}
- j2se_type="Early Access Release"
- j2se_version=${j2se_release}~ea-build-${j2se_update}
+ j2se_update=${BASH_REMATCH[3]}
+ j2se_build=${BASH_REMATCH[6]}
+ j2se_arch=${BASH_REMATCH[7]}
+ if [[ $j2se_update != "" ]]
+ then
+ j2se_version_name="$j2se_release Update $j2se_update Early Access Release Build $j2se_build"
+ j2se_version=${j2se_release}u${j2se_update}~ea-build-${j2se_build}
+ else
+ j2se_version_name="$j2se_release Early Access Release Build $j2se_build"
+ j2se_version=${j2se_release}~ea-build-${j2se_build}
+ fi
fi
if [[ $j2se_release > 0 ]]
Detected product:
Java(TM) Development Kit (JDK)
- Standard Edition, Version $j2se_release $j2se_type $j2se_update
+ Standard Edition, Version $j2se_version_name
Oracle(TM)
EOF
if read_yn "Is this correct [Y/n]: "; then
j2se_found=true
j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 ))
j2se_vendor="oracle"
- j2se_title="Java(TM) JDK, Standard Edition, Oracle(TM)"
+ j2se_title="Java™ Platform, Standard Edition $j2se_release Development Kit"
j2se_install=oracle_j2sdk_install
j2se_remove=oracle_j2sdk_remove
j2se_jinfo=oracle_j2sdk_jinfo
if [ "${DEB_BUILD_ARCH:0:3}" = "arm" ]; then
- oracle_jre_bin_hl="java keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 policytool"
+ # javaws is not available for ARM
+ oracle_jre_bin_hl="java keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 policytool"
oracle_jre_bin_jre="policytool"
else
oracle_jre_bin_hl="java javaws keytool orbd pack200 rmid rmiregistry servertool tnameserv unpack200 policytool"
oracle_jre_bin_jre="javaws policytool"
fi
if [ "${DEB_BUILD_ARCH:0:3}" != "arm" ]; then
- oracle_no_man_jre_bin_jre="ControlPanel"
+ oracle_no_man_jre_bin_jre="ControlPanel"
fi
oracle_jre_lib_hl="jexec"
- oracle_bin_jdk="appletviewer extcheck idlj jar jarsigner javac javadoc javah javap jconsole jdb jinfo jmap jps jsadebugd jstack jstat jstatd native2ascii rmic serialver"
+ oracle_bin_jdk="appletviewer extcheck idlj jar jarsigner javac javadoc javah javap jcmd jconsole jdb jdeps jhat jinfo jmap jps jrunscript jsadebugd jstack jstat jstatd native2ascii rmic schemagen serialver wsgen wsimport xjc"
j2sdk_run
fi
fi
if [ "${DEB_BUILD_ARCH:0:3}" != "arm" ]; then
plugin_dir="$jvm_base$j2se_name/jre/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"
+ install_browser_plugin "/usr/lib/\$b/plugins" "libjavaplugin.so" "\$b-javaplugin.so" "\$plugin_dir/libnpjp2.so"
done
fi
EOF