* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2008-05-03 21:28 Petteri Raty (betelgeuse)
0 siblings, 0 replies; 40+ messages in thread
From: Petteri Raty (betelgeuse) @ 2008-05-03 21:28 UTC (permalink / raw
To: gentoo-commits
betelgeuse 08/05/03 21:28:45
Modified: java-utils-2.eclass
Log:
fix typo in ejunit
Revision Changes Path
1.107 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.107&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.107&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.106&r2=1.107
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- java-utils-2.eclass 3 May 2008 21:28:07 -0000 1.106
+++ java-utils-2.eclass 3 May 2008 21:28:45 -0000 1.107
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.106 2008/05/03 21:28:07 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.107 2008/05/03 21:28:45 betelgeuse Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -1772,7 +1772,7 @@
# @param $2 - classpath; junit and recorded dependencies get appended
# @param $@ - the rest of the parameters are passed to java
# ------------------------------------------------------------------------------
-ejunit{
+ejunit() {
debug-print-function ${FUNCNAME} $*
local pkgs
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2011-10-29 14:05 Vlastimil Babka (caster)
0 siblings, 0 replies; 40+ messages in thread
From: Vlastimil Babka (caster) @ 2011-10-29 14:05 UTC (permalink / raw
To: gentoo-commits
caster 11/10/29 14:05:48
Modified: java-utils-2.eclass
Log:
Add -Dmaven.test.skip=true for eant() in src_compile for easier usage of maven-generated build.xml. Bug #388507, patch by Ralph Sennhauser
Revision Changes Path
1.147 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.147&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.147&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.146&r2=1.147
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- java-utils-2.eclass 29 Oct 2011 13:17:15 -0000 1.146
+++ java-utils-2.eclass 29 Oct 2011 14:05:48 -0000 1.147
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.146 2011/10/29 13:17:15 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.147 2011/10/29 14:05:48 caster Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -2009,6 +2009,8 @@
antflags="${antflags} -DJunit.present=true"
[[ ${ANT_TASKS} = *ant-junit* ]] && gcp="${gcp} junit"
getjarsarg="--with-dependencies"
+ else
+ antflags="${antflags} -Dmaven.test.skip=true"
fi
local cp
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2011-10-29 13:17 Vlastimil Babka (caster)
0 siblings, 0 replies; 40+ messages in thread
From: Vlastimil Babka (caster) @ 2011-10-29 13:17 UTC (permalink / raw
To: gentoo-commits
caster 11/10/29 13:17:15
Modified: java-utils-2.eclass
Log:
Remove LANG=C and LC_ALL=C override in pkg_setup(), bug #330433.
Revision Changes Path
1.146 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.146&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.146&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.145&r2=1.146
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- java-utils-2.eclass 2 Oct 2011 08:10:28 -0000 1.145
+++ java-utils-2.eclass 29 Oct 2011 13:17:15 -0000 1.146
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.145 2011/10/02 08:10:28 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.146 2011/10/29 13:17:15 caster Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -2509,8 +2509,6 @@
java-pkg_setup-vm() {
debug-print-function ${FUNCNAME} $*
- export LANG="C" LC_ALL="C"
-
local vendor="$(java-pkg_get-vm-vendor)"
if [[ "${vendor}" == "sun" ]] && java-pkg_is-vm-version-ge "1.5" ; then
addpredict "/dev/random"
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2011-10-02 8:10 Serkan Kaba (serkan)
0 siblings, 0 replies; 40+ messages in thread
From: Serkan Kaba (serkan) @ 2011-10-02 8:10 UTC (permalink / raw
To: gentoo-commits
serkan 11/10/02 08:10:28
Modified: java-utils-2.eclass
Log:
Fix icedtea vendor match. Reported by sera.
Revision Changes Path
1.145 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.145&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.145&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.144&r2=1.145
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- java-utils-2.eclass 2 Oct 2011 07:38:43 -0000 1.144
+++ java-utils-2.eclass 2 Oct 2011 08:10:28 -0000 1.145
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.144 2011/10/02 07:38:43 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.145 2011/10/02 08:10:28 serkan Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -2521,7 +2521,7 @@
elif [[ "${vendor}" == "oracle" ]]; then
addpredict "/dev/random"
addpredict "/proc/self/coredump_filter"
- elif [[ "${vendor}" == "icedtea" ]] && java-pkg_is-vm-version-ge "1.7" ; then
+ elif [[ "${vendor}" == icedtea* ]] && java-pkg_is-vm-version-ge "1.7" ; then
addpredict "/dev/random"
addpredict "/proc/self/coredump_filter"
elif [[ "${vendor}" == "jrockit" ]]; then
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2011-10-02 7:38 Serkan Kaba (serkan)
0 siblings, 0 replies; 40+ messages in thread
From: Serkan Kaba (serkan) @ 2011-10-02 7:38 UTC (permalink / raw
To: gentoo-commits
serkan 11/10/02 07:38:43
Modified: java-utils-2.eclass
Log:
Add sandbox exceptions for icedtea:7. Reported by sera.
Revision Changes Path
1.144 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.144&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.144&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.143&r2=1.144
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- java-utils-2.eclass 10 Sep 2011 14:32:58 -0000 1.143
+++ java-utils-2.eclass 2 Oct 2011 07:38:43 -0000 1.144
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.143 2011/09/10 14:32:58 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.144 2011/10/02 07:38:43 serkan Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -2521,6 +2521,9 @@
elif [[ "${vendor}" == "oracle" ]]; then
addpredict "/dev/random"
addpredict "/proc/self/coredump_filter"
+ elif [[ "${vendor}" == "icedtea" ]] && java-pkg_is-vm-version-ge "1.7" ; then
+ addpredict "/dev/random"
+ addpredict "/proc/self/coredump_filter"
elif [[ "${vendor}" == "jrockit" ]]; then
addpredict "/proc/cpuinfo"
fi
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2011-09-10 14:32 Serkan Kaba (serkan)
0 siblings, 0 replies; 40+ messages in thread
From: Serkan Kaba (serkan) @ 2011-09-10 14:32 UTC (permalink / raw
To: gentoo-commits
serkan 11/09/10 14:32:58
Modified: java-utils-2.eclass
Log:
Fix sandbox violations reported in bugs #371827 and #382465.
Revision Changes Path
1.143 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.143&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.143&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.142&r2=1.143
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- java-utils-2.eclass 29 Aug 2011 01:28:10 -0000 1.142
+++ java-utils-2.eclass 10 Sep 2011 14:32:58 -0000 1.143
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.142 2011/08/29 01:28:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.143 2011/09/10 14:32:58 serkan Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -2517,6 +2517,10 @@
elif [[ "${vendor}" == "ibm" ]]; then
addpredict "/proc/self/maps"
addpredict "/proc/cpuinfo"
+ addpredict "/proc/self/coredump_filter"
+ elif [[ "${vendor}" == "oracle" ]]; then
+ addpredict "/dev/random"
+ addpredict "/proc/self/coredump_filter"
elif [[ "${vendor}" == "jrockit" ]]; then
addpredict "/proc/cpuinfo"
fi
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2011-04-07 18:05 Serkan Kaba (serkan)
0 siblings, 0 replies; 40+ messages in thread
From: Serkan Kaba (serkan) @ 2011-04-07 18:05 UTC (permalink / raw
To: gentoo-commits
serkan 11/04/07 18:05:40
Modified: java-utils-2.eclass
Log:
Remove unused variable from eant doc.
Revision Changes Path
1.140 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.140&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.140&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.139&r2=1.140
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- java-utils-2.eclass 26 Mar 2011 00:43:12 -0000 1.139
+++ java-utils-2.eclass 7 Apr 2011 18:05:40 -0000 1.140
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.139 2011/03/26 00:43:12 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.140 2011/04/07 18:05:40 serkan Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -1914,7 +1914,6 @@
# EANT_NEEDS_TOOLS - add tools.jar to the gentoo.classpath. Should only be used
# for build-time purposes, the dependency is not recorded to
# package.env!
-# JAVA_PKG_NO_BUNDLED_SEARCH - Don't search for bundled jars or class files
# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
# ------------------------------------------------------------------------------
eant() {
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2011-03-26 0:43 Serkan Kaba (serkan)
0 siblings, 0 replies; 40+ messages in thread
From: Serkan Kaba (serkan) @ 2011-03-26 0:43 UTC (permalink / raw
To: gentoo-commits
serkan 11/03/26 00:43:12
Modified: java-utils-2.eclass
Log:
Fix ejunit4 doc.
Revision Changes Path
1.139 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.139&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.139&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.138&r2=1.139
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- java-utils-2.eclass 23 Mar 2011 19:32:57 -0000 1.138
+++ java-utils-2.eclass 26 Mar 2011 00:43:12 -0000 1.139
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.138 2011/03/23 19:32:57 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.139 2011/03/26 00:43:12 serkan Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -1801,7 +1801,7 @@
# @ebuild-function ejunit
#
# Junit wrapper function. Makes it easier to run the tests and checks for
-# dev-java/junit in DEPEND. Launches the tests using junit.textui.TestRunner.
+# dev-java/junit in DEPEND. Launches the tests using org.junit.runner.JUnitCore.
#
# Examples:
# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests
^ permalink raw reply [flat|nested] 40+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2011-03-23 19:32 Serkan Kaba (serkan)
0 siblings, 0 replies; 40+ messages in thread
From: Serkan Kaba (serkan) @ 2011-03-23 19:32 UTC (permalink / raw
To: gentoo-commits
serkan 11/03/23 19:32:57
Modified: java-utils-2.eclass
Log:
Use JUnitCore as a runner for junit4 and create symlinks for examples. Improve ejunit docs. Thanks to Ralph Sennhauser <gentoo.sera@bluewin.ch> for both patches.
Revision Changes Path
1.138 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.138&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.138&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.137&r2=1.138
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- java-utils-2.eclass 15 Mar 2011 19:54:12 -0000 1.137
+++ java-utils-2.eclass 23 Mar 2011 19:32:57 -0000 1.138
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.137 2011/03/15 19:54:12 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.138 2011/03/23 19:32:57 serkan Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -243,6 +243,9 @@
doins -r "$@"
) || die "Installing examples failed"
fi
+
+ # Let's make a symlink to the directory we have everything else under
+ dosym "${dest}" "${JAVA_PKG_SHAREPATH}/examples" || die
}
# -----------------------------------------------------------------------------
@@ -1787,6 +1790,9 @@
fi
local runner=junit.textui.TestRunner
+ if [[ "${junit}" == "junit-4" ]] ; then
+ runner=org.junit.runner.JUnitCore
+ fi
debug-print "Calling: java -cp \"${cp}\" -Djava.awt.headless=true ${runner} ${@}"
java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed"
}
@@ -1800,6 +1806,8 @@
# Examples:
# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests
# ejunit org.blinkenlights.jid3.test.AllTests
+# ejunit org.blinkenlights.jid3.test.FirstTest \
+# org.blinkenlights.jid3.test.SecondTest
#
# @param $1 - -cp or -classpath
# @param $2 - classpath; junit and recorded dependencies get appended
@@ -1820,6 +1828,8 @@
# Examples:
# ejunit4 -cp build/classes org.blinkenlights.jid3.test.AllTests
# ejunit4 org.blinkenlights.jid3.test.AllTests
+# ejunit4 org.blinkenlights.jid3.test.FirstTest \
+# org.blinkenlights.jid3.test.SecondTest
#
# @param $1 - -cp or -classpath
# @param $2 - classpath; junit and recorded dependencies get appended
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2011-03-15 19:54 Serkan Kaba (serkan)
0 siblings, 0 replies; 40+ messages in thread
From: Serkan Kaba (serkan) @ 2011-03-15 19:54 UTC (permalink / raw
To: gentoo-commits
serkan 11/03/15 19:54:13
Modified: java-utils-2.eclass
Log:
Minor ejunit4 doc. fix.
Revision Changes Path
1.137 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.137&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.137&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.136&r2=1.137
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- java-utils-2.eclass 15 Mar 2011 19:53:05 -0000 1.136
+++ java-utils-2.eclass 15 Mar 2011 19:54:12 -0000 1.137
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.136 2011/03/15 19:53:05 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.137 2011/03/15 19:54:12 serkan Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -1818,8 +1818,8 @@
# dev-java/junit:4 in DEPEND. Launches the tests using junit.textui.TestRunner.
#
# Examples:
-# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests
-# ejunit org.blinkenlights.jid3.test.AllTests
+# ejunit4 -cp build/classes org.blinkenlights.jid3.test.AllTests
+# ejunit4 org.blinkenlights.jid3.test.AllTests
#
# @param $1 - -cp or -classpath
# @param $2 - classpath; junit and recorded dependencies get appended
^ permalink raw reply [flat|nested] 40+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2011-03-15 19:53 Serkan Kaba (serkan)
0 siblings, 0 replies; 40+ messages in thread
From: Serkan Kaba (serkan) @ 2011-03-15 19:53 UTC (permalink / raw
To: gentoo-commits
serkan 11/03/15 19:53:05
Modified: java-utils-2.eclass
Log:
Add ejunit4() function to run Junit4 tests.
Revision Changes Path
1.136 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.136&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.136&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.135&r2=1.136
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- java-utils-2.eclass 28 Apr 2010 19:40:40 -0000 1.135
+++ java-utils-2.eclass 15 Mar 2011 19:53:05 -0000 1.136
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.135 2010/04/28 19:40:40 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.136 2011/03/15 19:53:05 serkan Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -1754,21 +1754,18 @@
fi
}
+
# ------------------------------------------------------------------------------
-# @ebuild-function ejunit
+# @internal-function ejunit_
#
-# Junit wrapper function. Makes it easier to run the tests and checks for
+# Internal Junit wrapper function. Makes it easier to run the tests and checks for
# dev-java/junit in DEPEND. Launches the tests using junit.textui.TestRunner.
#
-# Examples:
-# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests
-# ejunit org.blinkenlights.jid3.test.AllTests
-#
-# @param $1 - -cp or -classpath
-# @param $2 - classpath; junit and recorded dependencies get appended
+# @param $1 - junit package (junit or junit-4)
+# @param $2 - -cp or -classpath
+# @param $3 - classpath; junit and recorded dependencies get appended
# @param $@ - the rest of the parameters are passed to java
-# ------------------------------------------------------------------------------
-ejunit() {
+ejunit_() {
debug-print-function ${FUNCNAME} $*
local pkgs
@@ -1778,7 +1775,10 @@
done
fi
- local cp=$(java-pkg_getjars --with-dependencies junit${pkgs})
+ local junit=${1}
+ shift 1
+
+ local cp=$(java-pkg_getjars --with-dependencies ${junit}${pkgs})
if [[ ${1} = -cp || ${1} = -classpath ]]; then
cp="${2}:${cp}"
shift 2
@@ -1792,6 +1792,46 @@
}
# ------------------------------------------------------------------------------
+# @ebuild-function ejunit
+#
+# Junit wrapper function. Makes it easier to run the tests and checks for
+# dev-java/junit in DEPEND. Launches the tests using junit.textui.TestRunner.
+#
+# Examples:
+# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests
+# ejunit org.blinkenlights.jid3.test.AllTests
+#
+# @param $1 - -cp or -classpath
+# @param $2 - classpath; junit and recorded dependencies get appended
+# @param $@ - the rest of the parameters are passed to java
+# ------------------------------------------------------------------------------
+ejunit() {
+ debug-print-function ${FUNCNAME} $*
+
+ ejunit_ "junit" "${@}"
+}
+
+# ------------------------------------------------------------------------------
+# @ebuild-function ejunit4
+#
+# Junit4 wrapper function. Makes it easier to run the tests and checks for
+# dev-java/junit:4 in DEPEND. Launches the tests using junit.textui.TestRunner.
+#
+# Examples:
+# ejunit -cp build/classes org.blinkenlights.jid3.test.AllTests
+# ejunit org.blinkenlights.jid3.test.AllTests
+#
+# @param $1 - -cp or -classpath
+# @param $2 - classpath; junit and recorded dependencies get appended
+# @param $@ - the rest of the parameters are passed to java
+# ------------------------------------------------------------------------------
+ejunit4() {
+ debug-print-function ${FUNCNAME} $*
+
+ ejunit_ "junit-4" "${@}"
+}
+
+# ------------------------------------------------------------------------------
# @section-end helper
# ------------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2010-04-28 19:40 Vlastimil Babka (caster)
0 siblings, 0 replies; 40+ messages in thread
From: Vlastimil Babka (caster) @ 2010-04-28 19:40 UTC (permalink / raw
To: gentoo-commits
caster 10/04/28 19:40:40
Modified: java-utils-2.eclass
Log:
Support version globbing when checking dependencies, bug #315123.
Revision Changes Path
1.135 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.135&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.135&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.134&r2=1.135
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- java-utils-2.eclass 1 Apr 2010 22:29:28 -0000 1.134
+++ java-utils-2.eclass 28 Apr 2010 19:40:40 -0000 1.135
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.134 2010/04/01 22:29:28 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.135 2010/04/28 19:40:40 caster Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -2679,8 +2679,9 @@
local target_pkg="${2}"
local dev_error=""
+ # remove the version specification, which may include globbing (* and [123])
local stripped_pkg=$(echo "${target_pkg}" | sed \
- 's/-[0-9]*\(\.[0-9]\)*$//')
+ 's/-\([0-9*]*\(\[[0-9]*\]\)*\)*\(\.\([0-9*]*\(\[[0-9]*\]\)*\)*\)*$//')
debug-print "Matching against: ${stripped_pkg}"
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2010-04-01 22:29 Vlastimil Babka (caster)
0 siblings, 0 replies; 40+ messages in thread
From: Vlastimil Babka (caster) @ 2010-04-01 22:29 UTC (permalink / raw
To: gentoo-commits
caster 10/04/01 22:29:28
Modified: java-utils-2.eclass
Log:
Allow JAVA_PKG_NV_DEPEND override in java-pkg_needs-vm()
Revision Changes Path
1.134 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.134&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.134&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.133&r2=1.134
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- java-utils-2.eclass 24 Mar 2010 12:11:05 -0000 1.133
+++ java-utils-2.eclass 1 Apr 2010 22:29:28 -0000 1.134
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.133 2010/03/24 12:11:05 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.134 2010/04/01 22:29:28 caster Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -2484,7 +2484,7 @@
java-pkg_needs-vm() {
debug-print-function ${FUNCNAME} $*
- if [[ -n "$(echo ${DEPEND} | sed -e '\:virtual/jdk:!d')" ]]; then
+ if [[ -n "$(echo ${JAVA_PKG_NV_DEPEND:-${DEPEND}} | sed -e '\:virtual/jdk:!d')" ]]; then
return 0
fi
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2010-03-24 12:11 Petteri Raty (betelgeuse)
0 siblings, 0 replies; 40+ messages in thread
From: Petteri Raty (betelgeuse) @ 2010-03-24 12:11 UTC (permalink / raw
To: gentoo-commits
betelgeuse 10/03/24 12:11:05
Modified: java-utils-2.eclass
Log:
Use sort -u instead of uniq so all duplicates are removed.
Revision Changes Path
1.133 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.133&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.133&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.132&r2=1.133
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- java-utils-2.eclass 12 Feb 2010 23:51:44 -0000 1.132
+++ java-utils-2.eclass 24 Mar 2010 12:11:05 -0000 1.133
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.132 2010/02/12 23:51:44 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.133 2010/03/24 12:11:05 betelgeuse Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -2322,12 +2322,12 @@
[[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
[[ -n "${JAVA_PROVIDE}" ]] && echo "PROVIDES=\"${JAVA_PROVIDE}\""
[[ -f "${JAVA_PKG_DEPEND_FILE}" ]] \
- && echo "DEPEND=\"$(cat "${JAVA_PKG_DEPEND_FILE}" | uniq | tr '\n' ':')\""
+ && echo "DEPEND=\"$(sort -u "${JAVA_PKG_DEPEND_FILE}" | tr '\n' ':')\""
[[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \
- && echo "OPTIONAL_DEPEND=\"$(cat "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | uniq | tr '\n' ':')\""
+ && echo "OPTIONAL_DEPEND=\"$(sort -u "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | tr '\n' ':')\""
echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
[[ -f "${JAVA_PKG_BUILD_DEPEND_FILE}" ]] \
- && echo "BUILD_DEPEND=\"$(cat "${JAVA_PKG_BUILD_DEPEND_FILE}" | uniq | tr '\n' ':')\""
+ && echo "BUILD_DEPEND=\"$(sort -u "${JAVA_PKG_BUILD_DEPEND_FILE}" | tr '\n' ':')\""
) > "${JAVA_PKG_ENV}"
# register target/source
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2010-01-17 12:53 Petteri Raty (betelgeuse)
0 siblings, 0 replies; 40+ messages in thread
From: Petteri Raty (betelgeuse) @ 2010-01-17 12:53 UTC (permalink / raw
To: gentoo-commits
betelgeuse 10/01/17 12:53:18
Modified: java-utils-2.eclass
Log:
Raise the minimum java-config version to 2.1.9-r1 to solve #301261.
Revision Changes Path
1.131 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.131&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.131&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.130&r2=1.131
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- java-utils-2.eclass 8 Nov 2009 20:39:30 -0000 1.130
+++ java-utils-2.eclass 17 Jan 2010 12:53:18 -0000 1.131
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.130 2009/11/08 20:39:30 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.131 2010/01/17 12:53:18 betelgeuse Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -72,7 +72,7 @@
# the version of java-config we want to use. Usually the latest stable version
# so that ebuilds can use new features without depending on specific versions.
# -----------------------------------------------------------------------------
-JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.1.6 ${JAVA_PKG_PORTAGE_DEP}"
+JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.1.9-r1 ${JAVA_PKG_PORTAGE_DEP}"
hasq source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source? ( app-arch/zip )"
# -----------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2009-06-07 8:22 Alistair Bush (ali_bush)
0 siblings, 0 replies; 40+ messages in thread
From: Alistair Bush (ali_bush) @ 2009-06-07 8:22 UTC (permalink / raw
To: gentoo-commits
ali_bush 09/06/07 08:22:42
Modified: java-utils-2.eclass
Log:
Add build-only jar recording support.
Revision Changes Path
1.129 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.129&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.129&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.128&r2=1.129
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- java-utils-2.eclass 2 Jun 2009 07:02:01 -0000 1.128
+++ java-utils-2.eclass 7 Jun 2009 08:22:42 -0000 1.129
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.128 2009/06/02 07:02:01 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.129 2009/06/07 08:22:42 ali_bush Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -874,6 +874,7 @@
local destdir="."
local deep=""
local virtual=""
+ local record_jar=""
[[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
@@ -918,7 +919,7 @@
[[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}"
done
# setting this disables further record-jar_ calls later
- build_only="build"
+ record_jar="true"
else
java-pkg_ensure-dep "${build_only}" "${target_pkg}"
fi
@@ -928,7 +929,7 @@
if [[ -z "${build_only}" && -n "${virtual}" ]]; then
java-pkg_record-jar_ "${target_pkg}"
# setting this disables further record-jars_ calls later
- build_only="build"
+ record_jar="true"
fi
pushd ${destdir} > /dev/null \
@@ -946,13 +947,25 @@
[[ -f "${target_jar}" ]] && rm "${target_jar}"
ln -snf "${jar}" \
|| die "Failed to make symlink from ${jar} to ${jar_name}"
- [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}"
- # otherwise, if the current jar is the target jar, link it
+ if [[ -z "${record_jar}" ]]; then
+ if [[ -z "${build_only}" ]]; then
+ java-pkg_record-jar_ "${target_pkg}" "${jar}"
+ else
+ java-pkg_record-jar_ --build-only "${target_pkg}" "${jar}"
+ fi
+ fi
+ # otherwise, if the current jar is the target jar, link it
elif [[ "${jar_name}" == "${target_jar}" ]] ; then
[[ -f "${destjar}" ]] && rm "${destjar}"
ln -snf "${jar}" "${destjar}" \
|| die "Failed to make symlink from ${jar} to ${destjar}"
- [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${target_pkg}" "${jar}"
+ if [[ -z "${record_jar}" ]]; then
+ if [[ -z "${build_only}" ]]; then
+ java-pkg_record-jar_ "${target_pkg}" "${jar}"
+ else
+ java-pkg_record-jar_ --build-only "${target_jar}" "${jar}"
+ fi
+ fi
popd > /dev/null
return 0
fi
@@ -1035,12 +1048,13 @@
java-pkg_ensure-dep "${build_only}" "${pkg}"
done
- # Only record jars that aren't build-only
- if [[ -z "${build_only}" ]]; then
- for pkg in ${pkgs//,/ }; do
+ for pkg in ${pkgs//,/ }; do
+ if [[ -z "${build_only}" ]]; then
java-pkg_record-jar_ "${pkg}"
- done
- fi
+ else
+ java-pkg_record-jar_ --build-only "${pkg}"
+ fi
+ done
echo "${jars}"
}
@@ -1071,6 +1085,7 @@
local build_only=""
local virtual=""
+ local record_jar=""
[[ "${EBUILD_PHASE}" == "test" ]] && build_only="build"
@@ -1106,8 +1121,12 @@
# Record the package(Virtual) as a dependency and then set build_only
# So that individual jars are not recorded.
if [[ -n "${virtual}" ]]; then
- java-pkg_record-jar_ "${pkg}"
- build_only="true"
+ if [[ -z "${build_only}" ]]; then
+ java-pkg_record-jar_ "${pkg}"
+ else
+ java-pkg_record-jar_ --build-only "${pkg}"
+ fi
+ record_jar="true"
fi
for jar in ${classpath//:/ }; do
@@ -1117,7 +1136,13 @@
if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then
# Only record jars that aren't build-only
- [[ -z "${build_only}" ]] && java-pkg_record-jar_ "${pkg}" "${jar}"
+ if [[ -z "${record_jar}" ]]; then
+ if [[ -z "${build_only}" ]]; then
+ java-pkg_record-jar_ "${pkg}" "${jar}"
+ else
+ java-pkg_record-jar_ --build-only "${pkg}" "${jar}"
+ fi
+ fi
echo "${jar}"
return 0
fi
@@ -2243,6 +2268,8 @@
echo "DESCRIPTION=\"${DESCRIPTION}\""
echo "GENERATION=\"2\""
echo "SLOT=\"${SLOT}\""
+ echo "CATEGORY=\"${CATEGORY}\""
+ echo "PVR=\"${PVR}\""
[[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
[[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
@@ -2252,6 +2279,8 @@
[[ -f "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]] \
&& echo "OPTIONAL_DEPEND=\"$(cat "${JAVA_PKG_OPTIONAL_DEPEND_FILE}" | uniq | tr '\n' ':')\""
echo "VM=\"$(echo ${RDEPEND} ${DEPEND} | sed -e 's/ /\n/g' | sed -n -e '/virtual\/\(jre\|jdk\)/ { p;q }')\"" # TODO cleanup !
+ [[ -f "${JAVA_PKG_BUILD_DEPEND_FILE}" ]] \
+ && echo "BUILD_DEPEND=\"$(cat "${JAVA_PKG_BUILD_DEPEND_FILE}" | uniq | tr '\n' ':')\""
) > "${JAVA_PKG_ENV}"
# register target/source
@@ -2294,20 +2323,22 @@
#
# Record an (optional) dependency to the package.env
# @param --optional - record dependency as optional
+# @param --build - record dependency as build_only
# @param $1 - package to record
# @param $2 - (optional) jar of package to record
# ------------------------------------------------------------------------------
JAVA_PKG_DEPEND_FILE="${T}/java-pkg-depend"
JAVA_PKG_OPTIONAL_DEPEND_FILE="${T}/java-pkg-optional-depend"
+JAVA_PKG_BUILD_DEPEND_FILE="${T}/java-pkg-build-depend"
java-pkg_record-jar_() {
debug-print-function ${FUNCNAME} $*
local depend_file="${JAVA_PKG_DEPEND_FILE}"
- if [[ "${1}" == "--optional" ]]; then
- depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}"
- shift
- fi
+ case "${1}" in
+ "--optional") depend_file="${JAVA_PKG_OPTIONAL_DEPEND_FILE}"; shift;;
+ "--build-only") depend_file="${JAVA_PKG_BUILD_DEPEND_FILE}"; shift;;
+ esac
local pkg=${1} jar=${2} append
if [[ -z "${jar}" ]]; then
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2009-06-02 7:02 Alistair Bush (ali_bush)
0 siblings, 0 replies; 40+ messages in thread
From: Alistair Bush (ali_bush) @ 2009-06-02 7:02 UTC (permalink / raw
To: gentoo-commits
ali_bush 09/06/02 07:02:01
Modified: java-utils-2.eclass
Log:
Remove obsolete JAVA_PKG_VNEED support.
Revision Changes Path
1.128 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.128&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.128&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.127&r2=1.128
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- java-utils-2.eclass 19 May 2009 21:23:32 -0000 1.127
+++ java-utils-2.eclass 2 Jun 2009 07:02:01 -0000 1.128
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.127 2009/05/19 21:23:32 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.128 2009/06/02 07:02:01 ali_bush Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -1310,83 +1310,6 @@
# ------------------------------------------------------------------------------
# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_need
-#
-# Adds virtual dependencies, which can optionally be controlled by a USE flag.
-# Currently supported virtuals are:
-# javamail
-# jdbc-stdext
-# jaf
-# jdbc-rowset
-# jms
-#
-# @param $1 - Optionally indicate that the dependencies are controlled by
-# a use flag by specifying '--use' Requires $2.
-# @param $2 - USE flag which will enable the dependencies.
-# @param $@ - virtual packages to add depenedencies for
-# ------------------------------------------------------------------------------
-# TODO rewrite to parse a line based declaration file instead -- karltk
-#java-pkg_need() {
-# debug-print-function ${FUNCNAME} $*
-# local useflag
-# if [[ ${1} == "--use" ]]; then
-# useflag="${2}"
-# shift 2
-# fi
-#
-# if [[ -z ${1} ]]; then
-# die "Must specify at least one virtual package."
-# fi
-#
-# local depstr newdepstr
-#
-# for virtual in ${@}; do
-# if has ${virtual} ${JAVA_PKG_VNEED}; then
-# debug-print "Already registered virtual ${virtual}"
-# continue
-# fi
-# case ${virtual} in
-# javamail)
-# debug-print "java-pkg_need: adding javamail dependencies"
-# newdepstr="|| ( dev-java/gnu-javamail dev-java/sun-javamail-bin )"
-# ;;
-# jdbc-stdext)
-# debug-print "java-pkg_need: adding jdbc-stdext dependencies"
-# newdepstr="|| ( >=virtual/jdk-1.4 dev-java/jdbc2-stdext )"
-# ;;
-# jaf)
-# debug-print "java-pkg_need: adding jaf dependencies"
-# newdepstr="|| ( dev-java/gnu-jaf dev-java/sun-jaf-bin )"
-# ;;
-# jdbc-rowset)
-# debug-print "java-pkg_need: adding jdbc-rowset dependencies"
-# newdepstr="|| ( >=virtual/jdk-1.5 dev-java/sun-jdbc-rowset )"
-# ;;
-# jms)
-# debug-print "java-pkg_need: adding jms dependencies"
-# newdepstr="|| ( dev-java/sun-jms dev-java/openjms )"
-# ;;
-# *)
-# die "Invalid virtual: ${virtual}"
-# esac
-#
-# export JAVA_PKG_VNEED="${JAVA_PKG_VNEED} ${virtual}"
-#
-# if [[ -n ${useflag} ]]; then
-# depstr="${depstr} ${useflag}? ( ${newdepstr} )"
-# else
-# depstr="${depstr} ${newdepstr}"
-# fi
-# done
-#
-# [[ -z ${JAVA_PKG_NV_DEPEND} ]] && export JAVA_PKG_NV_DEPEND="${DEPEND}"
-# [[ -z ${JAVA_PKG_NV_RDEPEND} ]] && export JAVA_PKG_NV_RDEPEND="${RDEPEND}"
-#
-# export DEPEND="${DEPEND} ${depstr}"
-# export RDEPEND="${RDEPEND} ${depstr}"
-#}
-
-# ------------------------------------------------------------------------------
# @ebuild-function java-pkg_find-normal-jars
#
# Find the files with suffix .jar file in the given directory or $WORKDIR
@@ -2541,16 +2464,11 @@
export GENTOO_VM="${JAVA_PKG_FORCE_VM}"
# if we're allowed to switch the vm...
elif [[ "${JAVA_PKG_ALLOW_VM_CHANGE}" == "yes" ]]; then
- debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}} VNEED: ${JAVA_PKG_VNEED}"
- if [[ -n ${JAVA_PKG_VNEED} ]]; then
- GENTOO_VM="$(depend-java-query --need-virtual "${JAVA_PKG_VNEED}" --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
- else
- GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
- fi
+ debug-print "depend-java-query: NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
+ GENTOO_VM="$(depend-java-query --get-vm "${JAVA_PKG_NV_DEPEND:-${DEPEND}}")"
if [[ -z "${GENTOO_VM}" || "${GENTOO_VM}" == "None" ]]; then
eerror "Unable to determine VM for building from dependencies:"
echo "NV_DEPEND: ${JAVA_PKG_NV_DEPEND:-${DEPEND}}"
- echo "VNEED: ${JAVA_PKG_VNEED}"
die "Failed to determine VM for building."
else
export GENTOO_VM
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2009-05-19 21:23 Vlastimil Babka (caster)
0 siblings, 0 replies; 40+ messages in thread
From: Vlastimil Babka (caster) @ 2009-05-19 21:23 UTC (permalink / raw
To: gentoo-commits
caster 09/05/19 21:23:33
Modified: java-utils-2.eclass
Log:
Use dosym in java_pkg-doso and fix few debug prints. Patch by Davide Pesavento <davidepesa@gmail.com> in bug #251500.
Revision Changes Path
1.127 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.127&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.127&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.126&r2=1.127
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- java-utils-2.eclass 31 Mar 2009 19:19:20 -0000 1.126
+++ java-utils-2.eclass 19 May 2009 21:23:32 -0000 1.127
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.126 2009/03/31 19:19:20 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.127 2009/05/19 21:23:32 caster Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -432,10 +432,9 @@
java-pkg_doso() {
debug-print-function ${FUNCNAME} $*
- [[ ${#} -lt 1 ]] && "At least one argument required for ${FUNCNAME}"
java-pkg_check-phase install
- [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}"
+ [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
java-pkg_init_paths_
@@ -453,10 +452,8 @@
debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
# otherwise make a symlink to the symlink's origin
else
- # TODO use dosym
- ln -s "$(readlink "${lib}")" \
- "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")"
- debug-print "${lib} is a symlink, linking accordanly"
+ dosym "$(readlink "${lib}")" "${JAVA_PKG_LIBDEST}/${lib##*/}"
+ debug-print "${lib} is a symlink, linking accordantly"
fi
# otherwise die
else
@@ -482,7 +479,7 @@
java-pkg_check-phase install
- [[ ${#} -lt 1 ]] && "at least one argument needed"
+ [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument"
java-pkg_init_paths_
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2009-03-31 19:19 Petteri Raty (betelgeuse)
0 siblings, 0 replies; 40+ messages in thread
From: Petteri Raty (betelgeuse) @ 2009-03-31 19:19 UTC (permalink / raw
To: gentoo-commits
betelgeuse 09/03/31 19:19:20
Modified: java-utils-2.eclass
Log:
Simply java-pkg_func-exists using suggestions by ciaranm and dberkholz on gentoo-dev.
Revision Changes Path
1.126 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.126&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.126&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.125&r2=1.126
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- java-utils-2.eclass 27 Mar 2009 20:58:57 -0000 1.125
+++ java-utils-2.eclass 31 Mar 2009 19:19:20 -0000 1.126
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.125 2009/03/27 20:58:57 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.126 2009/03/31 19:19:20 betelgeuse Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -367,6 +367,7 @@
eerror "has * in it. If you want it to glob in"
eerror '${D} add ${D} to the argument.'
fi
+ debug-print "${jar} or ${D}${jar} not found"
die "${jar} does not exist"
fi
done
@@ -2449,11 +2450,7 @@
# @return 1 - function is undeclared
# ------------------------------------------------------------------------------
java-pkg_func-exists() {
- if [[ -n "$(declare -f ${1})" ]]; then
- return 0
- else
- return 1
- fi
+ declare -F ${1} > /dev/null
}
# ------------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2009-03-27 20:58 Petteri Raty (betelgeuse)
0 siblings, 0 replies; 40+ messages in thread
From: Petteri Raty (betelgeuse) @ 2009-03-27 20:58 UTC (permalink / raw
To: gentoo-commits
betelgeuse 09/03/27 20:58:57
Modified: java-utils-2.eclass
Log:
run java_prepare before bundled jar check and use EBUILD_PHASE to detect when to run it
Revision Changes Path
1.125 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.125&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.125&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.124&r2=1.125
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- java-utils-2.eclass 27 Mar 2009 19:40:38 -0000 1.124
+++ java-utils-2.eclass 27 Mar 2009 20:58:57 -0000 1.125
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.124 2009/03/27 19:40:38 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.125 2009/03/27 20:58:57 betelgeuse Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -1810,6 +1810,9 @@
# ------------------------------------------------------------------------------
java-utils-2_src_prepare() {
+ [[ ${EBUILD_PHASE} == prepare ]] &&
+ java-pkg_func-exists java_prepare && java_prepare
+
# Remember that eant will call this unless called via Portage
if [[ ! -e "${T}/java-utils-2_src_prepare-run" ]] && is-java-strict; then
echo "Searching for bundled jars:"
@@ -1817,7 +1820,6 @@
echo "Searching for bundled classes (no output if none found):"
find "${WORKDIR}" -name "*.class"
echo "Search done."
- java-pkg_func-exists "java_prepare" && java_prepare
fi
touch "${T}/java-utils-2_src_prepare-run"
}
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2009-03-27 19:40 Petteri Raty (betelgeuse)
0 siblings, 0 replies; 40+ messages in thread
From: Petteri Raty (betelgeuse) @ 2009-03-27 19:40 UTC (permalink / raw
To: gentoo-commits
betelgeuse 09/03/27 19:40:38
Modified: java-utils-2.eclass
Log:
Move java_prepare call inside the check for if the function has already been run.
Revision Changes Path
1.124 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.124&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.124&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.123&r2=1.124
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- java-utils-2.eclass 27 Mar 2009 18:52:27 -0000 1.123
+++ java-utils-2.eclass 27 Mar 2009 19:40:38 -0000 1.124
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.123 2009/03/27 18:52:27 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.124 2009/03/27 19:40:38 betelgeuse Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -1817,9 +1817,9 @@
echo "Searching for bundled classes (no output if none found):"
find "${WORKDIR}" -name "*.class"
echo "Search done."
+ java-pkg_func-exists "java_prepare" && java_prepare
fi
touch "${T}/java-utils-2_src_prepare-run"
- java-pkg_func-exists "java_prepare" && java_prepare
}
# ------------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2009-03-27 18:52 Petteri Raty (betelgeuse)
0 siblings, 0 replies; 40+ messages in thread
From: Petteri Raty (betelgeuse) @ 2009-03-27 18:52 UTC (permalink / raw
To: gentoo-commits
betelgeuse 09/03/27 18:52:27
Modified: java-utils-2.eclass
Log:
Add support for java_prepare so that we don't always have to call java-pkg-2_src_prepare in src_prepare.
Revision Changes Path
1.123 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.123&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.123&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.122&r2=1.123
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- java-utils-2.eclass 19 Feb 2009 05:10:37 -0000 1.122
+++ java-utils-2.eclass 27 Mar 2009 18:52:27 -0000 1.123
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.122 2009/02/19 05:10:37 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.123 2009/03/27 18:52:27 betelgeuse Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -1819,6 +1819,7 @@
echo "Search done."
fi
touch "${T}/java-utils-2_src_prepare-run"
+ java-pkg_func-exists "java_prepare" && java_prepare
}
# ------------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2008-12-29 0:16 Vlastimil Babka (caster)
0 siblings, 0 replies; 40+ messages in thread
From: Vlastimil Babka (caster) @ 2008-12-29 0:16 UTC (permalink / raw
To: gentoo-commits
caster 08/12/29 00:16:40
Modified: java-utils-2.eclass
Log:
Add EANT_NEEDS_TOOLS variable for adding tools.jar to gentoo.classpath, bug #231673 by James Le Cuirot <chewi@aura-online.co.uk>.
Revision Changes Path
1.120 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.120&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.120&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.119&r2=1.120
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- java-utils-2.eclass 20 Dec 2008 19:25:29 -0000 1.119
+++ java-utils-2.eclass 29 Dec 2008 00:16:40 -0000 1.120
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.119 2008/12/20 19:25:29 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.120 2008/12/29 00:16:40 caster Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -1838,6 +1838,9 @@
# EANT_GENTOO_CLASSPATH - calls java-pkg_getjars for the value and adds to the
# gentoo.classpath property. Be sure to call
# java-ant_rewrite-classpath in src_unpack.
+# EANT_NEEDS_TOOLS - add tools.jar to the gentoo.classpath. Should only be used
+# for build-time purposes, the dependency is not recorded to
+# package.env!
# JAVA_PKG_NO_BUNDLED_SEARCH - Don't search for bundled jars or class files
# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
# ------------------------------------------------------------------------------
@@ -1942,6 +1945,8 @@
cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
done
+ [[ -n "${EANT_NEEDS_TOOLS}" ]] && cp="${cp}:$(java-config --tools)"
+
if [[ ${cp} ]]; then
# It seems ant does not like single quotes around ${cp}
cp=${cp#:}
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2008-12-20 19:25 Petteri Raty (betelgeuse)
0 siblings, 0 replies; 40+ messages in thread
From: Petteri Raty (betelgeuse) @ 2008-12-20 19:25 UTC (permalink / raw
To: gentoo-commits
betelgeuse 08/12/20 19:25:29
Modified: java-utils-2.eclass
Log:
Raise java-config dependency to latest version that works better with virtuals.
Revision Changes Path
1.119 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.119&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.119&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.118&r2=1.119
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- java-utils-2.eclass 9 Nov 2008 00:12:57 -0000 1.118
+++ java-utils-2.eclass 20 Dec 2008 19:25:29 -0000 1.119
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.118 2008/11/09 00:12:57 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.119 2008/12/20 19:25:29 betelgeuse Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -72,7 +72,7 @@
# the version of java-config we want to use. Usually the latest stable version
# so that ebuilds can use new features without depending on specific versions.
# -----------------------------------------------------------------------------
-JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.0.33-r1 ${JAVA_PKG_PORTAGE_DEP}"
+JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.1.6 ${JAVA_PKG_PORTAGE_DEP}"
hasq source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source? ( app-arch/zip )"
# -----------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2008-11-09 0:12 Vlastimil Babka (caster)
0 siblings, 0 replies; 40+ messages in thread
From: Vlastimil Babka (caster) @ 2008-11-09 0:12 UTC (permalink / raw
To: gentoo-commits
caster 08/11/09 00:12:57
Modified: java-utils-2.eclass
Log:
Unset ANT_RESPECT_JAVA_HOME introduced to fix bug #151884.
Revision Changes Path
1.118 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.118&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.118&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.117&r2=1.118
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- java-utils-2.eclass 11 Oct 2008 21:07:13 -0000 1.117
+++ java-utils-2.eclass 9 Nov 2008 00:12:57 -0000 1.118
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.117 2008/10/11 21:07:13 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.118 2008/11/09 00:12:57 caster Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -2115,6 +2115,7 @@
# Unset external ANT_ stuff
export ANT_TASKS=
export ANT_OPTS=
+ export ANT_RESPECT_JAVA_HOME=
}
# ------------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 40+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2008-10-10 20:11 Petteri Raty (betelgeuse)
0 siblings, 0 replies; 40+ messages in thread
From: Petteri Raty (betelgeuse) @ 2008-10-10 20:11 UTC (permalink / raw
To: gentoo-commits
betelgeuse 08/10/10 20:11:46
Modified: java-utils-2.eclass
Log:
Run java-config --help to see if the user hasn't run python-updater.
Revision Changes Path
1.116 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.116&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.116&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.115&r2=1.116
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- java-utils-2.eclass 5 Oct 2008 16:53:38 -0000 1.115
+++ java-utils-2.eclass 10 Oct 2008 20:11:46 -0000 1.116
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.115 2008/10/05 16:53:38 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.116 2008/10/10 20:11:46 betelgeuse Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -2062,6 +2062,14 @@
unset JAVAC
unset JAVA_HOME
+ java-config --help >/dev/null || {
+ eerror ""
+ eerror "Can't run java-config --help"
+ eerror "Have you upgraded python recently but haven't"
+ eerror "run python-updater yet?"
+ die "Can't run java-config --help"
+ }
+
# People do all kinds of weird things.
# http://forums.gentoo.org/viewtopic-p-3943166.html
local silence="${SILENCE_JAVA_OPTIONS_WARNING}"
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2008-07-22 21:27 Petteri Raty (betelgeuse)
0 siblings, 0 replies; 40+ messages in thread
From: Petteri Raty (betelgeuse) @ 2008-07-22 21:27 UTC (permalink / raw
To: gentoo-commits
betelgeuse 08/07/22 21:27:23
Modified: java-utils-2.eclass
Log:
Add support for EANT_GENTOO_CLASSPATH_EXTRA.
Revision Changes Path
1.112 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.112&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.112&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.111&r2=1.112
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- java-utils-2.eclass 19 Jul 2008 09:24:47 -0000 1.111
+++ java-utils-2.eclass 22 Jul 2008 21:27:23 -0000 1.112
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.111 2008/07/19 09:24:47 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.112 2008/07/22 21:27:23 betelgeuse Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -1944,7 +1944,10 @@
if [[ ${cp} ]]; then
# It seems ant does not like single quotes around ${cp}
- antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\""
+ cp=${cp#:}
+ [[ ${EANT_GENTOO_CLASSPATH_EXTRA} ]] && \
+ cp="${cp}:${EANT_GENTOO_CLASSPATH_EXTRA}"
+ antflags="${antflags} -Dgentoo.classpath=\"${cp}\""
fi
[[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2008-07-19 9:24 Torsten Veller (tove)
0 siblings, 0 replies; 40+ messages in thread
From: Torsten Veller (tove) @ 2008-07-19 9:24 UTC (permalink / raw
To: gentoo-commits
tove 08/07/19 09:24:47
Modified: java-utils-2.eclass
Log:
Add missing die
Revision Changes Path
1.111 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.111&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.111&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.110&r2=1.111
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- java-utils-2.eclass 9 Jul 2008 21:16:40 -0000 1.110
+++ java-utils-2.eclass 19 Jul 2008 09:24:47 -0000 1.111
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.110 2008/07/09 21:16:40 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.111 2008/07/19 09:24:47 tove Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -447,7 +447,7 @@
if [[ ! -L "${lib}" ]] ; then
INSDESTTREE="${JAVA_PKG_LIBDEST}" \
INSOPTIONS="${LIBOPTIONS}" \
- doins "${lib}" || "failed to install ${lib}"
+ doins "${lib}" || die "failed to install ${lib}"
java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
# otherwise make a symlink to the symlink's origin
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2008-07-09 21:16 Petteri Raty (betelgeuse)
0 siblings, 0 replies; 40+ messages in thread
From: Petteri Raty (betelgeuse) @ 2008-07-09 21:16 UTC (permalink / raw
To: gentoo-commits
betelgeuse 08/07/09 21:16:41
Modified: java-utils-2.eclass
Log:
Extend WANT_ANT_TASKS to accept full pkg atoms.
Revision Changes Path
1.110 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.110&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.110&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.109&r2=1.110
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- java-utils-2.eclass 7 Jul 2008 16:48:45 -0000 1.109
+++ java-utils-2.eclass 9 Jul 2008 21:16:40 -0000 1.110
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.109 2008/07/07 16:48:45 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.110 2008/07/09 21:16:40 betelgeuse Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -1745,11 +1745,14 @@
local DEP=""
for i in ${WANT_ANT_TASKS}
do
- if [[ ${i} != ant-* ]]; then
+ if [[ ${i} = ant-* ]]; then
+ DEP="${DEP}dev-java/${i} "
+ elif [[ ${i} = */*:* ]]; then
+ DEP="${DEP}${i} "
+ else
echo "Invalid atom in WANT_ANT_TASKS: ${i}"
return 1
fi
- DEP="${DEP}dev-java/${i} "
done
echo ${DEP}
return 0
@@ -1890,8 +1893,19 @@
fi
done
+ # parse WANT_ANT_TASKS for atoms
+ local want_ant_tasks
+ for i in ${WANT_ANT_TASKS}; do
+ if [[ ${i} = */*:* ]]; then
+ i=${i#*/}
+ i=${i%:0}
+ want_ant_tasks+="${i/:/-} "
+ else
+ want_ant_tasks+="${i} "
+ fi
+ done
# default ANT_TASKS to WANT_ANT_TASKS, if ANT_TASKS is not set explicitly
- ANT_TASKS="${ANT_TASKS:-${WANT_ANT_TASKS}}"
+ ANT_TASKS="${ANT_TASKS:-${want_ant_tasks% }}"
# override ANT_TASKS with JAVA_PKG_FORCE_ANT_TASKS if it's set
ANT_TASKS="${JAVA_PKG_FORCE_ANT_TASKS:-${ANT_TASKS}}"
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2008-05-03 21:28 Petteri Raty (betelgeuse)
0 siblings, 0 replies; 40+ messages in thread
From: Petteri Raty (betelgeuse) @ 2008-05-03 21:28 UTC (permalink / raw
To: gentoo-commits
betelgeuse 08/05/03 21:28:07
Modified: java-utils-2.eclass
Log:
Fix ejunit to work when the package has no dependencies and getjars to work with VM provided virtuals.
Revision Changes Path
1.106 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.106&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.106&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.105&r2=1.106
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- java-utils-2.eclass 26 Mar 2008 23:00:23 -0000 1.105
+++ java-utils-2.eclass 3 May 2008 21:28:07 -0000 1.106
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.105 2008/03/26 23:00:23 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.106 2008/05/03 21:28:07 betelgeuse Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -614,6 +614,7 @@
dosym ${dest}/api "${JAVA_PKG_SHAREPATH}/api" || die
if [[ ${symlink} ]]; then
+ debug-print "symlinking ${dest}/{api,${symlink}}"
dosym ${dest}/{api,${symlink}} || die
fi
}
@@ -1022,26 +1023,20 @@
[[ ${#} -ne 1 ]] && die "${FUNCNAME} takes only one argument besides --*"
- local classpath pkgs="${1}"
+ local pkgs="${1}"
if [[ "${EAPI}" == "1" ]]; then
pkgs="${pkgs//:/-}"
fi
jars="$(java-config ${deep} --classpath=${pkgs})"
- [[ $? != 0 || -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed"
+ [[ $? != 0 ]] && die "java-config --classpath=${pkgs} failed"
debug-print "${pkgs}:${jars}"
for pkg in ${pkgs//,/ }; do
java-pkg_ensure-dep "${build_only}" "${pkg}"
done
- if [[ -z "${classpath}" ]]; then
- classpath="${jars}"
- else
- classpath="${classpath}:${jars}"
- fi
-
# Only record jars that aren't build-only
if [[ -z "${build_only}" ]]; then
for pkg in ${pkgs//,/ }; do
@@ -1049,7 +1044,7 @@
done
fi
- echo "${classpath}"
+ echo "${jars}"
}
# ------------------------------------------------------------------------------
@@ -1777,13 +1772,15 @@
# @param $2 - classpath; junit and recorded dependencies get appended
# @param $@ - the rest of the parameters are passed to java
# ------------------------------------------------------------------------------
-ejunit() {
+ejunit{
debug-print-function ${FUNCNAME} $*
local pkgs
- for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do
- pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//")
- done
+ if [[ -f ${JAVA_PKG_DEPEND_FILE} ]]; then
+ for atom in $(cat ${JAVA_PKG_DEPEND_FILE} | tr : ' '); do
+ pkgs=${pkgs},$(echo ${atom} | sed -re "s/^.*@//")
+ done
+ fi
local cp=$(java-pkg_getjars --with-dependencies junit${pkgs})
if [[ ${1} = -cp || ${1} = -classpath ]]; then
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2008-03-26 23:00 Alistair Bush (ali_bush)
0 siblings, 0 replies; 40+ messages in thread
From: Alistair Bush (ali_bush) @ 2008-03-26 23:00 UTC (permalink / raw
To: gentoo-commits
ali_bush 08/03/26 23:00:24
Modified: java-utils-2.eclass
Log:
Adding EAPI=1 suppport to java functions.
Revision Changes Path
1.105 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.105&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.105&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.104&r2=1.105
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- java-utils-2.eclass 3 Mar 2008 17:55:21 -0000 1.104
+++ java-utils-2.eclass 26 Mar 2008 23:00:23 -0000 1.105
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.104 2008/03/03 17:55:21 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.105 2008/03/26 23:00:23 ali_bush Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -898,6 +898,10 @@
[[ -z ${target_pkg} ]] && die "Must specify a package"
+ if [[ "${EAPI}" == "1" ]]; then
+ target_pkg="${target_pkg//:/-}"
+ fi
+
# default destjar to the target jar
[[ -z "${destjar}" ]] && destjar="${target_jar}"
@@ -1019,6 +1023,11 @@
local classpath pkgs="${1}"
+
+ if [[ "${EAPI}" == "1" ]]; then
+ pkgs="${pkgs//:/-}"
+ fi
+
jars="$(java-config ${deep} --classpath=${pkgs})"
[[ $? != 0 || -z "${jars}" ]] && die "java-config --classpath=${pkgs} failed"
debug-print "${pkgs}:${jars}"
@@ -1086,6 +1095,11 @@
[[ ${#} -ne 2 ]] && die "${FUNCNAME} takes only two arguments besides --*"
local pkg="${1}" target_jar="${2}" jar
+
+ if [[ "${EAPI}" == "1" ]]; then
+ pkg="${pkg//:/-}"
+ fi
+
[[ -z ${pkg} ]] && die "Must specify package to get a jar from"
[[ -z ${target_jar} ]] && die "Must specify jar to get"
@@ -1157,6 +1171,10 @@
[[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
+ if [[ "${EAPI}" == "1" ]]; then
+ pkgs="${pkgs//:/-}"
+ fi
+
if [[ -z "${jar}" ]]; then
for pkg in ${pkgs//,/ }; do
java-pkg_ensure-dep runtime "${pkg}"
@@ -1208,6 +1226,10 @@
[[ -z "${pkgs}" ]] && die "${FUNCNAME} called with no package(s) specified"
+ if [[ "${EAPI}" == "1" ]]; then
+ pkgs="${pkgs//:/-}"
+ fi
+
if [[ -z "${jar}" ]]; then
for pkg in ${pkgs//,/ }; do
java-pkg_record-jar_ --optional "${pkg}"
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2008-03-03 17:55 Petteri Raty (betelgeuse)
0 siblings, 0 replies; 40+ messages in thread
From: Petteri Raty (betelgeuse) @ 2008-03-03 17:55 UTC (permalink / raw
To: gentoo-commits
betelgeuse 08/03/03 17:55:21
Modified: java-utils-2.eclass
Log:
Add the ability to get GENTOO_COMPILER from the JDK config. This enables things like jamvm to use ecj. Record SLOT in package.env.
Revision Changes Path
1.104 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.104&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.104&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.103&r2=1.104
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- java-utils-2.eclass 12 Jan 2008 15:08:47 -0000 1.103
+++ java-utils-2.eclass 3 Mar 2008 17:55:21 -0000 1.104
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.103 2008/01/12 15:08:47 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.104 2008/03/03 17:55:21 betelgeuse Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -293,7 +293,6 @@
java-pkg_do_write_
}
-
# ------------------------------------------------------------------------------
# @internal-function depend-java-query
#
@@ -649,13 +648,7 @@
if ! [[ ${DEPEND} = *app-arch/zip* ]]; then
local msg="${FUNCNAME} called without app-arch/zip in DEPEND"
- if is-java-strict; then
- eerror "${msg}"
- die "${msg}"
- else
- echo "${msg}"
- echo "Please report this to http://bugs.gentoo.org."
- fi
+ java-pkg_announce-qa-violation ${msg}
fi
java-pkg_init_paths_
@@ -2178,12 +2171,16 @@
# If it hasn't been defined already, default to javac
if [[ -z ${GENTOO_COMPILER} ]]; then
if [[ -n ${compilers} ]]; then
- einfo "No suitable compiler found: defaulting javac for compilation"
+ einfo "No suitable compiler found: defaulting to JDK default for compilation"
else
# probably don't need to notify users about the default.
:;#einfo "Defaulting to javac for compilation"
fi
- export GENTOO_COMPILER=javac
+ if java-config -g GENTOO_COMPILER 2> /dev/null; then
+ export GENTOO_COMPILER=$(java-config -g GENTOO_COMPILER)
+ else
+ export GENTOO_COMPILER=javac
+ fi
else
einfo "Using ${GENTOO_COMPILER} for compilation"
fi
@@ -2244,6 +2241,7 @@
(
echo "DESCRIPTION=\"${DESCRIPTION}\""
echo "GENERATION=\"2\""
+ echo "SLOT=\"${SLOT}\""
[[ -n "${JAVA_PKG_CLASSPATH}" ]] && echo "CLASSPATH=\"${JAVA_PKG_CLASSPATH}\""
[[ -n "${JAVA_PKG_LIBRARY}" ]] && echo "LIBRARY_PATH=\"${JAVA_PKG_LIBRARY}\""
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2008-01-12 15:04 Vlastimil Babka (caster)
0 siblings, 0 replies; 40+ messages in thread
From: Vlastimil Babka (caster) @ 2008-01-12 15:04 UTC (permalink / raw
To: gentoo-commits
caster 08/01/12 15:04:27
Modified: java-utils-2.eclass
Log:
Fix function name in die message in java-pkg_getjar().
Revision Changes Path
1.102 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.102&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.102&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.101&r2=1.102
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- java-utils-2.eclass 12 Jan 2008 15:03:13 -0000 1.101
+++ java-utils-2.eclass 12 Jan 2008 15:04:26 -0000 1.102
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.101 2008/01/12 15:03:13 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.102 2008/01/12 15:04:26 caster Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -1085,7 +1085,7 @@
elif [[ "${1}" == "--virtual" ]]; then
virtual="true"
else
- die "java-pkg_jar-from called with unknown parameter: ${1}"
+ die "java-pkg_getjar called with unknown parameter: ${1}"
fi
shift
done
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2008-01-12 15:03 Vlastimil Babka (caster)
0 siblings, 0 replies; 40+ messages in thread
From: Vlastimil Babka (caster) @ 2008-01-12 15:03 UTC (permalink / raw
To: gentoo-commits
caster 08/01/12 15:03:13
Modified: java-utils-2.eclass
Log:
Fix --virtual parameter handling in java-pkg_getjar.
Revision Changes Path
1.101 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.101&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.101&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.100&r2=1.101
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- java-utils-2.eclass 28 Nov 2007 02:03:48 -0000 1.100
+++ java-utils-2.eclass 12 Jan 2008 15:03:13 -0000 1.101
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.100 2007/11/28 02:03:48 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.101 2008/01/12 15:03:13 caster Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -1082,7 +1082,7 @@
while [[ "${1}" == --* ]]; do
if [[ "${1}" = "--build-only" ]]; then
build_only="build"
- elif [[ "${1}" == --* ]]; then
+ elif [[ "${1}" == "--virtual" ]]; then
virtual="true"
else
die "java-pkg_jar-from called with unknown parameter: ${1}"
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2007-11-28 2:03 Petteri Raty (betelgeuse)
0 siblings, 0 replies; 40+ messages in thread
From: Petteri Raty (betelgeuse) @ 2007-11-28 2:03 UTC (permalink / raw
To: gentoo-commits
betelgeuse 07/11/28 02:03:49
Modified: java-utils-2.eclass
Log:
A typo in my last commit.
Revision Changes Path
1.100 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.100&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.100&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.99&r2=1.100
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- java-utils-2.eclass 28 Nov 2007 01:54:13 -0000 1.99
+++ java-utils-2.eclass 28 Nov 2007 02:03:48 -0000 1.100
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.99 2007/11/28 01:54:13 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.100 2007/11/28 02:03:48 betelgeuse Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -612,7 +612,7 @@
java-pkg_dohtml -r "${dir_to_install}"
# Let's make a symlink to the directory we have everything else under
- dosym ${dest} "${JAVA_PKG_SHAREPATH}/api" || die
+ dosym ${dest}/api "${JAVA_PKG_SHAREPATH}/api" || die
if [[ ${symlink} ]]; then
dosym ${dest}/{api,${symlink}} || die
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2007-11-28 1:54 Petteri Raty (betelgeuse)
0 siblings, 0 replies; 40+ messages in thread
From: Petteri Raty (betelgeuse) @ 2007-11-28 1:54 UTC (permalink / raw
To: gentoo-commits
betelgeuse 07/11/28 01:54:14
Modified: java-utils-2.eclass
Log:
Improvements to dojavadoc.
Revision Changes Path
1.99 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.99&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.99&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.98&r2=1.99
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- java-utils-2.eclass 26 Nov 2007 21:00:59 -0000 1.98
+++ java-utils-2.eclass 28 Nov 2007 01:54:13 -0000 1.99
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.98 2007/11/26 21:00:59 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.99 2007/11/28 01:54:13 betelgeuse Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -559,15 +559,27 @@
#
# Installs javadoc documentation. This should be controlled by the doc use flag.
#
-# @param $1: - The javadoc root directory.
+# @param $1: optional --symlink creates to symlink like this for html
+# documentation bundles.
+# @param $2: - The javadoc root directory.
#
# @example:
# java-pkg_dojavadoc docs/api
+# java-pkg_dojavadoc --symlink apidocs docs/api
#
# ------------------------------------------------------------------------------
java-pkg_dojavadoc() {
debug-print-function ${FUNCNAME} $*
+
+ # For html documentation bundles that link to Javadoc
+ local symlink
+ if [[ ${1} = --symlink ]]; then
+ symlink=${2}
+ shift 2
+ fi
+
local dir="$1"
+ local dest=/usr/share/doc/${PF}/html
# QA checks
@@ -581,6 +593,11 @@
is-java-strict && die "${msg}"
fi
+ if [[ -e ${D}/${dest}/api ]]; then
+ eerror "${dest} already exists. Will not overwrite."
+ die "${dest}"
+ fi
+
# Renaming to match our directory layout
local dir_to_install="${dir}"
@@ -592,7 +609,14 @@
# Actual installation
- java-pkg_dohtml -r ${dir_to_install}
+ java-pkg_dohtml -r "${dir_to_install}"
+
+ # Let's make a symlink to the directory we have everything else under
+ dosym ${dest} "${JAVA_PKG_SHAREPATH}/api" || die
+
+ if [[ ${symlink} ]]; then
+ dosym ${dest}/{api,${symlink}} || die
+ fi
}
# ------------------------------------------------------------------------------
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2007-11-26 21:00 Petteri Raty (betelgeuse)
0 siblings, 0 replies; 40+ messages in thread
From: Petteri Raty (betelgeuse) @ 2007-11-26 21:00 UTC (permalink / raw
To: gentoo-commits
betelgeuse 07/11/26 21:00:59
Modified: java-utils-2.eclass
Log:
Can't use export with JAVA_OPTIONS so just put back the unset. The warning given to users should be enough even if the unset does not currently work.
Revision Changes Path
1.98 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.98&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.98&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.97&r2=1.98
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- java-utils-2.eclass 26 Nov 2007 20:38:26 -0000 1.97
+++ java-utils-2.eclass 26 Nov 2007 21:00:59 -0000 1.98
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.97 2007/11/26 20:38:26 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.98 2007/11/26 21:00:59 betelgeuse Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -2067,7 +2067,9 @@
fi
if [[ -z ${accept} ]]; then
- export _JAVA_OPTIONS=
+ # export _JAVA_OPTIONS= doesn't work because it will show up in java
+ # -version output
+ unset _JAVA_OPTIONS
# phase hooks make this run many times without this
I_WANT_GLOBAL_JAVA_OPTIONS="true"
fi
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2007-11-26 20:38 Petteri Raty (betelgeuse)
0 siblings, 0 replies; 40+ messages in thread
From: Petteri Raty (betelgeuse) @ 2007-11-26 20:38 UTC (permalink / raw
To: gentoo-commits
betelgeuse 07/11/26 20:38:27
Modified: java-utils-2.eclass
Log:
Use export VAR= instead of unset because Portage does not preserve unsetting across functions.
Revision Changes Path
1.97 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.97&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.97&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.96&r2=1.97
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- java-utils-2.eclass 25 Nov 2007 07:51:41 -0000 1.96
+++ java-utils-2.eclass 26 Nov 2007 20:38:26 -0000 1.97
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.96 2007/11/25 07:51:41 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.97 2007/11/26 20:38:26 betelgeuse Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -2049,6 +2049,7 @@
#
# -----------------------------------------------------------------------------
java-pkg_init() {
+ debug-print-function ${FUNCNAME} $*
unset JAVAC
unset JAVA_HOME
@@ -2066,7 +2067,7 @@
fi
if [[ -z ${accept} ]]; then
- unset _JAVA_OPTIONS
+ export _JAVA_OPTIONS=
# phase hooks make this run many times without this
I_WANT_GLOBAL_JAVA_OPTIONS="true"
fi
@@ -2084,15 +2085,18 @@
# Do some QA checks
java-pkg_check-jikes
+ # Can't use unset here because Portage does not save the unset
+ # see https://bugs.gentoo.org/show_bug.cgi?id=189417#c11
+
# When users have crazy classpaths some packages can fail to compile.
# and everything should work with empty CLASSPATH.
# This also helps prevent unexpected dependencies on random things
# from the CLASSPATH.
- unset CLASSPATH
+ export CLASSPATH=
# Unset external ANT_ stuff
- unset ANT_TASKS
- unset ANT_OPTS
+ export ANT_TASKS=
+ export ANT_OPTS=
}
# ------------------------------------------------------------------------------
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2007-11-25 7:51 Vlastimil Babka (caster)
0 siblings, 0 replies; 40+ messages in thread
From: Vlastimil Babka (caster) @ 2007-11-25 7:51 UTC (permalink / raw
To: gentoo-commits
caster 07/11/25 07:51:41
Modified: java-utils-2.eclass
Log:
Make -Dbuild.sysclasspath=ignore mandatory in eant(). Bug #142538.
Revision Changes Path
1.96 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.96&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.96&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.95&r2=1.96
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- java-utils-2.eclass 13 Nov 2007 19:36:50 -0000 1.95
+++ java-utils-2.eclass 25 Nov 2007 07:51:41 -0000 1.96
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.95 2007/11/13 19:36:50 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.96 2007/11/25 07:51:41 caster Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -1850,7 +1850,7 @@
java-pkg_announce-qa-violation "${msg}"
fi
- local antflags="-Dnoget=true -Dmaven.mode.offline=true"
+ local antflags="-Dnoget=true -Dmaven.mode.offline=true -Dbuild.sysclasspath=ignore"
java-pkg_init-compiler_
local compiler="${GENTOO_COMPILER}"
@@ -1873,11 +1873,6 @@
fi
fi
- if is-java-strict; then
- einfo "Disabling system classpath for ant"
- antflags="${antflags} -Dbuild.sysclasspath=ignore"
- fi
-
for arg in "${@}"; do
if [[ ${arg} = -lib ]]; then
if is-java-strict; then
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 40+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass
@ 2007-09-27 19:47 Petteri Raty (betelgeuse)
0 siblings, 0 replies; 40+ messages in thread
From: Petteri Raty (betelgeuse) @ 2007-09-27 19:47 UTC (permalink / raw
To: gentoo-commits
betelgeuse 07/09/27 19:47:08
Modified: java-utils-2.eclass
Log:
Add --subdir option to java-pkg_doexamples.
Revision Changes Path
1.93 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.93&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?rev=1.93&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-2.eclass?r1=1.92&r2=1.93
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- java-utils-2.eclass 5 Aug 2007 08:17:05 -0000 1.92
+++ java-utils-2.eclass 27 Sep 2007 19:47:08 -0000 1.93
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.92 2007/08/05 08:17:05 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.93 2007/09/27 19:47:08 betelgeuse Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -197,6 +197,7 @@
# java-pkg_doexamples demo
# java-pkg_doexamples demo/* examples/*
#
+# @param --subdir - If the examples need a certain directory structure
# @param $* - list of files to install
# ------------------------------------------------------------------------------
java-pkg_doexamples() {
@@ -207,6 +208,12 @@
java-pkg_check-phase install
local dest=/usr/share/doc/${PF}/examples
+ if [[ ${1} == --subdir ]]; then
+ local dest=${dest}/${2}
+ dodir ${dest}
+ shift 2
+ fi
+
if [[ ${#} = 1 && -d ${1} ]]; then
( # dont want to pollute calling env
insinto "${dest}"
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 40+ messages in thread
end of thread, other threads:[~2011-10-29 14:05 UTC | newest]
Thread overview: 40+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-03 21:28 [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass Petteri Raty (betelgeuse)
-- strict thread matches above, loose matches on Subject: below --
2011-10-29 14:05 Vlastimil Babka (caster)
2011-10-29 13:17 Vlastimil Babka (caster)
2011-10-02 8:10 Serkan Kaba (serkan)
2011-10-02 7:38 Serkan Kaba (serkan)
2011-09-10 14:32 Serkan Kaba (serkan)
2011-04-07 18:05 Serkan Kaba (serkan)
2011-03-26 0:43 Serkan Kaba (serkan)
2011-03-23 19:32 Serkan Kaba (serkan)
2011-03-15 19:54 Serkan Kaba (serkan)
2011-03-15 19:53 Serkan Kaba (serkan)
2010-04-28 19:40 Vlastimil Babka (caster)
2010-04-01 22:29 Vlastimil Babka (caster)
2010-03-24 12:11 Petteri Raty (betelgeuse)
2010-01-17 12:53 Petteri Raty (betelgeuse)
2009-06-07 8:22 Alistair Bush (ali_bush)
2009-06-02 7:02 Alistair Bush (ali_bush)
2009-05-19 21:23 Vlastimil Babka (caster)
2009-03-31 19:19 Petteri Raty (betelgeuse)
2009-03-27 20:58 Petteri Raty (betelgeuse)
2009-03-27 19:40 Petteri Raty (betelgeuse)
2009-03-27 18:52 Petteri Raty (betelgeuse)
2008-12-29 0:16 Vlastimil Babka (caster)
2008-12-20 19:25 Petteri Raty (betelgeuse)
2008-11-09 0:12 Vlastimil Babka (caster)
2008-10-10 20:11 Petteri Raty (betelgeuse)
2008-07-22 21:27 Petteri Raty (betelgeuse)
2008-07-19 9:24 Torsten Veller (tove)
2008-07-09 21:16 Petteri Raty (betelgeuse)
2008-05-03 21:28 Petteri Raty (betelgeuse)
2008-03-26 23:00 Alistair Bush (ali_bush)
2008-03-03 17:55 Petteri Raty (betelgeuse)
2008-01-12 15:04 Vlastimil Babka (caster)
2008-01-12 15:03 Vlastimil Babka (caster)
2007-11-28 2:03 Petteri Raty (betelgeuse)
2007-11-28 1:54 Petteri Raty (betelgeuse)
2007-11-26 21:00 Petteri Raty (betelgeuse)
2007-11-26 20:38 Petteri Raty (betelgeuse)
2007-11-25 7:51 Vlastimil Babka (caster)
2007-09-27 19:47 Petteri Raty (betelgeuse)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox