Changeset c1da7f7 for core/c/find-java-home

Timestamp:

May 12, 2013 12:08:52 AM (7 years ago)

Author:

kytv <kytv@…>

Branches:

master

Children:

b096834

Parents:

dca5e98

Message:

improvements to jbigi scripts

support for Solaris (tested with Solaris 11 x86)

mbuild-all.sh:

• output correctly formatted file names (tested in Solaris x86, FreeBSD (x86 and x64) and Linux (x86 & x64))
• switch from echo -e to the more portable printf
• more error checking, comments

debian/patches: refreshed based on changes to core/c/*
libjcpuid-x86_64-solaris.so: built in solaris 11 x86 with

java 1.7.0_07 and gcc 4.5.2, stripped

File:

• core/c/find-java-home (modified) (3 diffs)

core/c/find-java-home

@@ -5 +5 @@
     elif [ -d /usr/local/openjdk7 ]; then
         JAVA_HOME="/usr/local/openjdk7"
+    fi
+elif [ $UNIXTYPE = "sunos" ]; then
+    UNIXTYPE="solaris"
+    if [ -d /usr/jdk/latest/ ]; then
+        JAVA_HOME="/usr/jdk/latest"
+    elif [ -d /usr/jdk/instances/jdk1.7.0/ ]; then
+        JAVA_HOME="/usr/jdk/instances/jdk1.7.0"
+    elif [ -d /usr/jdk/instances/jdk1.6.0 ]; then
+        JAVA_HOME="/usr/jdk/instances/jdk1.6.0"
     fi
 elif [ $UNIXTYPE = "openbsd" ]; then
@@ -27 +36 @@
     JAVA_HOME=$(/usr/libexec/java_home)
 elif [ $UNIXTYPE = "gnu/kfreebsd" ]; then
+    UNIXTYPE="linux"
     if [ -d /usr/lib/jvm/java-gcj ]; then
         JAVA_HOME="/usr/lib/jvm/java-gcj"
@@ -32 +42 @@
 fi
 
-export JAVA_HOME
+export JAVA_HOME UNIXTYPE