21358053 The Areca startup script needs updated so it will use Java 7 s11-update
authorBill Rushmore <bill.rushmore@oracle.com>
Tue, 07 Jul 2015 15:18:10 -0700
branchs11-update
changeset 4601 63c842b82978
parent 4600 1be15d012e40
child 4603 915af16592e4
21358053 The Areca startup script needs updated so it will use Java 7
components/areca/Makefile
components/areca/areca.p5m
components/areca/patches/01-areca_sh.patch
--- a/components/areca/Makefile	Tue Jul 07 02:26:22 2015 -0700
+++ b/components/areca/Makefile	Tue Jul 07 15:18:10 2015 -0700
@@ -64,3 +64,4 @@
 REQUIRED_PACKAGES += library/java/swt
 REQUIRED_PACKAGES += shell/bash
 REQUIRED_PACKAGES += system/core-os
+REQUIRED_PACKAGES += runtime/java/jre-7
--- a/components/areca/areca.p5m	Tue Jul 07 02:26:22 2015 -0700
+++ b/components/areca/areca.p5m	Tue Jul 07 15:18:10 2015 -0700
@@ -138,3 +138,6 @@
 
 # pkgdepend didn't pick up this dependency
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/share/lib/java/swt.jar
+
+# dependency for Java 7
+depend type=require fmri=runtime/java/jre-7
--- a/components/areca/patches/01-areca_sh.patch	Tue Jul 07 02:26:22 2015 -0700
+++ b/components/areca/patches/01-areca_sh.patch	Tue Jul 07 15:18:10 2015 -0700
@@ -2,13 +2,17 @@
 # start, depending on your current working directory, due to
 # faulty setting of PROGRAM_DIR.
 # When updating to the new areca v5.2.16, this patch should
-# no longer be needed.
-diff -rupN areca-7.1-orig/areca.sh areca-7.1/areca.sh
+# no longer be needed. Also forces use of Java 7
+# since this version has issues with Java 8.
 --- areca-7.1-orig/areca.sh	2009-04-20 01:44:14.000000000 -0700
-+++ areca-7.1/areca.sh	2012-11-19 16:13:05.288917000 -0800
[email protected]@ -7,14 +7,7 @@
++++ areca-7.1/areca.sh	2015-07-07 12:35:13.646005433 -0700
[email protected]@ -5,16 +5,10 @@
+ #
+ ####################################################################
  #Options
- JAVADIR=/usr/java
+-JAVADIR=/usr/java
++JAVADIR=/usr/jdk/instances/jdk1.7.0
++JAVA_PROGRAM_DIR=/usr/jdk/instances/jdk1.7.0/bin/
  
 -#Getting Areca's directory
 -PROGRAM_DIR=`dirname "$0"`