OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 07-Dec-2009 11:09:57
Branch: HEAD Handle: 2009120710095700
Modified files:
openpkg-src/java java-toolkit.sh java.spec
Log:
make Sun JDK/JRE detection more precise
Summary:
Revision Changes Path
1.5 +4 -6 openpkg-src/java/java-toolkit.sh
1.8 +1 -1 openpkg-src/java/java.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/java/java-toolkit.sh
============================================================================
$ cvs diff -u -r1.4 -r1.5 java-toolkit.sh
--- openpkg-src/java/java-toolkit.sh 5 Mar 2008 08:28:49 -0000 1.4
+++ openpkg-src/java/java-toolkit.sh 7 Dec 2009 10:09:57 -0000 1.5
@@ -19,12 +19,10 @@
fi
elif [ ".$JAVA_PLATFORM" = . ] && [ ".$JAVA_HOME" != . ]; then
# use user supplied platform
- if [ ".`(grep 'Sun Microsystems' $JAVA_HOME/COPYRIGHT) 2>/dev/null`"
!= . ]; then
- if [ -f "$JAVA_HOME/bin/javac" ]; then
- JAVA_PLATFORM="sun-jdk"
- else
- JAVA_PLATFORM="sun-jre"
- fi
+ if [ -f "$JAVA_HOME/lib/tools.jar" ] && [ -f "$JAVA_HOME/bin/javac"
]; then
+ JAVA_PLATFORM="sun-jdk"
+ elif [ -f "$JAVA_HOME/lib/rt.jar" ] && [ -f "$JAVA_HOME/bin/java" ];
then
+ JAVA_PLATFORM="sun-jre"
elif [ ".`(grep 'GCJ' $JAVA_HOME/README) 2>/dev/null`" != . ]; then
JAVA_PLATFORM="gnu-gcj"
else
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/java/java.spec
============================================================================
$ cvs diff -u -r1.7 -r1.8 java.spec
--- openpkg-src/java/java.spec 18 Apr 2009 13:11:27 -0000 1.7
+++ openpkg-src/java/java.spec 7 Dec 2009 10:09:57 -0000 1.8
@@ -32,7 +32,7 @@
Group: Language
License: OpenPKG
Version: 0
-Release: 20080305
+Release: 20091207
# list of sources
Source0: java-toolkit.sh
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
