adjust binary path within the JDK for java and friends

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

diff --git a/lib/oracle-jdk.sh b/lib/oracle-jdk.sh
index ebc0efd8df32757c50beb4a1efddbfd435646e99..2c25e255ddd74156ae71b3040104119140ff7856 100644 (file)
--- a/lib/oracle-jdk.sh
+++ b/lib/oracle-jdk.sh
@@ -3,6 +3,18 @@ j2se_detect_oracle_j2sdk=oracle_j2sdk_detect
 oracle_j2sdk_detect() {
   j2se_release=0
 
 oracle_j2sdk_detect() {
   j2se_release=0
 

+  # JDK 9 GA release (jdk-9.0.1_linux-x64_bin.tar.gz)
+  if [[ $archive_name =~ jdk-9(\.([0-9]+)\.([0-9]+))?_linux-x64_bin\.tar\.gz ]]
+  then
+      j2se_release=9
+      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}
+      j2se_expected_min_size=340 #Mb
+      j2se_binary_subdir="/bin"
+  fi
+

   # Update or GA release (jdk-7u15-linux-i586.tar.gz)
   if [[ $archive_name =~ jdk-([0-9]+)(u([0-9]+))?-linux-(i586|x64|amd64|arm-vfp-hflt)\.(bin|tar\.gz) ]]
   then
   # Update or GA release (jdk-7u15-linux-i586.tar.gz)
   if [[ $archive_name =~ jdk-([0-9]+)(u([0-9]+))?-linux-(i586|x64|amd64|arm-vfp-hflt)\.(bin|tar\.gz) ]]
   then


@@ -39,7 +51,7 @@ oracle_j2sdk_detect() {
   if [[ $j2se_release > 0 ]]
   then
     j2se_priority=$((310 + $j2se_release))
   if [[ $j2se_release > 0 ]]
   then
     j2se_priority=$((310 + $j2se_release))

-    j2se_expected_min_size=130 #Mb
+    j2se_expected_min_size=${j2se_expected_min_size:-180} #Mb  

 
     # check if the architecture matches
     let compatible=1
 
     # check if the architecture matches
     let compatible=1


@@ -87,7 +99,7 @@ EOF
       j2se_found=true
       j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 ))
       j2se_vendor="oracle"
       j2se_found=true
       j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 ))
       j2se_vendor="oracle"

-      j2se_title="Java™ Platform, Standard Edition $j2se_release Development Kit"
+      j2se_title="Java Platform, Standard Edition $j2se_release Development Kit"

 
       j2se_install=oracle_j2sdk_install
       j2se_remove=oracle_j2sdk_remove
 
       j2se_install=oracle_j2sdk_install
       j2se_remove=oracle_j2sdk_remove


@@ -107,6 +119,7 @@ EOF
       oracle_jre_lib_hl="jexec"
       oracle_bin_jdk="appletviewer extcheck idlj jar jarsigner javac javadoc javah javap jcmd jconsole jdb jdeps jhat jinfo jmap jmc jps jrunscript jsadebugd jstack jstat jstatd jvisualvm native2ascii rmic schemagen serialver wsgen wsimport xjc"
       j2se_package="$j2se_vendor-java$j2se_release-jdk"
       oracle_jre_lib_hl="jexec"
       oracle_bin_jdk="appletviewer extcheck idlj jar jarsigner javac javadoc javah javap jcmd jconsole jdb jdeps jhat jinfo jmap jmc jps jrunscript jsadebugd jstack jstat jstatd jvisualvm native2ascii rmic schemagen serialver wsgen wsimport xjc"
       j2se_package="$j2se_vendor-java$j2se_release-jdk"

+      j2se_binary_subdir="${j2se_binary_subdir:-/jre/bin}"

       j2se_run
     fi
   fi
       j2se_run
     fi
   fi


@@ -118,10 +131,10 @@ if [ ! -e "$jvm_base$j2se_name/debian/info" ]; then
     exit 0
 fi
 
     exit 0
 fi
 

-install_alternatives $jvm_base$j2se_name/jre/bin $oracle_jre_bin_hl
-install_alternatives $jvm_base$j2se_name/jre/bin $oracle_jre_bin_jre
+install_alternatives $jvm_base$j2se_name${j2se_binary_subdir} $oracle_jre_bin_hl
+install_alternatives $jvm_base$j2se_name${j2se_binary_subdir} $oracle_jre_bin_jre

 if [ -n "$oracle_no_man_jre_bin_jre" ]; then
 if [ -n "$oracle_no_man_jre_bin_jre" ]; then

-    install_no_man_alternatives $jvm_base$j2se_name/jre/bin $oracle_no_man_jre_bin_jre
+    install_no_man_alternatives $jvm_base$j2se_name${j2se_binary_subdir} $oracle_no_man_jre_bin_jre

 fi
 install_no_man_alternatives $jvm_base$j2se_name/jre/lib $oracle_jre_lib_hl
 install_alternatives $jvm_base$j2se_name/bin $oracle_bin_jdk
 fi
 install_no_man_alternatives $jvm_base$j2se_name/jre/lib $oracle_jre_lib_hl
 install_alternatives $jvm_base$j2se_name/bin $oracle_bin_jdk


@@ -142,10 +155,10 @@ if [ ! -e "$jvm_base$j2se_name/debian/info" ]; then
     exit 0
 fi
 
     exit 0
 fi
 

-remove_alternatives $jvm_base$j2se_name/jre/bin $oracle_jre_bin_hl
-remove_alternatives $jvm_base$j2se_name/jre/bin $oracle_jre_bin_jre
+remove_alternatives $jvm_base$j2se_name${j2se_binary_subdir} $oracle_jre_bin_hl
+remove_alternatives $jvm_base$j2se_name${j2se_binary_subdir} $oracle_jre_bin_jre

 if [ -n "$oracle_no_man_jre_bin_jre" ]; then
 if [ -n "$oracle_no_man_jre_bin_jre" ]; then

-    remove_alternatives $jvm_base$j2se_name/jre/bin $oracle_no_man_jre_bin_jre
+    remove_alternatives $jvm_base$j2se_name${j2se_binary_subdir} $oracle_no_man_jre_bin_jre

 fi
 remove_alternatives $jvm_base$j2se_name/jre/lib $oracle_jre_lib_hl
 remove_alternatives $jvm_base$j2se_name/bin $oracle_bin_jdk
 fi
 remove_alternatives $jvm_base$j2se_name/jre/lib $oracle_jre_lib_hl
 remove_alternatives $jvm_base$j2se_name/bin $oracle_bin_jdk


@@ -163,13 +176,13 @@ EOF
 oracle_j2sdk_jinfo() {
     cat << EOF
 name=$j2se_name
 oracle_j2sdk_jinfo() {
     cat << EOF
 name=$j2se_name

-priority=$j2se_priority
+priority=${priority_override:-$j2se_priority}

 section=main
 EOF
 section=main
 EOF

-    jinfos "hl" $jvm_base$j2se_name/jre/bin/ $oracle_jre_bin_hl
-    jinfos "jre" $jvm_base$j2se_name/jre/bin/ $oracle_jre_bin_jre
+    jinfos "hl" $jvm_base$j2se_name${j2se_binary_subdir}/ $oracle_jre_bin_hl
+    jinfos "jre" $jvm_base$j2se_name${j2se_binary_subdir}/ $oracle_jre_bin_jre

     if [ -n "$oracle_no_man_jre_bin_jre" ]; then
     if [ -n "$oracle_no_man_jre_bin_jre" ]; then

-        jinfos "jre" $jvm_base$j2se_name/jre/bin/ $oracle_no_man_jre_bin_jre
+        jinfos "jre" $jvm_base$j2se_name${j2se_binary_subdir}/ $oracle_no_man_jre_bin_jre

     fi
     jinfos "hl" $jvm_base$j2se_name/jre/lib/ $oracle_jre_lib_hl
     jinfos "jdk" $jvm_base$j2se_name/bin/ $oracle_bin_jdk
     fi
     jinfos "hl" $jvm_base$j2se_name/jre/lib/ $oracle_jre_lib_hl
     jinfos "jdk" $jvm_base$j2se_name/bin/ $oracle_bin_jdk


@@ -205,8 +218,8 @@ oracle_j2sdk_control() {
     done
     cat << EOF
 Package: $j2se_package
     done
     cat << EOF
 Package: $j2se_package

-Architecture: any
-Depends: \${misc:Depends}, $depends
+Architecture: $j2se_debian_arch
+Depends: \${misc:Depends}, java-common, $depends

 Recommends: netbase
 Provides: java-virtual-machine, java-runtime, java2-runtime, $provides_runtime $java_browser_plugin java-compiler, java2-compiler, java-runtime-headless, java2-runtime-headless, $provides_headless java-sdk, java2-sdk, $provides_sdk
 Description: $j2se_title
 Recommends: netbase
 Provides: java-virtual-machine, java-runtime, java2-runtime, $provides_runtime $java_browser_plugin java-compiler, java2-compiler, java-runtime-headless, java2-runtime-headless, $provides_headless java-sdk, java2-sdk, $provides_sdk
 Description: $j2se_title