From 98eedf91c0f73adb4a7728dbb502f3bfe096d058 Mon Sep 17 00:00:00 2001 From: Ralph Sennhauser Date: Sun, 30 Dec 2012 12:58:44 +0000 Subject: Desktop files, icons, env.d and profile.d files as well as revdep-rebuild control file and finally run-java-tool are now part of baselayout-java. Remove some java-config-1 remenmants as well. svn path=/projects/java-config-2/trunk/; revision=9131 --- src/profile.d/java-config-2.csh | 22 ------------------ src/profile.d/java-config-2.sh | 34 ---------------------------- src/revdep-rebuild/60-java | 9 -------- src/run-java-tool | 50 ----------------------------------------- 4 files changed, 115 deletions(-) delete mode 100644 src/profile.d/java-config-2.csh delete mode 100644 src/profile.d/java-config-2.sh delete mode 100644 src/revdep-rebuild/60-java delete mode 100644 src/run-java-tool (limited to 'src') diff --git a/src/profile.d/java-config-2.csh b/src/profile.d/java-config-2.csh deleted file mode 100644 index 517a054..0000000 --- a/src/profile.d/java-config-2.csh +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/files/java-config-2.profiled.csh,v 1.3 2007/01/13 17:17:08 grobian Exp $ - -set gentoo_user_vm = "${HOME}/.gentoo/java-config-2/current-user-vm" -set gentoo_system_vm = "/etc/java-config-2/current-system-vm" - -## If we have a current-user-vm (and aren't root)... set it to JAVA_HOME -## Otherwise set to the current system vm -if ( ( "$uid" != "0" ) && ( -l $gentoo_user_vm ) ) then - setenv JAVA_HOME $gentoo_user_vm -else if ( -l $gentoo_system_vm ) then - setenv JAVA_HOME $gentoo_system_vm -endif -unset gentoo_user_vm gentoo_system_vm - -if ( $?JAVA_HOME ) then - # prepending to come before generation 1 - setenv MANPATH "${JAVA_HOME}/man:${MANPATH}" - setenv JDK_HOME $JAVA_HOME - setenv JAVAC ${JDK_HOME}/bin/javac -endif diff --git a/src/profile.d/java-config-2.sh b/src/profile.d/java-config-2.sh deleted file mode 100644 index 49155d1..0000000 --- a/src/profile.d/java-config-2.sh +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/files/java-config-2.profiled.sh-r1,v 1.1 2007/03/16 11:13:16 betelgeuse Exp $ - -# If we have a current-user-vm (and aren't root)... set it to JAVA_HOME -gentoo_user_vm="${HOME}/.gentoo/java-config-2/current-user-vm" -gentoo_system_vm="/etc/java-config-2/current-system-vm" - -# Please make sure that this script is POSIX compliant -# See https://bugs.gentoo.org/show_bug.cgi?id=169925 -# for more details" - -if [ -z "${UID}" ] ; then - # id lives in /usr/bin which might not be mounted - if type id >/dev/null 2>/dev/null ; then - user_id=$(id -u) - else - [ "${USER}" = "root" ] && user_id=0 - fi -fi - -# The root user uses the system vm -if [ "${user_id}" != 0 -a -L "${gentoo_user_vm}" ]; then - export JAVA_HOME=${gentoo_user_vm} -# Otherwise set to the current system vm -elif [ -L /etc/java-config-2/current-system-vm ]; then - export JAVA_HOME=${gentoo_system_vm} -fi - -# prepending to come before generation 1 -export MANPATH="${JAVA_HOME}/man:${MANPATH}" -export JDK_HOME=${JAVA_HOME} -export JAVAC=${JDK_HOME}/bin/javac -unset gentoo_user_vm gentoo_system_vm user_id diff --git a/src/revdep-rebuild/60-java b/src/revdep-rebuild/60-java deleted file mode 100644 index 1aca594..0000000 --- a/src/revdep-rebuild/60-java +++ /dev/null @@ -1,9 +0,0 @@ -# The VM dynamically loads these at runtime so they will end up as missing -# but actually work just fine. See for example -# https://bugs.gentoo.org/show_bug.cgi?id=152039 -# -# This file should only have files the are used by things like swt. If there -# are "broken" links inside the jre itself, the jre should install it's own -# control file. - -LD_LIBRARY_MASK="libjvm.so libjawt.so" diff --git a/src/run-java-tool b/src/run-java-tool deleted file mode 100644 index 46f804b..0000000 --- a/src/run-java-tool +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -user_vm="${HOME}/.gentoo/java-config-2/current-user-vm" -system_vm="/etc/java-config-2/current-system-vm" -# Try GENTOO_VM -if [[ -n ${GENTOO_VM} ]]; then - vmpath="/usr/lib/jvm/${GENTOO_VM}/" -# Then user VM -elif [[ -h ${user_vm} ]]; then - vmpath=$(readlink ${user_vm}) -# And fall back to the system VM -else - vmpath=$(readlink ${system_vm}) -fi -tool=$(basename $0) -bin=${vmpath}/bin/${tool} -jrebin=${vmpath}/jre/bin/${tool} - -vm_handle=$(basename ${vmpath}) -if [[ -x ${bin} ]]; then - exec ${bin} "${@}" -elif [[ -x ${jrebin} ]]; then - exec ${jrebin} "${@}" -else - if [[ ! -d ${vmpath} ]]; then - echo "* Home for VM '${vm_handle}' does not exist: ${vmpath}" >&2 - if [[ -n ${GENTOO_VM} ]]; then - echo "* Invalid value for GENTOO_VM: ${GENTOO_VM}" - elif [[ -h ${user_vm} ]]; then - echo "* Invalid User VM: ${vm_handle}" >&2 - else - echo "* Invalid System VM: ${vm_handle}" >&2 - fi - else - if [[ ${tool} = "run-java-tool" ]]; then - echo "* run-java-tool was invoked directly" >&2 - echo "* run-java-tool should only be used via symlinks to it" >&2 - else - echo "* ${tool} is not available for ${vm_handle} on $(uname -m)" >&2 - echo "* IMPORTANT: some Java tools are not available on some VMs on some architectures" >&2 - if (( ${EUID} != 0 )) && [[ "${DISPLAY}" ]] && type -p notify-send > /dev/null; then - notify-send -i java-icon48 "Gentoo Java Launcher" "${tool} is not available for ${vm_handle} -Gentoo Java User Guide" - fi - fi - fi - exit 1 -fi - - -- cgit v1.2.3-65-gdbad