Added support for ARM VFP/hard-float JDK releases

diff --git a/debian/changelog b/debian/changelog
index b7dfc040bcfc8f1c1d2598ed3457064d61897829..23c78dabdf0784aa3ff4c7e3d628fe92140e7328 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+java-package (0.54) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Added support for ARM VFP/hard-float JDK releases.
+    Thanks to Christopher Huhn <C.Huhn@gsi.de> (Closes: #724455)
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Wed, 12 Feb 2014 12:14:36 +0100
+

 java-package (0.53) unstable; urgency=low
 
   * Team upload.
 java-package (0.53) unstable; urgency=low
 
   * Team upload.

diff --git a/lib/jdk.sh b/lib/jdk.sh
index 7ae61f024590da6e6b20f2bfb3eba600c7728527..ae8d96f9b9f8ea8e2d76025d75ab5a6ec229d780 100644 (file)
--- a/lib/jdk.sh
+++ b/lib/jdk.sh
@@ -3,7 +3,7 @@ j2sdk_control() {
     j2se_control
     java_browser_plugin="java-browser-plugin, "
     depends="\${shlibs:Depends}"
     j2se_control
     java_browser_plugin="java-browser-plugin, "
     depends="\${shlibs:Depends}"

-    if [ "${DEB_BUILD_ARCH:0:3}" = "arm" ]; then
+    if [ "${DEB_BUILD_ARCH:0:3}" = "arm" -a "${j2se_arch}" != "arm-vfp-hflt" ]; then

         # ARM is only softfloat ATM so if building on armhf
         # force the dependencies to pickup cross platform fu
         if [ "${DEB_BUILD_ARCH}" == "armhf" ]; then
         # ARM is only softfloat ATM so if building on armhf
         # force the dependencies to pickup cross platform fu
         if [ "${DEB_BUILD_ARCH}" == "armhf" ]; then

diff --git a/lib/oracle-jdk.sh b/lib/oracle-jdk.sh
index 18a84ed32d85e37320e9c80d0df217d6d8ffaf3d..32e85cda0879250a572571a020113f9213096fb9 100644 (file)
--- a/lib/oracle-jdk.sh
+++ b/lib/oracle-jdk.sh
@@ -4,7 +4,7 @@ oracle_j2sdk_detect() {
   j2se_release=0
 
   # Update or GA release (jdk-7u15-linux-i586.tar.gz)
   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]}
   then
     j2se_release=${BASH_REMATCH[1]}
     j2se_update=${BASH_REMATCH[3]}


@@ -20,12 +20,12 @@ oracle_j2sdk_detect() {
   fi
 
   # Early Access Release (jdk-8-ea-bin-b103-linux-i586-15_aug_2013.tar.gz)
   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).*\.(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[3]}
   then
     j2se_release=${BASH_REMATCH[1]}
     j2se_update=${BASH_REMATCH[3]}

-    j2se_build=${BASH_REMATCH[5]}
-    j2se_arch=${BASH_REMATCH[6]}
+    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"
     if [[ $j2se_update != "" ]]
     then
       j2se_version_name="$j2se_release Update $j2se_update Early Access Release Build $j2se_build"