From f6c834761e1f4184e74f9a5f59b8ae06ed736bc2 Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Sat, 3 Nov 2007 09:26:39 +0000 Subject: [PATCH] Stefan Fiedler: java/sun-jdk*: use CFGTEMP_JAVA_DEFAULT_JDK_JRE to add packages to the list of JDKs add sun-jdk6, make it the default [2007101320315611670] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8796 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/java/sun-jdk14/preconfig.in | 2 ++ package/java/sun-jdk15/config.in | 18 +++------- package/java/sun-jdk15/preconfig.in | 2 ++ package/java/sun-jdk6/preconfig.in | 2 ++ package/java/sun-jdk6/sun-jdk6.conf | 51 ++++++++++++++++++++++++++ package/java/sun-jdk6/sun-jdk6.desc | 56 +++++++++++++++++++++++++++++ 6 files changed, 117 insertions(+), 14 deletions(-) create mode 100644 package/java/sun-jdk14/preconfig.in create mode 100644 package/java/sun-jdk15/preconfig.in create mode 100644 package/java/sun-jdk6/preconfig.in create mode 100644 package/java/sun-jdk6/sun-jdk6.conf create mode 100644 package/java/sun-jdk6/sun-jdk6.desc diff --git a/package/java/sun-jdk14/preconfig.in b/package/java/sun-jdk14/preconfig.in new file mode 100644 index 000000000..dead63c9a --- /dev/null +++ b/package/java/sun-jdk14/preconfig.in @@ -0,0 +1,2 @@ +var_append CFGTEMP_JAVA_DEFAULT_JDK_JRE \ + " " "sun-jdk14 Using_sun-jdk14_as_default_JDK/JRE" diff --git a/package/java/sun-jdk15/config.in b/package/java/sun-jdk15/config.in index bf4dbbeb1..a6bda29bc 100644 --- a/package/java/sun-jdk15/config.in +++ b/package/java/sun-jdk15/config.in @@ -20,19 +20,9 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -if pkgcheck sun-jdk14 X || pkgcheck sun-jdk15 X -then - menu_begin MENU_PKG_JDK_AND_JRE 'Java Development Kit (JDK) and Runtime Environment (JRE) Options' +menu_begin MENU_PKG_JDK_AND_JRE 'Java Development Kit JDK and Runtime Environment JRE Options' - # we choose to select the newest jdk/jre available as default - for N in sun-jdk14 sun-jdk15; do - if pkgcheck $N X ; then - javadefselect="$javadefselect $N 'Using $N as default JDK/JRE'" - javadefault=$N - fi - done + choice ROCKCFG_JAVA_DEFAULT_JDK_JRE sun-jdk6 $CFGTEMP_JAVA_DEFAULT_JDK_JRE \ + none "Dont_use_a_default_JDK/JRE" - eval "choice ROCKCFG_JAVA_DEFAULT_JDK_JRE $javadefault $javadefselect" - - menu_end -fi +menu_end diff --git a/package/java/sun-jdk15/preconfig.in b/package/java/sun-jdk15/preconfig.in new file mode 100644 index 000000000..7b57e490f --- /dev/null +++ b/package/java/sun-jdk15/preconfig.in @@ -0,0 +1,2 @@ +var_append CFGTEMP_JAVA_DEFAULT_JDK_JRE \ + " " "sun-jdk15 Using_sun-jdk15_as_default_JDK/JRE" diff --git a/package/java/sun-jdk6/preconfig.in b/package/java/sun-jdk6/preconfig.in new file mode 100644 index 000000000..cca8369a3 --- /dev/null +++ b/package/java/sun-jdk6/preconfig.in @@ -0,0 +1,2 @@ +var_append CFGTEMP_JAVA_DEFAULT_JDK_JRE \ + " " "sun-jdk6 Using_sun-jdk6_as_default_JDK/JRE" diff --git a/package/java/sun-jdk6/sun-jdk6.conf b/package/java/sun-jdk6/sun-jdk6.conf new file mode 100644 index 000000000..8dd3bdb89 --- /dev/null +++ b/package/java/sun-jdk6/sun-jdk6.conf @@ -0,0 +1,51 @@ +#!/bin/bash +# --- ROCK-COPYRIGHT-NOTE-BEGIN --- +# +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# Please add additional copyright information _after_ the line containing +# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +# +# ROCK Linux: rock-src/package/java/sun-jdk15/sun-jdk15.conf +# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. A copy of the GNU General Public +# License can be found at Documentation/COPYING. +# +# Many people helped and are helping developing ROCK Linux. Please +# have a look at http://www.rocklinux.org/ and the Documentation/TEAM +# file for details. +# +# --- ROCK-COPYRIGHT-NOTE-END --- + +install_jdk () +{ + if [[ "$xpkg" == *-amd64 ]] ; then + cp -a $archdir/jdk-${ver//./_}-dlj-linux-amd64.bin java.bin + else + cp -a $archdir/jdk-${ver//./_}-dlj-linux-i586.bin java.bin + fi + chmod +x java.bin + sh java.bin --accept-license --unpack + cp -a -f jdk* /opt + + JAVA_HOME="/opt/`ls -d jdk*`" + if [ "$ROCKCFG_JAVA_DEFAULT_JDK_JRE" == "$pkg" ] ; then + cat > $root/etc/profile.d/$pkg <<-EOP +JAVA_HOME="$JAVA_HOME" +export JAVA_HOME +EOP + fi +} + +autoextract=0 +custmain="install_jdk" + +# don't split this package +postflist="pkgsplits=" + +# don't patch this package! +patchfiles="" diff --git a/package/java/sun-jdk6/sun-jdk6.desc b/package/java/sun-jdk6/sun-jdk6.desc new file mode 100644 index 000000000..a9ebffd67 --- /dev/null +++ b/package/java/sun-jdk6/sun-jdk6.desc @@ -0,0 +1,56 @@ + +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/java/sun-jdk15/sun-jdk15.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] JavaTM 2 Platform Standard Edition Development Kit 6.0 + +[T] Java 2 Platform, Standard Edition (J2SE) provides a complete applications +[T] environment for a wide range of computer systems. It also serves as the +[T] foundation for the Java 2 Platform, Enterprise Edition (J2EE) and Java Web +[T] Services. +[T] The J2SE Runtime Environment (JRE) provides all the software required to +[T] run Java applets and applications. +[T] The J2SE Development Kit (JDK) contains everything that is in the JRE, as +[T] well as tools for developing Java applets and applications. + +[U] http://java.sun.com/javase/index.jsp + +[A] Sun Microsystems, Inc. + +[M] Stefan Fiedler + +[C] extra/development +[R] + x86 + +[L] DLJ +#[L] http://download.java.net/dlj/DLJ-v1.1.pdf +[S] Stable +[V] 6u3 +[P] O -?---5---9 275.800 + +#if xpkg == sun-jdk6 +[D] X jdk-6u3-dlj-linux-i586.bin http://download.java.net/dlj/binaries/ NODIST +#endif + +#if xpkg == sun-jdk6-amd64 +[D] X jdk-6u3-dlj-linux-amd64.bin http://download.java.net/dlj/binaries/ NODIST +#endif