Add version matching code for JDK 9

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

diff --git a/lib/oracle-jdk.sh b/lib/oracle-jdk.sh
index 3f51c306491438334abd28c38b76a29a9f9777ae..9dc235abcafe8585fef3b54a18a738525bed39ad 100644 (file)
--- a/lib/oracle-jdk.sh
+++ b/lib/oracle-jdk.sh
@@ -3,6 +3,16 @@ 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_relase}${j2se_update}${revision}
+  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


@@ -163,7 +173,7 @@ 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
     jinfos "hl" $jvm_base$j2se_name/jre/bin/ $oracle_jre_bin_hl
 section=main
 EOF
     jinfos "hl" $jvm_base$j2se_name/jre/bin/ $oracle_jre_bin_hl


@@ -206,7 +216,7 @@ oracle_j2sdk_control() {
     cat << EOF
 Package: $j2se_package
 Architecture: $j2se_debian_arch
     cat << EOF
 Package: $j2se_package
 Architecture: $j2se_debian_arch

-Depends: \${misc:Depends}, $depends
+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