X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fjava-package.git;a=blobdiff_plain;f=lib%2Foracle-jdk.sh;h=aba8be50c35c0c8a90edd575467cb764b9c373fe;hp=32e85cda0879250a572571a020113f9213096fb9;hb=3e9a25f5082e092184800ceeeedcafb9c1ea32a8;hpb=2394e8cfc24cce50c76948e6350d785ed9e76786

diff --git a/lib/oracle-jdk.sh b/lib/oracle-jdk.sh
index 32e85cd..aba8be5 100644
--- a/lib/oracle-jdk.sh
+++ b/lib/oracle-jdk.sh
@@ -12,10 +12,10 @@ oracle_j2sdk_detect() {
     if [[ $j2se_update != "" ]]
     then
       j2se_version_name="$j2se_release Update $j2se_update"
-      j2se_version=${j2se_release}u${j2se_update}
+      j2se_version=${j2se_release}u${j2se_update}${revision}
     else
       j2se_version_name="$j2se_release GA"
-      j2se_version=${j2se_release}
+      j2se_version=${j2se_release}${revision}
     fi
   fi
 
@@ -29,10 +29,10 @@ oracle_j2sdk_detect() {
     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}
+      j2se_version=${j2se_release}u${j2se_update}~ea-build-${j2se_build}${revision}
     else
       j2se_version_name="$j2se_release Early Access Release Build $j2se_build"
-      j2se_version=${j2se_release}~ea-build-${j2se_build}
+      j2se_version=${j2se_release}~ea-build-${j2se_build}${revision}
     fi
   fi
 
@@ -74,8 +74,8 @@ oracle_j2sdk_detect() {
       echo "The archive $archive_name is not supported on the ${DEB_BUILD_ARCH} architecture"
       return
     fi
-    
-    
+
+
     cat << EOF
 
 Detected product:
@@ -93,17 +93,18 @@ EOF
       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
@@ -127,7 +128,7 @@ install_alternatives $jvm_base$j2se_name/bin $oracle_bin_jdk
 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