Bug#876426: Another attempt

[Tim Van Holder]

I used separate .sh files this time (except for the docs).
Given that the next release is likely to be 18.3 rather than 9u1, it's
possible that 9 will be an "odd one out" type release. If desirable,
the behaviour here can be merged into the current .sh files; it's just
a matter of a) picking up binaries from the right place, and b) not
expecting man pages.

Files attached.
For the docs, it's enough to add the following cases:

  # GA release (jdk-9_doc-all.zip)
  if [[ $archive_name =~ jdk-(9)()_docs?-all\.zip ]]
  then
j2se_release=${BASH_REMATCH[1]}
j2se_update=${BASH_REMATCH[2]}
if [[ $j2se_update != "" ]]
then
  j2se_version_name="$j2se_release Update $j2se_update"
  j2se_version=${j2se_release}u${j2se_update}${revision}
else
  j2se_version_name="$j2se_release GA"
  j2se_version=${j2se_release}${revision}
fi
  fi

  # Early Access Release (jdk-9_doc-api-spec.tar.gz)
  if [[ $archive_name =~ jdk-(9)()_doc-api-spec.tar.gz ]]
  then
j2se_release=${BASH_REMATCH[1]}
j2se_update=${BASH_REMATCH[2]}
if [[ $j2se_update != "" ]]
then
  j2se_version_name="$j2se_release Update $j2se_update Early Access Release"
  j2se_version=${j2se_release}u${j2se_update}~ea${revision}
else
  j2se_version_name="$j2se_release Early Access Release"
  j2se_version=${j2se_release}~ea${revision}
fi
  fi

(I left a () matcher in there, in case there end up being 9u1/9.1/...
releases after all.)


oracle-jdk9.sh
Description: Bourne shell script


oracle-jre9.sh
Description: Bourne shell script


oracle-server-jre9.sh
Description: Bourne shell script
__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#876426: Further issues

[Tim Van Holder]

There are indeed some additional problems with JDK9:
- the packages set up alternatives to binaries under jre/bin and jre/lib;
  JDK9 no longer has a jre subdir
  => as far as I can tell the binaries in question have also been present
 directly under bin and lib (at least since JDK6), so there does not
 immediately seem to be a reason for not taking them from there
 instead
- JDK9 no longer includes man pages

It may make more sense to give it its own .sh instead, rather than trying
to special-case it in multiple places.

__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#876426: Patches for JDK9 EA & GA support

[Tim Van Holder]

Below are the local changes I have been using during Early Access, and
which also work for the current GA release.

Note: only for JDK & docs; I haven't needed JRE packages. But I would
assume that the JRE setup is basically a subset of SDK and could be easily
adapted.

The Early Access builds included x86 binaries; the current GA doesn't.
However, I have kept the x86 matchers in case they get added later.

--- oracle-jdk-doc.sh.orig2016-09-11 02:39:56.0 +0200
+++ oracle-jdk-doc.sh2017-10-03 09:22:38.507208079 +0200
@@ -2,8 +2,8 @@
 oracle_j2sdk_doc_detect() {
   j2se_release=0

-  # Update or GA release (jdk-7u25-apidocs.zip)
-  if [[ $archive_name =~ jdk-([0-9]+)(u([0-9]+))?-(apidocs|docs-all)\.zip
]]
+  # Update or GA release (jdk-7u25-apidocs.zip or jdk-9_doc-all.zip)
+  if [[ $archive_name =~
jdk-([0-9]+)(u([0-9]+))?([-_](apidocs|docs?-all)\.zip) ]]
   then
 j2se_release=${BASH_REMATCH[1]}
 j2se_update=${BASH_REMATCH[3]}
@@ -33,6 +33,21 @@
 fi
   fi

+  # JDK9 Early Access Release (jdk-9_doc-api-spec.tar.gz)
+  if [[ $archive_name =~ jdk-(9)(u([0-9]+))?_doc-api-spec.tar.gz ]]
+  then
+j2se_release=${BASH_REMATCH[1]}
+j2se_update=${BASH_REMATCH[3]}
+if [[ $j2se_update != "" ]]
+then
+  j2se_version_name="$j2se_release Update $j2se_update Early Access
Release"
+  j2se_version=${j2se_release}u${j2se_update}~ea${revision}
+else
+  j2se_version_name="$j2se_release Early Access Release"
+  j2se_version=${j2se_release}~ea${revision}
+fi
+  fi
+
   if [[ $j2se_release > 0 ]]
   then
 case "$j2se_release" in
--- oracle-jdk.sh.orig2016-09-11 02:39:56.0 +0200
+++ oracle-jdk.sh2017-10-03 09:19:52.954958234 +0200
@@ -3,8 +3,8 @@
 oracle_j2sdk_detect() {
   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|arm-vfp-hflt)\.(bin|tar\.gz)
]]
+  # Update or GA release (jdk-7u15-linux-i586.tar.gz,
jdk-9_linux-x64_bin.tar.gz)
+  if [[ $archive_name =~
jdk-([0-9]+)(u([0-9]+))?[-_]linux-(i586|x86|x64|amd64|arm-vfp-hflt).*\.(bin|tar\.gz)
]]
   then
 j2se_release=${BASH_REMATCH[1]}
 j2se_update=${BASH_REMATCH[3]}
@@ -19,13 +19,13 @@
 fi
   fi

-  # Early Access Release (jdk-8-ea-bin-b103-linux-i586-15_aug_2013.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)
]]
+  # Early Access Release (jdk-8-ea-bin-b103-linux-i586-15_aug_2013.tar.gz,
jdk-9[-ea]+162_linux-x64_bin.tar.gz)
+  if [[ $archive_name =~
jdk-([0-9]+)(u([0-9]+))?(-(ea|fcs))?(-bin)?(-b|[+])([0-9]+)[-_]linux-(i586|x86|x64|amd64|arm-vfp-hflt).*\.(bin|tar\.gz)
]]
   then
 j2se_release=${BASH_REMATCH[1]}
 j2se_update=${BASH_REMATCH[3]}
-j2se_build=${BASH_REMATCH[6]}
-j2se_arch=${BASH_REMATCH[7]}
+j2se_build=${BASH_REMATCH[8]}
+j2se_arch=${BASH_REMATCH[9]}
 if [[ $j2se_update != "" ]]
 then
   j2se_version_name="$j2se_release Update $j2se_update Early Access
Release Build $j2se_build"
@@ -46,7 +46,7 @@

 case "${DEB_BUILD_ARCH:-$DEB_BUILD_GNU_TYPE}" in
   i386|i486-linux-gnu)
-if [[ "$j2se_arch" != "i586" ]]; then compatible=0; fi
+if [[ "$j2se_arch" != "x86" && "$j2se_arch" != "i586" ]]; then
compatible=0; fi
 ;;
   amd64|x86_64-linux-gnu)
 if [[ "$j2se_arch" != "x64" && "$j2se_arch" != "amd64" ]]; then
compatible=0; fi
@@ -105,7 +105,10 @@
 oracle_no_man_jre_bin_jre="ControlPanel jcontrol"
   fi
   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"
+  # Java 8: Added:   javapackager javafxpackager
+  # Java 9: Added:   jaotc jdeprscan jhsdb jimage jjs jlink jmod
jshell jweblauncher
+  # Removed: extcheck javafxpackager jhat jmc jsadebugd
jvisualvm native2ascii
+  oracle_bin_jdk="appletviewer extcheck idlj jaotc jar jarsigner javac
javadoc javafxpackager javah javap javapackager jcmd jconsole jdb jdeprscan
jdeps jhat jhsdb jinfo jjs jlink jmap jmc jmod jps jrunscript jsadebugd
jshell jstack jstat jstatd jvisualvm jweblauncher native2ascii rmic
schemagen serialver wsgen wsimport xjc"
   j2se_package="$j2se_vendor-java$j2se_release-jdk"
   j2se_run
 fi
__
This is the maintainer address of Debian's Java team
. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Bug#385415: GIJ / priorities

[Tim Van Holder]

A related issue is that GIJ's alternative for java has a greater
priority than any of the sun packages - as a result, installing
a Sun JDK packaged via make-jpkg no longer sets up the 'java' command
correctly (especially given that gij is not exactly a drop-in
replacement yet, it's a shame that it gets such high priority just
because it's the free alternative).

I definitely would like to see the java-alternatives support, as the
current priority system doesn't help (just because I install JDK 1.5
doesn't necessarily mean I want the 1.5 binaries to be the default),
and being able to easily switch between JDKs (instead of having to
change umpteen separate alternatives) would be a blessing.



___
pkg-java-maintainers mailing list
pkg-java-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-maintainers