[gentoo-commits] gentoo-x86 commit in dev-util/eclipse-sdk/files/3.3: eclipse-3.3-r1

[gentoo-commits] gentoo-x86 commit in dev-util/eclipse-sdk/files/3.3: eclipse-3.3-r1

[Vlastimil Babka (caster)]

caster      08/04/06 20:55:32

  Added:                eclipse-3.3-r1
  Log:
  Revbump for workaround of bug #215150 in the eclipse startup script. Also get MOZILLA_FIVE_HOME variable from swt's package.env (bug #214785) - this was by mistake already applied to 3.3.1.1 when locking swt dep (see below) but only revbump gets this to everyone.
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.1                  dev-util/eclipse-sdk/files/3.3/eclipse-3.3-r1

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/eclipse-sdk/files/3.3/eclipse-3.3-r1?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/eclipse-sdk/files/3.3/eclipse-3.3-r1?rev=1.1&content-type=text/plain

Index: eclipse-3.3-r1
===================================================================
#!/bin/bash
#
# Tiny startup wrapper for Eclipse-3.3
#
# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org>
# Copyright (c) 2007-2008, Jean-Noël Rivasseau <elvanor@gentoo.org>
# Copyright (c) 2004-2008, Gentoo Foundation
#
# Licensed under the GNU General Public License, version 2
#

[[ -f "/etc/eclipserc" ]] && source "/etc/eclipserc"
[[ -f "$HOME/.gentoo/eclipserc" ]] && source "$HOME/.gentoo/eclipserc"

ECLIPSE_HOME=${ECLIPSE_HOME:="/usr/lib/eclipse-3.3"}
ECLIPSE_BIN="${ECLIPSE_HOME}/eclipse"

if [[ ! -x "${ECLIPSE_BIN}" ]] ; then
	echo "Failed to find executable '${ECLIPSE_BIN}'" > /dev/stderr
	exit -1
fi

if ((EUID==0)); then
	echo "!!! You are running Eclipse as root."
	echo "!!! This is not recommended, nor needed."
fi

# get MOZILLA_FIVE_HOME from swt's package.env
# a bit hackish way but works, bug #214785
eval $(gjl --package swt-3 --get-args)

if [[ "${ECLIPSE_XMS}" ]]; then VM_ARGS="${VM_ARGS} -Xms${ECLIPSE_XMS}"; fi
if [[ "${ECLIPSE_XMX}" ]]; then VM_ARGS="${VM_ARGS} -Xmx${ECLIPSE_XMX}"; fi
if [[ "${ECLIPSE_PERMSIZE}" ]]; then VM_ARGS="${VM_ARGS} -XX:PermSize=${ECLIPSE_PERMSIZE}"; fi
if [[ "${ECLIPSE_MAX_PERMSIZE}" ]]; then VM_ARGS="${VM_ARGS} -XX:MaxPermSize=${ECLIPSE_MAX_PERMSIZE}"; fi

# workaround for bug #215150
if [[ $(java-config -f) == sun-jdk-1.6 || $(java-config -f) == sun-jre-bin-1.6 ]]; then
    if [[ $(java-config -g VERSION) == *1.6.0.04 || $(java-config -g VERSION) == *1.6.0.05 ]]; then
	echo "Performing workaround for bug #215150"
	VM_ARGS="${VM_ARGS} -XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith"
    fi
fi

exec "${ECLIPSE_BIN}" "$@" -vmargs ${VM_ARGS} -Djava.library.path=/usr/lib



-- 
gentoo-commits@lists.gentoo.org mailing list

[gentoo-commits] gentoo-x86 commit in dev-util/eclipse-sdk/files/3.3: eclipse-3.3-r1

[Vlastimil Babka (caster)]

caster      08/04/17 08:43:39

  Modified:             eclipse-3.3-r1
  Log:
  Add 1.6.0.06 to the workaround in startup scripts for bug #215150. No revbump, remerge eclipse if you hit the bug.
  (Portage version: 2.1.5_rc3)

Revision  Changes    Path
1.2                  dev-util/eclipse-sdk/files/3.3/eclipse-3.3-r1

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/eclipse-sdk/files/3.3/eclipse-3.3-r1?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/eclipse-sdk/files/3.3/eclipse-3.3-r1?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/eclipse-sdk/files/3.3/eclipse-3.3-r1?r1=1.1&r2=1.2

Index: eclipse-3.3-r1
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/files/3.3/eclipse-3.3-r1,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-3.3-r1	6 Apr 2008 20:55:31 -0000	1.1
+++ eclipse-3.3-r1	17 Apr 2008 08:43:39 -0000	1.2
@@ -36,7 +36,7 @@
 
 # workaround for bug #215150
 if [[ $(java-config -f) == sun-jdk-1.6 || $(java-config -f) == sun-jre-bin-1.6 ]]; then
-    if [[ $(java-config -g VERSION) == *1.6.0.04 || $(java-config -g VERSION) == *1.6.0.05 ]]; then
+    if [[ $(java-config -g VERSION) == *1.6.0.06 || $(java-config -g VERSION) == *1.6.0.05 || $(java-config -g VERSION) == *1.6.0.04 ]]; then
 	echo "Performing workaround for bug #215150"
 	VM_ARGS="${VM_ARGS} -XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith"
     fi



-- 
gentoo-commits@lists.gentoo.org mailing list