* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
@ 2011-12-13 14:42 Ralph Sennhauser (sera)
0 siblings, 0 replies; 18+ messages in thread
From: Ralph Sennhauser (sera) @ 2011-12-13 14:42 UTC (permalink / raw
To: gentoo-commits
sera 11/12/13 14:42:40
Modified: ChangeLog java-utils-2.eclass
Log:
No longer require JDK for installing java binpkg. #206024
Revision Changes Path
1.39 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.38&r2=1.39
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ChangeLog 10 Dec 2011 17:28:16 -0000 1.38
+++ ChangeLog 13 Dec 2011 14:42:39 -0000 1.39
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.38 2011/12/10 17:28:16 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.39 2011/12/13 14:42:39 sera Exp $
+
+ 13 Dec 2011; Ralph Sennhauser <sera@gentoo.org> java-utils-2.eclass:
+ No longer require JDK for installing java binpkg. #206024
10 Dec 2011; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
Handle sparc64-* in arch configuration.
1.148 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.148&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.148&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.147&r2=1.148
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- java-utils-2.eclass 29 Oct 2011 14:05:48 -0000 1.147
+++ java-utils-2.eclass 13 Dec 2011 14:42:39 -0000 1.148
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.147 2011/10/29 14:05:48 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.148 2011/12/13 14:42:39 sera Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -2137,6 +2137,13 @@
# -----------------------------------------------------------------------------
java-pkg_init() {
debug-print-function ${FUNCNAME} $*
+
+ # Don't set up build environment if installing from binary. #206024 #258423
+ [[ "${MERGE_TYPE}" == "binary" ]] && return
+ # Also try Portage's nonstandard EMERGE_FROM for old EAPIs, if it doesn't
+ # work nothing is lost.
+ has ${EAPI:-0} 0 1 2 3 && [[ "${EMERGE_FROM}" == "binary" ]] && return
+
unset JAVAC
unset JAVA_HOME
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
@ 2012-03-13 10:05 Ralph Sennhauser (sera)
0 siblings, 0 replies; 18+ messages in thread
From: Ralph Sennhauser (sera) @ 2012-03-13 10:05 UTC (permalink / raw
To: gentoo-commits
sera 12/03/13 10:05:46
Modified: ChangeLog java-utils-2.eclass
Log:
Add JAVA_PKG_WANT_BUILD_VM to allow limiting build VM by VM handle. The main
aim is to allow respecting the system VM, if possible, for a subset of VMs
provided by the jdk virtuals.
Thanks to Vlastimil Babka <caster@gentoo.org> for contributing the variable
name and review.
Revision Changes Path
1.166 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.166&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.166&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.165&r2=1.166
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- ChangeLog 10 Mar 2012 21:21:30 -0000 1.165
+++ ChangeLog 13 Mar 2012 10:05:46 -0000 1.166
@@ -1,6 +1,13 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.165 2012/03/10 21:21:30 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.166 2012/03/13 10:05:46 sera Exp $
+
+ 13 Mar 2012; Ralph Sennhauser <sera@gentoo.org> java-utils-2.eclass:
+ Add JAVA_PKG_WANT_BUILD_VM to allow limiting build VM by VM handle. The main
+ aim is to allow respecting the system VM, if possible, for a subset of VMs
+ provided by the jdk virtuals.
+ Thanks to Vlastimil Babka <caster@gentoo.org> for contributing the variable
+ name and review.
10 Mar 2012; Ryan Hill <dirtyepic@gentoo.org> toolchain.eclass:
Rev. 1.527 fixed 4.7 without me noticing. Add comments about the format of
1.150 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.150&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.150&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.149&r2=1.150
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- java-utils-2.eclass 27 Dec 2011 17:55:12 -0000 1.149
+++ java-utils-2.eclass 13 Mar 2012 10:05:46 -0000 1.150
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.149 2011/12/27 17:55:12 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.150 2012/03/13 10:05:46 sera Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -116,6 +116,19 @@
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
+# @variable-external JAVA_PKG_WANT_BUILD_VM
+#
+# A list of VM handles to choose a build VM from. If the list contains the
+# currently active VM use that one, otherwise step through the list till a
+# usable/installed VM is found.
+#
+# This allows to use an explicit list of JDKs in DEPEND instead of a virtual.
+# Users of this variable must make sure at least one of the listed handles is
+# covered by DEPEND.
+# Requires JAVA_PKG_WANT_SOURCE and JAVA_PKG_WANT_TARGET to be set as well.
+# -----------------------------------------------------------------------------
+
+# -----------------------------------------------------------------------------
# @variable-external JAVA_PKG_WANT_SOURCE
#
# Specify a specific VM version to compile for to use for -source.
@@ -2539,7 +2552,8 @@
# ------------------------------------------------------------------------------
# @internal-function java-pkg_needs-vm
#
-# Does the current package depend on virtual/jdk?
+# Does the current package depend on virtual/jdk or does it set
+# JAVA_PKG_WANT_BUILD_VM?
#
# @return 0 - Package depends on virtual/jdk
# @return 1 - Package does not depend on virtual/jdk
@@ -2551,6 +2565,8 @@
return 0
fi
+ [[ -n "${JAVA_PKG_WANT_BUILD_VM}" ]] && return 0
+
return 1
}
@@ -2588,6 +2604,41 @@
}
# ------------------------------------------------------------------------------
+# @internal-function java-pkg_build-vm-from-handle
+#
+# Selects a build vm from a list of vm handles. First checks for the system-vm
+# beeing usable, then steps through the listed handles till a suitable vm is
+# found.
+#
+# @return - VM handle of an available JDK
+# ------------------------------------------------------------------------------
+java-pkg_build-vm-from-handle() {
+ debug-print-function ${FUNCNAME} "$*"
+
+ local vm
+ vm=$(java-pkg_get-current-vm)
+ if [[ $? != 0 ]]; then
+ eerror "${FUNCNAME}: Failed to get active vm"
+ return 1
+ fi
+
+ if has ${vm} ${JAVA_PKG_WANT_BUILD_VM}; then
+ echo ${vm}
+ return 0
+ fi
+
+ for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
+ if java-config-2 --select-vm=${vm} 2>/dev/null; then
+ echo ${vm}
+ return 0
+ fi
+ done
+
+ eerror "${FUNCNAME}: No vm found for handles: ${JAVA_PKG_WANT_BUILD_VM}"
+ return 1
+}
+
+# ------------------------------------------------------------------------------
# @internal-function java-pkg_switch-vm
#
# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and
@@ -2605,15 +2656,35 @@
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}}"
- 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}}"
- die "Failed to determine VM for building."
+ # if there is an explicit list of handles to choose from
+ if [[ -n "${JAVA_PKG_WANT_BUILD_VM}" ]]; then
+ debug-print "JAVA_PKG_WANT_BUILD_VM used: ${JAVA_PKG_WANT_BUILD_VM}"
+ GENTOO_VM=$(java-pkg_build-vm-from-handle)
+ if [[ $? != 0 ]]; then
+ eerror "${FUNCNAME}: No VM found for handles: ${JAVA_PKG_WANT_BUILD_VM}"
+ die "${FUNCNAME}: Failed to determine VM for building"
+ fi
+ # JAVA_PKG_WANT_SOURCE and JAVA_PKG_WANT_TARGET are required as
+ # they can't be deduced from handles.
+ if [[ -z "${JAVA_PKG_WANT_SOURCE}" ]]; then
+ eerror "JAVA_PKG_WANT_BUILD_VM specified but not JAVA_PKG_WANT_SOURCE"
+ die "Specify JAVA_PKG_WANT_SOURCE"
+ fi
+ if [[ -z "${JAVA_PKG_WANT_TARGET}" ]]; then
+ eerror "JAVA_PKG_WANT_BUILD_VM specified but not JAVA_PKG_WANT_TARGET"
+ die "Specify JAVA_PKG_WANT_TARGET"
+ fi
+ # otherwise determine a vm from dep string
else
- export GENTOO_VM
+ 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}}"
+ die "Failed to determine VM for building."
+ fi
fi
+ export GENTOO_VM
# otherwise just make sure the current VM is sufficient
else
java-pkg_ensure-vm-version-sufficient
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
@ 2012-07-05 20:07 Ralph Sennhauser (sera)
0 siblings, 0 replies; 18+ messages in thread
From: Ralph Sennhauser (sera) @ 2012-07-05 20:07 UTC (permalink / raw
To: gentoo-commits
sera 12/07/05 20:07:47
Modified: ChangeLog java-utils-2.eclass
Log:
Remove java-pkg_ensure-gcj and java-pkg_ensure-test. #261562 #278965
Revision Changes Path
1.335 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.335&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.335&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.334&r2=1.335
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -r1.334 -r1.335
--- ChangeLog 3 Jul 2012 09:10:00 -0000 1.334
+++ ChangeLog 5 Jul 2012 20:07:47 -0000 1.335
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.334 2012/07/03 09:10:00 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.335 2012/07/05 20:07:47 sera Exp $
+
+ 05 Jul 2012; Ralph Sennhauser <sera@gentoo.org> java-utils-2.eclass:
+ Remove java-pkg_ensure-gcj and java-pkg_ensure-test. #261562 #278965
01 Jul 2012; Matti Bickel <mabi@gentoo.org> php-pear-lib-r1.eclass:
Remove requirement for depend.php.eclass. Since our switch to /usr/share/php
1.151 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.151&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.151&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.150&r2=1.151
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- java-utils-2.eclass 13 Mar 2012 10:05:46 -0000 1.150
+++ java-utils-2.eclass 5 Jul 2012 20:07:47 -0000 1.151
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.150 2012/03/13 10:05:46 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.151 2012/07/05 20:07:47 sera Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -1686,23 +1686,13 @@
}
java-pkg_ensure-gcj() {
- if ! built_with_use sys-devel/gcc gcj ; then
- ewarn
- ewarn "You must build gcc with the gcj support to build with gcj"
- ewarn
- ebeep 5
- die "No GCJ support found!"
- fi
+ # was enforcing sys-devel/gcc[gcj]
+ die "${FUNCNAME} was removed. Use use-deps available as of EAPI 2 instead. #261562"
}
java-pkg_ensure-test() {
- if has test ${FEATURES} && ! has -test ${FEATURES} \
- && has test ${IUSE} && ! use test;
- then
- eerror "You specified FEATURES=test, but USE=test is needed"
- eerror "to pull in the additional dependencies for testing"
- die "Need USE=test enabled"
- fi
+ # was enforcing USE=test if FEATURES=test
+ die "${FUNCNAME} was removed. Package mangers handle this already. #278965"
}
# ------------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
@ 2013-01-16 19:06 Ralph Sennhauser (sera)
0 siblings, 0 replies; 18+ messages in thread
From: Ralph Sennhauser (sera) @ 2013-01-16 19:06 UTC (permalink / raw
To: gentoo-commits
sera 13/01/16 19:06:15
Modified: ChangeLog java-utils-2.eclass
Log:
Be graceful if no system vm is set if trying to determine build vm from handle.
Revision Changes Path
1.622 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.622&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.622&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.621&r2=1.622
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.621
retrieving revision 1.622
diff -u -r1.621 -r1.622
--- ChangeLog 16 Jan 2013 19:02:10 -0000 1.621
+++ ChangeLog 16 Jan 2013 19:06:15 -0000 1.622
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.621 2013/01/16 19:02:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.622 2013/01/16 19:06:15 sera Exp $
+
+ 16 Jan 2013; Ralph Sennhauser <sera@gentoo.org> java-utils-2.eclass:
+ Be graceful if no system vm is set if trying to determine build vm from
+ handle.
16 Jan 2013; Michał Górny <mgorny@gentoo.org> mozcoreconf-2.eclass:
Migrate Mozilla packages to python-any-r1 for build-time Python dep.
1.152 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.152&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.152&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.151&r2=1.152
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- java-utils-2.eclass 5 Jul 2012 20:07:47 -0000 1.151
+++ java-utils-2.eclass 16 Jan 2013 19:06:15 -0000 1.152
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.151 2012/07/05 20:07:47 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.152 2013/01/16 19:06:15 sera Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -2606,15 +2606,12 @@
debug-print-function ${FUNCNAME} "$*"
local vm
- vm=$(java-pkg_get-current-vm)
- if [[ $? != 0 ]]; then
- eerror "${FUNCNAME}: Failed to get active vm"
- return 1
- fi
-
- if has ${vm} ${JAVA_PKG_WANT_BUILD_VM}; then
- echo ${vm}
- return 0
+ vm=$(java-pkg_get-current-vm 2>/dev/null)
+ if [[ $? -eq 0 ]]; then
+ if has ${vm} ${JAVA_PKG_WANT_BUILD_VM}; then
+ echo ${vm}
+ return 0
+ fi
fi
for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
@ 2013-04-17 18:01 Ralph Sennhauser (sera)
0 siblings, 0 replies; 18+ messages in thread
From: Ralph Sennhauser (sera) @ 2013-04-17 18:01 UTC (permalink / raw
To: gentoo-commits
sera 13/04/17 18:01:49
Modified: ChangeLog java-utils-2.eclass
Log:
Request package specific emerge --info in death hook.
Revision Changes Path
1.792 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.792&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.792&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.791&r2=1.792
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.791
retrieving revision 1.792
diff -u -r1.791 -r1.792
--- ChangeLog 17 Apr 2013 13:52:17 -0000 1.791
+++ ChangeLog 17 Apr 2013 18:01:48 -0000 1.792
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.791 2013/04/17 13:52:17 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.792 2013/04/17 18:01:48 sera Exp $
+
+ 17 Apr 2013; Ralph Sennhauser <sera@gentoo.org> java-utils-2.eclass:
+ Request package specific emerge --info in death hook.
17 Apr 2013; Tom Wijsman <TomWij@gentoo.org> kernel-2.eclass:
Added a warning after the variables that modifying other variables in
1.153 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.153&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.153&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.152&r2=1.153
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- java-utils-2.eclass 16 Jan 2013 19:06:15 -0000 1.152
+++ java-utils-2.eclass 17 Apr 2013 18:01:48 -0000 1.153
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.152 2013/01/16 19:06:15 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.153 2013/04/17 18:01:48 sera Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -2724,7 +2724,7 @@
echo "!!! When you file a bug report, please include the following information:" >&2
echo "GENTOO_VM=${GENTOO_VM} CLASSPATH=\"${CLASSPATH}\" JAVA_HOME=\"${JAVA_HOME}\"" >&2
echo "JAVACFLAGS=\"${JAVACFLAGS}\" COMPILER=\"${GENTOO_COMPILER}\"" >&2
- echo "and of course, the output of emerge --info" >&2
+ echo "and of course, the output of emerge --info =${P}" >&2
}
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
@ 2013-08-27 5:32 Tim Harder (radhermit)
0 siblings, 0 replies; 18+ messages in thread
From: Tim Harder (radhermit) @ 2013-08-27 5:32 UTC (permalink / raw
To: gentoo-commits
radhermit 13/08/27 05:32:29
Modified: ChangeLog java-utils-2.eclass
Log:
Don't add subslots to JAVA_PKG_NAME (bug #482270 by chutzpah).
Revision Changes Path
1.938 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.938&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.938&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.937&r2=1.938
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.937
retrieving revision 1.938
diff -u -r1.937 -r1.938
--- ChangeLog 26 Aug 2013 14:39:36 -0000 1.937
+++ ChangeLog 27 Aug 2013 05:32:28 -0000 1.938
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.937 2013/08/26 14:39:36 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.938 2013/08/27 05:32:28 radhermit Exp $
+
+ 27 Aug 2013; Tim Harder <radhermit@gentoo.org> java-utils-2.eclass:
+ Don't add subslots to JAVA_PKG_NAME (bug #482270 by chutzpah).
26 Aug 2013; <anarchy@gentoo.org> mozcoreconf-2.eclass:
Fix bug #415805, unset MOZCONFIG
1.154 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.154&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.154&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.153&r2=1.154
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- java-utils-2.eclass 17 Apr 2013 18:01:48 -0000 1.153
+++ java-utils-2.eclass 27 Aug 2013 05:32:28 -0000 1.154
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.153 2013/04/17 18:01:48 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.154 2013/08/27 05:32:28 radhermit Exp $
# -----------------------------------------------------------------------------
# @eclass-begin
@@ -2331,10 +2331,10 @@
debug-print-function ${FUNCNAME} $*
local pkg_name
- if [[ "$SLOT" == "0" ]] ; then
+ if [[ "${SLOT%/*}" == "0" ]] ; then
JAVA_PKG_NAME="${PN}"
else
- JAVA_PKG_NAME="${PN}-${SLOT}"
+ JAVA_PKG_NAME="${PN}-${SLOT%/*}"
fi
JAVA_PKG_SHAREPATH="${DESTTREE}/share/${JAVA_PKG_NAME}"
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
@ 2013-10-06 14:37 Vlastimil Babka (caster)
0 siblings, 0 replies; 18+ messages in thread
From: Vlastimil Babka (caster) @ 2013-10-06 14:37 UTC (permalink / raw
To: gentoo-commits
caster 13/10/06 14:37:31
Modified: ChangeLog java-utils-2.eclass
Log:
Convert comments for eclass manpages. Heavily based on work from ercpe, bug #476946.
Revision Changes Path
1.1011 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1011&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1011&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1010&r2=1.1011
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1010
retrieving revision 1.1011
diff -u -r1.1010 -r1.1011
--- ChangeLog 5 Oct 2013 18:39:30 -0000 1.1010
+++ ChangeLog 6 Oct 2013 14:37:31 -0000 1.1011
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1010 2013/10/05 18:39:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1011 2013/10/06 14:37:31 caster Exp $
+
+ 06 Oct 2013; Vlastimil Babka <caster@gentoo.org> java-utils-2.eclass:
+ Convert comments for eclass manpages. Heavily based on work from ercpe, bug
+ #476946.
05 Oct 2013; Michał Górny <mgorny@gentoo.org> -git.eclass:
Remove lastrited git.eclass.
1.155 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.155&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.155&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.154&r2=1.155
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- java-utils-2.eclass 27 Aug 2013 05:32:28 -0000 1.154
+++ java-utils-2.eclass 6 Oct 2013 14:37:31 -0000 1.155
@@ -6,82 +6,51 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.154 2013/08/27 05:32:28 radhermit Exp $
-
-# -----------------------------------------------------------------------------
-# @eclass-begin
-# @eclass-shortdesc Java Utility eclass
-# @eclass-maintainer java@gentoo.org
-#
-# This eclass provides functionality which is used by
-# java-pkg.eclass and java-pkg-opt.eclass as well as from ebuilds.
-#
-# @warning
-# You probably don't want to inherit this directly from an ebuild. Instead,
-# you should inherit java-ant for Ant-based Java packages, java-pkg for other
-# Java packages, or java-pkg-opt for packages that have optional Java support.
-#
-# -----------------------------------------------------------------------------
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.155 2013/10/06 14:37:31 caster Exp $
+# @ECLASS: java-utils-2.eclass
+# @MAINTAINER:
+# java@gentoo.org
+# @AUTHOR:
+# Thomas Matthijs <axxo@gentoo.org>, Karl Trygve Kalleberg <karltk@gentoo.org>
+# @BLURB: Base eclass for Java packages
+# @DESCRIPTION:
+# This eclass provides functionality which is used by java-pkg-2.eclass,
+# java-pkg-opt-2.eclass and java-ant-2 eclass, as well as from ebuilds.
+#
+# This eclass should not be inherited this directly from an ebuild. Instead,
+# you should inherit java-pkg-2 for Java packages or java-pkg-opt-2 for packages
+# that have optional Java support. In addition you can inherit java-ant-2 for
+# Ant-based packages.
inherit eutils versionator multilib
IUSE="elibc_FreeBSD"
-# -----------------------------------------------------------------------------
-# @section-begin variables
-# @section-title Variables
-#
-# Summary of variables which control the behavior of building Java packges.
-# -----------------------------------------------------------------------------
-
# Make sure we use java-config-2
export WANT_JAVA_CONFIG="2"
-# -----------------------------------------------------------------------------
-# @variable-external WANT_ANT_TASKS
-# @variable-default ""
-#
-# An $IFS separated list of ant tasks.
-# Ebuild can specify this variable before inheriting java-ant-2 eclass to
-# determine ANT_TASKS it needs. They will be automatically translated to
-# DEPEND variable and ANT_TASKS variable. JAVA_PKG_FORCE_ANT_TASKS can override
-# ANT_TASKS set by WANT_ANT_TASKS, but not the DEPEND due to caching.
-# Ebuilds that need to depend conditionally on certain tasks and specify them
-# differently for different eant calls can't use this simplified approach.
-# You also cannot specify version or anything else than ant-*.
-#
-# @example WANT_ANT_TASKS="ant-junit ant-trax"
-#
-# @seealso JAVA_PKG_FORCE_ANT_TASKS
-# -----------------------------------------------------------------------------
-#WANT_ANT_TASKS
-
-# -----------------------------------------------------------------------------
-# @variable-internal JAVA_PKG_PORTAGE_DEP
-#
+# @VARIABLE: JAVA_PKG_PORTAGE_DEP
+# @INTERNAL
+# @DESCRIPTION:
# The version of portage we need to function properly. Previously it was
# portage with phase hooks support but now we use a version with proper env
# saving. For EAPI 2 we have new enough stuff so let's have cleaner deps.
-# -----------------------------------------------------------------------------
has "${EAPI}" 0 1 && JAVA_PKG_PORTAGE_DEP=">=sys-apps/portage-2.1.2.7"
-# -----------------------------------------------------------------------------
-# @variable-internal JAVA_PKG_E_DEPEND
-#
+# @VARIABLE: JAVA_PKG_E_DEPEND
+# @INTERNAL
+# @DESCRIPTION:
# This is a convience variable to be used from the other java eclasses. This is
# 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.9-r1 ${JAVA_PKG_PORTAGE_DEP}"
has source ${JAVA_PKG_IUSE} && JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} source? ( app-arch/zip )"
-# -----------------------------------------------------------------------------
-# @variable-preinherit JAVA_PKG_WANT_BOOTCLASSPATH
-#
+# @ECLASS-VARIABLE: JAVA_PKG_WANT_BOOTCLASSPATH
+# @DEFAULT_UNSET
+# @DESCRIPTION:
# The version of bootclasspath the package needs to work. Translates to a proper
-# dependency. The bootclasspath has to be obtained by java-ant_rewrite-bootclasspath
-# -----------------------------------------------------------------------------
-
+# dependency. The bootclasspath can then be obtained by java-ant_rewrite-bootclasspath
if [[ -n "${JAVA_PKG_WANT_BOOTCLASSPATH}" ]]; then
if [[ "${JAVA_PKG_WANT_BOOTCLASSPATH}" == "1.5" ]]; then
JAVA_PKG_E_DEPEND="${JAVA_PKG_E_DEPEND} >=dev-java/gnu-classpath-0.98-r1:0.98"
@@ -92,32 +61,32 @@
fi
fi
-# -----------------------------------------------------------------------------
-# @variable-external JAVA_PKG_ALLOW_VM_CHANGE
-# @variable-default yes
-#
+# @ECLASS-VARIABLE: JAVA_PKG_ALLOW_VM_CHANGE
+# @DESCRIPTION:
# Allow this eclass to change the active VM?
-# If your system VM isn't sufficient for the package, the build will fail.
-# @note This is useful for testing specific VMs.
-# -----------------------------------------------------------------------------
+# If your system VM isn't sufficient for the package, the build will fail
+# instead of trying to switch to another VM.
+#
+# Overriding the default can be useful for testing specific VMs locally, but
+# should not be used in the final ebuild.
JAVA_PKG_ALLOW_VM_CHANGE=${JAVA_PKG_ALLOW_VM_CHANGE:="yes"}
-# -----------------------------------------------------------------------------
-# @variable-external JAVA_PKG_FORCE_VM
-#
+# @ECLASS-VARIABLE: JAVA_PKG_FORCE_VM
+# @DEFAULT_UNSET
+# @DESCRIPTION:
# Explicitly set a particular VM to use. If its not valid, it'll fall back to
# whatever /etc/java-config-2/build/jdk.conf would elect to use.
#
# Should only be used for testing and debugging.
#
-# @example Use sun-jdk-1.5 to emerge foo
+# Example: use sun-jdk-1.5 to emerge foo:
+# @CODE
# JAVA_PKG_FORCE_VM=sun-jdk-1.5 emerge foo
-#
-# -----------------------------------------------------------------------------
+# @CODE
-# -----------------------------------------------------------------------------
-# @variable-external JAVA_PKG_WANT_BUILD_VM
-#
+# @ECLASS-VARIABLE: JAVA_PKG_WANT_BUILD_VM
+# @DEFAULT_UNSET
+# @DESCRIPTION:
# A list of VM handles to choose a build VM from. If the list contains the
# currently active VM use that one, otherwise step through the list till a
# usable/installed VM is found.
@@ -125,112 +94,98 @@
# This allows to use an explicit list of JDKs in DEPEND instead of a virtual.
# Users of this variable must make sure at least one of the listed handles is
# covered by DEPEND.
-# Requires JAVA_PKG_WANT_SOURCE and JAVA_PKG_WANT_TARGET to be set as well.
-# -----------------------------------------------------------------------------
+# Requires JAVA_PKG_WANT_SOURCE and JAVA_PKG_WANT_TARGET to be set as well.
-# -----------------------------------------------------------------------------
-# @variable-external JAVA_PKG_WANT_SOURCE
-#
-# Specify a specific VM version to compile for to use for -source.
-# Normally this is determined from DEPEND.
+# @ECLASS-VARIABLE: JAVA_PKG_WANT_SOURCE
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Specify a non-standard Java source version for compilation (via javac -source
+# parameter or Ant equivalent via build.xml rewriting done by java-ant-2 eclass).
+# Normally this is determined from the jdk version specified in DEPEND.
# See java-pkg_get-source function below.
#
-# Should only be used for testing and debugging.
-#
-# @seealso java-pkg_get-source
+# Should generally only be used for testing and debugging.
#
-# @example Use 1.4 source to emerge baz
+# Use 1.4 source to emerge baz
+# @CODE
# JAVA_PKG_WANT_SOURCE=1.4 emerge baz
-# -----------------------------------------------------------------------------
+# @CODE
-# -----------------------------------------------------------------------------
-# @variable-external JAVA_PKG_WANT_TARGET
-#
-# Same as JAVA_PKG_WANT_SOURCE above but for -target.
+# @ECLASS-VARIABLE: JAVA_PKG_WANT_TARGET
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Same as JAVA_PKG_WANT_SOURCE (see above) but for javac -target parameter,
+# which affects the version of generated bytecode.
+# Normally this is determined from the jre/jdk version specified in RDEPEND.
# See java-pkg_get-target function below.
#
-# Should only be used for testing and debugging.
+# Should generallyonly be used for testing and debugging.
#
-# @seealso java-pkg_get-target
-#
-# @example emerge bar to be compatible with 1.3
+# emerge bar to be compatible with 1.3
+# @CODE
# JAVA_PKG_WANT_TARGET=1.3 emerge bar
-# -----------------------------------------------------------------------------
+# @CODE
-# -----------------------------------------------------------------------------
-# @variable-internal JAVA_PKG_COMPILER_DIR
-# @default /usr/share/java-config-2/compiler
-#
+# @VARIABLE: JAVA_PKG_COMPILER_DIR
+# @INTERNAL
+# @DESCRIPTION:
# Directory where compiler settings are saved, without trailing slash.
-# Probably shouldn't touch this variable.
-# -----------------------------------------------------------------------------
+# You probably shouldn't touch this variable except local testing.
JAVA_PKG_COMPILER_DIR=${JAVA_PKG_COMPILER_DIR:="/usr/share/java-config-2/compiler"}
-
-# -----------------------------------------------------------------------------
-# @variable-internal JAVA_PKG_COMPILERS_CONF
-# @variable-default /etc/java-config-2/build/compilers.conf
-#
+# @VARIABLE: JAVA_PKG_COMPILERS_CONF
+# @INTERNAL
+# @DESCRIPTION:
# Path to file containing information about which compiler to use.
-# Can be overloaded, but it should be overloaded for testing.
-# -----------------------------------------------------------------------------
+# Can be overloaded, but it should be overloaded only for local testing.
JAVA_PKG_COMPILERS_CONF=${JAVA_PKG_COMPILERS_CONF:="/etc/java-config-2/build/compilers.conf"}
-# -----------------------------------------------------------------------------
-# @variable-external JAVA_PKG_FORCE_COMPILER
-#
-# Explicitly set a list of compilers to use. This is normally read from
+# @ECLASS-VARIABLE: JAVA_PKG_FORCE_COMPILER
+# @INTERNAL
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Explicitly set a list of compilers to choose from. This is normally read from
# JAVA_PKG_COMPILERS_CONF.
#
-# @note This should only be used internally or for testing.
-# @example Use jikes and javac, in that order
+# Useful for local testing.
+#
+# Use jikes and javac, in that order
+# @CODE
# JAVA_PKG_FORCE_COMPILER="jikes javac"
-# -----------------------------------------------------------------------------
+# @CODE
-# -----------------------------------------------------------------------------
-# @variable-external JAVA_PKG_FORCE_ANT_TASKS
-#
+# @ECLASS-VARIABLE: JAVA_PKG_FORCE_ANT_TASKS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
# An $IFS separated list of ant tasks. Can be set in environment before calling
# emerge/ebuild to override variables set in ebuild, mainly for testing before
# putting the resulting (WANT_)ANT_TASKS into ebuild. Affects only ANT_TASKS in
# eant() call, not the dependencies specified in WANT_ANT_TASKS.
#
-# @example JAVA_PKG_FORCE_ANT_TASKS="ant-junit ant-trax" \
+# @CODE
+# JAVA_PKG_FORCE_ANT_TASKS="ant-junit ant-trax" \
# ebuild foo.ebuild compile
-#
-# @seealso WANT_ANT_TASKS
-# -----------------------------------------------------------------------------
+# @CODE
# TODO document me
JAVA_PKG_QA_VIOLATIONS=0
-# -----------------------------------------------------------------------------
-# @section-end variables
-# -----------------------------------------------------------------------------
-
-
-# -----------------------------------------------------------------------------
-# @section-begin install
-# @section-summary Install functions
-#
-# These are used to install Java-related things, such as jars, Javadocs, JNI
-# libraries, etc.
-# -----------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# @ebuild-function java-pkg_doexamples
-#
+# @FUNCTION: java-pkg_doexamples
+# @USAGE: [--subdir <subdir>] <file1/dir1> [<file2> ...]
+# @DESCRIPTION:
# Installs given arguments to /usr/share/doc/${PF}/examples
# If you give it only one parameter and it is a directory it will install
# everything in that directory to the examples directory.
#
-# @example
+# @CODE
+# Parameters:
+# --subdir - If the examples need a certain directory structure
+# $* - list of files to install
+#
+# Examples:
# 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
-# ------------------------------------------------------------------------------
+# @CODE
java-pkg_doexamples() {
debug-print-function ${FUNCNAME} $*
@@ -261,20 +216,20 @@
dosym "${dest}" "${JAVA_PKG_SHAREPATH}/examples" || die
}
-# -----------------------------------------------------------------------------
-# @ebuild-function java-pkg_dojar
-#
+# @FUNCTION: java-pkg_dojar
+# @USAGE: <jar1> [<jar2> ...]
+# @DESCRIPTION:
# Installs any number of jars.
# Jar's will be installed into /usr/share/${PN}(-${SLOT})/lib/ by default.
# You can use java-pkg_jarinto to change this path.
# You should never install a jar with a package version in the filename.
# Instead, use java-pkg_newjar defined below.
#
-# @example
+# @CODE
# java-pkg_dojar dist/${PN}.jar dist/${PN}-core.jar
+# @CODE
#
# @param $* - list of jars to install
-# ------------------------------------------------------------------------------
java-pkg_dojar() {
debug-print-function ${FUNCNAME} $*
@@ -326,48 +281,34 @@
java-pkg_do_write_
}
-# ------------------------------------------------------------------------------
-# @internal-function depend-java-query
-#
+# @FUNCTION: depend-java-query
+# @INTERNAL
+# @DESCRIPTION:
# Wrapper for the depend-java-query binary to enable passing USE in env.
# Using env variables keeps this eclass working with java-config versions that
# do not handle use flags.
-# ------------------------------------------------------------------------------
-
depend-java-query() {
# Used to have a which call here but it caused endless loops for some people
# that had some weird bashrc voodoo for which.
USE="${USE}" /usr/bin/depend-java-query "${@}"
}
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_regjar
-#
-# Records an already installed jar in the package.env
+# @FUNCTION: java-pkg_regjar
+# @USAGE: </path/to/installed/jar>
+# @DESCRIPTION:
+# Records an already installed (in ${D}) jar in the package.env
# This would mostly be used if the package has make or a custom script to
# install things.
#
-# Example:
-# java-pkg_regjar ${D}/opt/foo/lib/foo.jar
-#
# WARNING:
-# if you want to use shell expansion, you have to use ${D}/... as the for in
-# this function will not be able to expand the path, here's an example:
-#
-# java-pkg_regjar /opt/my-java/lib/*.jar
-#
-# will not work, because:
-# * the `for jar in "$@"` can't expand the path to jar file names, as they
-# don't exist yet
-# * all `if ...` inside for will fail - the file '/opt/my-java/lib/*.jar'
-# doesn't exist
-#
-# you have to use it as:
+# if you want to use shell expansion, you have to use ${D}/... as the for in
+# this function will not be able to expand the path, here's an example:
#
+# @CODE
# java-pkg_regjar ${D}/opt/my-java/lib/*.jar
+# @CODE
#
-# @param $@ - jars to record
-# ------------------------------------------------------------------------------
+
# TODO should we be making sure the jar is present on ${D} or wherever?
java-pkg_regjar() {
debug-print-function ${FUNCNAME} $*
@@ -408,17 +349,12 @@
java-pkg_do_write_
}
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_newjar
+# @FUNCTION: java-pkg_newjar
+# @USAGE: <path/to/oldname.jar> [<newname.jar>]
+# @DESCRIPTION:
+# Installs a jar with a new name (defaults to $PN.jar)
#
-# Installs a jar with a new name
-#
-# @example: install a versioned jar without the version
-# java-pkg_newjar dist/${P}.jar ${PN}.jar
-#
-# @param $1 - jar to install
-# @param $2 - new name for jar - defaults to ${PN}.jar if not specified
-# ------------------------------------------------------------------------------
+# For example, installs a versioned jar without the version
java-pkg_newjar() {
debug-print-function ${FUNCNAME} $*
@@ -436,32 +372,28 @@
java-pkg_dojar "${new_jar_dest}"
}
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_addcp
-#
+# @FUNCTION: java-pkg_addcp
+# @USAGE: <classpath>
+# @DESCRIPTION:
# Add something to the package's classpath. For jars, you should use dojar,
# newjar, or regjar. This is typically used to add directories to the classpath.
-#
-# TODO add example
-# @param $@ - value to append to JAVA_PKG_CLASSPATH
-# ------------------------------------------------------------------------------
+# The parameters of this function are appended to JAVA_PKG_CLASSPATH
java-pkg_addcp() {
java-pkg_append_ JAVA_PKG_CLASSPATH "${@}"
java-pkg_do_write_
}
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_doso
-#
+# @FUNCTION: java-pkg_doso
+# @USAGE: <path/to/file1.so> [...]
+# @DESCRIPTION:
# Installs any number of JNI libraries
# They will be installed into /usr/lib by default, but java-pkg_sointo
# can be used change this path
#
+# @CODE
# Example:
# java-pkg_doso *.so
-#
-# @param $@ - JNI libraries to install
-# ------------------------------------------------------------------------------
+# @CODE
java-pkg_doso() {
debug-print-function ${FUNCNAME} $*
@@ -497,16 +429,18 @@
java-pkg_do_write_
}
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_regso
-#
-# Registers an already JNI library in package.env.
+# @FUNCTION: java-pkg_regso
+# @USAGE: <file1.so> [...]
+# @DESCRIPTION:
+# Registers an already installed JNI library in package.env.
+#
+# @CODE
+# Parameters:
+# $@ - JNI libraries to register
#
# Example:
# java-pkg_regso *.so /path/*.so
-#
-# @param $@ - JNI libraries to register
-# ------------------------------------------------------------------------------
+# @CODE
java-pkg_regso() {
debug-print-function ${FUNCNAME} $*
@@ -534,41 +468,35 @@
java-pkg_do_write_
}
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_jarinto
-#
-# Changes the path jars are installed into
-#
-# @param $1 - new location to install jars into.
-# -----------------------------------------------------------------------------
+# @FUNCTION: java-pkg_jarinto
+# @USAGE: </path/to/install/jars/into>
+# @DESCRIPTION:
+# Changes the path jars are installed into via subsequent java-pkg_dojar calls.
java-pkg_jarinto() {
debug-print-function ${FUNCNAME} $*
JAVA_PKG_JARDEST="${1}"
}
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_sointo
-#
-# Changes the path that JNI libraries are installed into.
-#
-# @param $1 - new location to install JNI libraries into.
-# ------------------------------------------------------------------------------
+# @FUNCTION: java-pkg_sointo
+# @USAGE: </path/to/install/sofiles/into>
+# @DESCRIPTION:
+# Changes the path that JNI libraries are installed into via subsequent
+# java-pkg_doso calls.
java-pkg_sointo() {
debug-print-function ${FUNCNAME} $*
JAVA_PKG_LIBDEST="${1}"
}
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_dohtml
-#
-# Install Javadoc HTML documentation
+# @FUNCTION: java-pkg_dohtml
+# @USAGE: <path/to/javadoc/documentation> [...]
+# @DESCRIPTION:
+# Install Javadoc HTML documentation. Usage of java-pkg_dojavadoc is preferred.
#
-# @example
+# @CODE
# java-pkg_dohtml dist/docs/
-#
-# ------------------------------------------------------------------------------
+# @CODE
java-pkg_dohtml() {
debug-print-function ${FUNCNAME} $*
@@ -584,20 +512,21 @@
java-pkg_recordjavadoc
}
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_dojavadoc
-#
+# @FUNCTION: java-pkg_dojavadoc
+# @USAGE: [--symlink destination] <path/to/javadocs/root>
+# @DESCRIPTION:
# Installs javadoc documentation. This should be controlled by the doc use flag.
#
-# @param $1: optional --symlink creates to symlink like this for html
+# @CODE
+# Parameters:
+# $1: optional --symlink creates to symlink like this for html
# documentation bundles.
-# @param $2: - The javadoc root directory.
+# $2: - The javadoc root directory.
#
-# @example:
+# Examples:
# java-pkg_dojavadoc docs/api
-# java-pkg_dojavadoc --symlink apidocs docs/api
-#
-# ------------------------------------------------------------------------------
+# java-pkg_dojavadoc --symlink apidocs docs/api
+# @CODE
java-pkg_dojavadoc() {
debug-print-function ${FUNCNAME} $*
@@ -650,24 +579,25 @@
fi
}
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_dosrc
-#
+# @FUNCTION: java-pkg_dosrc
+# @USAGE: <path/to/sources> [...]
+# @DESCRIPTION:
# Installs a zip containing the source for a package, so it can used in
# from IDEs like eclipse and netbeans.
+# Ebuild needs to DEPEND on app-arch/zip to use this. It also should be controlled by USE=source.
#
-# Ebuild needs to DEPEND on app-arch/zip to use this.
-#
-# It also should be controlled by USE=source.
-#
-# @example:
-# java-pkg_dosrc src/*
-#
-# ------------------------------------------------------------------------------
+# @CODE
+# Example:
+# java-pkg_dosrc src/*
+# @CODE
+
# TODO change so it the arguments it takes are the base directories containing
-# source -nichoj
+# source -nichoj
+#
# TODO should we be able to handle multiple calls to dosrc? -nichoj
+#
# TODO maybe we can take an existing zip/jar? -nichoj
+#
# FIXME apparently this fails if you give it an empty directories
java-pkg_dosrc() {
debug-print-function ${FUNCNAME} $*
@@ -709,25 +639,27 @@
java-pkg_do_write_
}
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_dolauncher
-#
+# @FUNCTION: java-pkg_dolauncher
+# @USAGE: <filename> [options]
+# @DESCRIPTION:
# Make a wrapper script to lauch/start this package
# If necessary, the wrapper will switch to the appropriate VM.
#
# Can be called without parameters if the package installs only one jar
# that has the Main-class attribute set. The wrapper will be named ${PN}.
#
-# @param $1 - filename of launcher to create
-# @param $2 - options, as follows:
-# --main the.main.class.too.start
+# @CODE
+# Parameters:
+# $1 - filename of launcher to create
+# $2 - options, as follows:
+# --main the.main.class.to.start
# --jar /the/jar/too/launch.jar or just <name>.jar
# --java_args 'Extra arguments to pass to java'
# --pkg_args 'Extra arguments to pass to the package'
# --pwd Directory the launcher changes to before executing java
# -into Directory to install the launcher to, instead of /usr/bin
# -pre Prepend contents of this file to the launcher
-# ------------------------------------------------------------------------------
+# @CODE
java-pkg_dolauncher() {
debug-print-function ${FUNCNAME} $*
@@ -798,10 +730,10 @@
fi
}
-# ------------------------------------------------------------------------------
+# @FUNCTION: java-pkg_dowar
+# @DESCRIPTION:
# Install war files.
# TODO document
-# ------------------------------------------------------------------------------
java-pkg_dowar() {
debug-print-function ${FUNCNAME} $*
@@ -835,12 +767,12 @@
done
}
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_recordjavadoc
+# @FUNCTION: java-pkg_recordjavadoc
+# @INTERNAL
+# @DESCRIPTION:
# Scan for JavaDocs, and record their existence in the package.env file
-#
+
# TODO make sure this in the proper section
-# ------------------------------------------------------------------------------
java-pkg_recordjavadoc()
{
debug-print-function ${FUNCNAME} $*
@@ -857,18 +789,10 @@
fi
}
-# ------------------------------------------------------------------------------
-# @section-end install
-# ------------------------------------------------------------------------------
-
-# ------------------------------------------------------------------------------
-# @begin-section query
-# Use these to build the classpath for building a package.
-# ------------------------------------------------------------------------------
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_jar-from
-#
+# @FUNCTION: java-pkg_jar-from
+# @USAGE: [--build-only] [--with-dependencies] [--virtual] [--into dir] <package> [<package.jar>] [<destination.jar>]
+# @DESCRIPTION:
# Makes a symlink to a jar from a certain package
# A lot of java packages include dependencies in a lib/ directory
# You can use this function to replace these bundled dependencies.
@@ -876,16 +800,22 @@
# is passed as the very first argument, for jars that have to be present only
# at build time and are not needed on runtime (junit testing etc).
#
+# @CODE
# Example: get all jars from xerces slot 2
# java-pkg_jar-from xerces-2
+#
# Example: get a specific jar from xerces slot 2
# java-pkg_jar-from xerces-2 xml-apis.jar
+#
# Example: get a specific jar from xerces slot 2, and name it diffrently
# java-pkg_jar-from xerces-2 xml-apis.jar xml.jar
+#
# Example: get junit.jar which is needed only for building
# java-pkg_jar-from --build-only junit junit.jar
+# @CODE
#
-# @param $opt
+# @CODE
+# Parameters
# --build-only - makes the jar(s) not added into package.env DEPEND line.
# (assumed automatically when called inside src_test)
# --with-dependencies - get jars also from requested package's dependencies
@@ -893,12 +823,13 @@
# --virtual - Packages passed to this function are to be handled as virtuals
# and will not have individual jar dependencies recorded.
# --into $dir - symlink jar(s) into $dir (must exist) instead of .
-# @param $1 - Package to get jars from, or comma-separated list of packages in
+# $1 - Package to get jars from, or comma-separated list of packages in
# case other parameters are not used.
-# @param $2 - jar from package. If not specified, all jars will be used.
-# @param $3 - When a single jar is specified, destination filename of the
+# $2 - jar from package. If not specified, all jars will be used.
+# $3 - When a single jar is specified, destination filename of the
# symlink. Defaults to the name of the jar.
-# ------------------------------------------------------------------------------
+# @CODE
+
# TODO could probably be cleaned up a little
java-pkg_jar-from() {
debug-print-function ${FUNCNAME} $*
@@ -1013,18 +944,16 @@
fi
}
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_jarfrom
-#
+# @FUNCTION: java-pkg_jarfrom
+# @DESCRIPTION:
# See java-pkg_jar-from
-# ------------------------------------------------------------------------------
java-pkg_jarfrom() {
java-pkg_jar-from "$@"
}
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_getjars
-#
+# @FUNCTION: java-pkg_getjars
+# @USAGE: [--build-only] [--with-dependencies] <package1>[,<package2>...]
+# @DESCRIPTION:
# Get the classpath provided by any number of packages
# Among other things, this can be passed to 'javac -classpath' or 'ant -lib'.
# The providing packages are recorded as dependencies into package.env DEPEND
@@ -1032,19 +961,22 @@
# that have to be present only at build time and are not needed on runtime
# (junit testing etc).
#
+# @CODE
# Example: Get the classpath for xerces-2 and xalan,
# java-pkg_getjars xerces-2,xalan
+#
# Example Return:
# /usr/share/xerces-2/lib/xml-apis.jar:/usr/share/xerces-2/lib/xmlParserAPIs.jar:/usr/share/xalan/lib/xalan.jar
#
-# @param $opt
+#
+# Parameters:
# --build-only - makes the jar(s) not added into package.env DEPEND line.
# (assumed automatically when called inside src_test)
# --with-dependencies - get jars also from requested package's dependencies
# transitively.
-# @param $1 - list of packages to get jars from
+# $1 - list of packages to get jars from
# (passed to java-config --classpath)
-# ------------------------------------------------------------------------------
+# @CODE
java-pkg_getjars() {
debug-print-function ${FUNCNAME} $*
@@ -1092,27 +1024,28 @@
echo "${jars}"
}
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_getjar
-#
-# Get the filename of a single jar from a package
+# @FUNCTION: java-pkg_getjar
+# @USAGE: [--build-only] [--virtual] <package> <jarfile>
+# @DESCRIPTION:
+# Get the complete path of a single jar from a package
# The providing package is recorded as runtime dependency into package.env
# DEPEND line, unless "--build-only" is passed as the very first argument, for
# jars that have to be present only at build time and are not needed on runtime
# (junit testing etc).
#
-# @example
+# @CODE
+# Example:
# java-pkg_getjar xerces-2 xml-apis.jar
-# @example-return
+# returns
# /usr/share/xerces-2/lib/xml-apis.jar
#
-# @param $opt
+# Parameters:
# --build-only - makes the jar not added into package.env DEPEND line.
# --virtual - Packages passed to this function are to be handled as virtuals
# and will not have individual jar dependencies recorded.
-# @param $1 - package to use
-# @param $2 - jar to get
-# ------------------------------------------------------------------------------
+# $1 - package to use
+# $2 - jar to get
+# @CODE
java-pkg_getjar() {
debug-print-function ${FUNCNAME} $*
@@ -1185,9 +1118,9 @@
return 1
}
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_register-dependency
-#
+# @FUNCTION: java-pkg_register-dependency
+# @USAGE: <package>[,<package2>...] [<jarfile>]
+# @DESCRIPTION:
# Registers runtime dependency on a package, list of packages, or a single jar
# from a package, into package.env DEPEND line. Can only be called in
# src_install phase.
@@ -1195,21 +1128,25 @@
# their classpath during build. As such, the dependencies only need to be
# specified in ebuild's RDEPEND, and should be omitted in DEPEND.
#
-# @param $1 - comma-separated list of packages, or a single package
-# @param $2 - if param $1 is a single package, optionally specify the jar
+# @CODE
+# Parameters:
+# $1 - comma-separated list of packages, or a single package
+# $2 - if param $1 is a single package, optionally specify the jar
# to depend on
#
-# Example: Record the dependency on whole xerces-2 and xalan,
+# Examples:
+# Record the dependency on whole xerces-2 and xalan,
# java-pkg_register-dependency xerces-2,xalan
-# Example: Record the dependency on ant.jar from ant-core
+#
+# Record the dependency on ant.jar from ant-core
# java-pkg_register-dependency ant-core ant.jar
+# @CODE
#
# Note: Passing both list of packages as the first parameter AND specifying the
# jar as the second is not allowed and will cause the function to die. We assume
# that there's more chance one passes such combination as a mistake, than that
# there are more packages providing identically named jar without class
# collisions.
-# ------------------------------------------------------------------------------
java-pkg_register-dependency() {
debug-print-function ${FUNCNAME} $*
@@ -1241,9 +1178,9 @@
java-pkg_do_write_
}
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_register-optional-dependency
-#
+# @FUNCTION: java-pkg_register-optional-dependency
+# @USAGE: <package>[,<package2>...] [<jarfile>]
+# @DESCRIPTION:
# Registers optional runtime dependency on a package, list of packages, or a
# single jar from a package, into package.env OPTIONAL_DEPEND line. Can only be
# called in src_install phase.
@@ -1252,19 +1189,21 @@
# JDBC implementations for various databases. It's better than having USE flag
# for each implementation triggering hard dependency.
#
-# @param $1 - comma-separated list of packages, or a single package
-# @param $2 - if param $1 is a single package, optionally specify the jar
-# to depend on
+# @CODE
+# Parameters:
+# $1 - comma-separated list of packages, or a single package
+# $2 - if param $1 is a single package, optionally specify the jar to depend on
#
-# Example: Record the optional dependency on some jdbc providers
+# Example:
+# Record the optional dependency on some jdbc providers
# java-pkg_register-optional-dependency jdbc-jaybird,jtds-1.2,jdbc-mysql
+# @CODE
#
# Note: Passing both list of packages as the first parameter AND specifying the
# jar as the second is not allowed and will cause the function to die. We assume
# that there's more chance one passes such combination as a mistake, than that
# there are more packages providing identically named jar without class
# collisions.
-# ------------------------------------------------------------------------------
java-pkg_register-optional-dependency() {
debug-print-function ${FUNCNAME} $*
@@ -1294,17 +1233,13 @@
java-pkg_do_write_
}
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_register-environment-variable
-#
+# @FUNCTION: java-pkg_register-environment-variable
+# @USAGE: <name> <value>
+# @DESCRIPTION:
# Register an arbitrary environment variable into package.env. The gjl launcher
# for this package or any package depending on this will export it into
# environement before executing java command.
# Must only be called in src_install phase.
-#
-# @param $1 - variable name
-# @param $2 - variable value
-# ------------------------------------------------------------------------------
JAVA_PKG_EXTRA_ENV="${T}/java-pkg-extra-env"
JAVA_PKG_EXTRA_ENV_VARS=""
java-pkg_register-environment-variable() {
@@ -1320,15 +1255,13 @@
java-pkg_do_write_
}
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_get-bootclasspath
-#
+# @FUNCTION: java-pkg_get-bootclasspath
+# @USAGE: <version>
+# @DESCRIPTION:
# Returns classpath of a given bootclasspath-providing package version.
#
# @param $1 - the version of bootclasspath (e.g. 1.5), 'auto' for bootclasspath
# of the current JDK
-# ------------------------------------------------------------------------------
-
java-pkg_get-bootclasspath() {
local version="${1}"
@@ -1386,24 +1319,10 @@
# done
#}
-# ------------------------------------------------------------------------------
-# @section-end query
-# ------------------------------------------------------------------------------
-
-# ------------------------------------------------------------------------------
-# @section-begin helper
-# @section-summary Helper functions
-#
-# Various other functions to use from an ebuild
-# ------------------------------------------------------------------------------
-
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_find-normal-jars
-#
-# Find the files with suffix .jar file in the given directory or $WORKDIR
-#
-# @param $1 - The directory to search for jar files (default: ${WORKDIR})
-# ------------------------------------------------------------------------------
+# @FUNCTION: java-pkg_find-normal-jars
+# @USAGE: [<path/to/directory>]
+# @DESCRIPTION:
+# Find the files with suffix .jar file in the given directory (default: $WORKDIR)
java-pkg_find-normal-jars() {
local dir=$1
[[ "${dir}" ]] || dir="${WORKDIR}"
@@ -1416,13 +1335,11 @@
return $?
}
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_ensure-no-bundled-jars
-#
+# @FUNCTION: java-pkg_ensure-no-bundled-jars
+# @DESCRIPTION:
# Try to locate bundled jar files in ${WORKDIR} and die if found.
# This function should be called after WORKDIR has been populated with symlink
# to system jar files or bundled jars removed.
-# ------------------------------------------------------------------------------
java-pkg_ensure-no-bundled-jars() {
debug-print-function ${FUNCNAME} $*
@@ -1437,12 +1354,10 @@
fi
}
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_ensure-vm-version-sufficient
-#
+# @FUNCTION: java-pkg_ensure-vm-version-sufficient
+# @INTERNAL
+# @DESCRIPTION:
# Checks if we have a sufficient VM and dies if we don't.
-#
-# ------------------------------------------------------------------------------
java-pkg_ensure-vm-version-sufficient() {
debug-print-function ${FUNCNAME} $*
@@ -1454,12 +1369,10 @@
fi
}
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_is-vm-version-sufficient
-#
-# @return zero - VM is sufficient
-# @return non-zero - VM is not sufficient
-# ------------------------------------------------------------------------------
+# @FUNCTION: java-pkg_is-vm-version-sufficient
+# @INTERNAL
+# @DESCRIPTION:
+# @RETURN: zero - VM is sufficient; non-zero - VM is not sufficient
java-pkg_is-vm-version-sufficient() {
debug-print-function ${FUNCNAME} $*
@@ -1467,13 +1380,12 @@
return $?
}
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_ensure-vm-version-eq
-#
+# @FUNCTION: java-pkg_ensure-vm-version-eq
+# @INTERNAL
+# @DESCRIPTION:
# Die if the current VM is not equal to the argument passed.
#
# @param $@ - Desired VM version to ensure
-# ------------------------------------------------------------------------------
java-pkg_ensure-vm-version-eq() {
debug-print-function ${FUNCNAME} $*
@@ -1485,13 +1397,10 @@
fi
}
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_is-vm-version-eq
-#
-# @param $@ - VM version to compare current VM to
-# @return zero - VM versions are equal
-# @return non-zero - VM version are not equal
-# ------------------------------------------------------------------------------
+# @FUNCTION: java-pkg_is-vm-version-eq
+# @USAGE: <version>
+# @INTERNAL
+# @RETURN: zero - VM versions are equal; non-zero - VM version are not equal
java-pkg_is-vm-version-eq() {
debug-print-function ${FUNCNAME} $*
@@ -1518,13 +1427,12 @@
fi
}
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_ensure-vm-version-ge
-#
+# @FUNCTION: java-pkg_ensure-vm-version-ge
+# @INTERNAL
+# @DESCRIPTION:
# Die if the current VM is not greater than the desired version
#
# @param $@ - VM version to compare current to
-# ------------------------------------------------------------------------------
java-pkg_ensure-vm-version-ge() {
debug-print-function ${FUNCNAME} $*
@@ -1536,13 +1444,15 @@
fi
}
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_is-vm-version-ge
-#
-# @param $@ - VM version to compare current VM to
-# @return zero - current VM version is greater than checked version
-# @return non-zero - current VM version is not greater than checked version
-# ------------------------------------------------------------------------------
+# @FUNCTION: java-pkg_is-vm-version-ge
+# @INTERNAL
+# @DESCRIPTION:
+# @CODE
+# Parameters:
+# $@ - VM version to compare current VM to
+# @CODE
+# @RETURN: zero - current VM version is greater than checked version;
+# non-zero - current VM version is not greater than checked version
java-pkg_is-vm-version-ge() {
debug-print-function ${FUNCNAME} $*
@@ -1575,31 +1485,30 @@
return $?
}
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_get-source
-#
+# @FUNCTION: java-pkg_get-source
+# @DESCRIPTION:
# Determines what source version should be used, for passing to -source.
# Unless you want to break things you probably shouldn't set _WANT_SOURCE
#
-# @return string - Either the lowest possible source, or JAVA_PKG_WANT_SOURCE
-# ------------------------------------------------------------------------------
+# @RETURN: string - Either the lowest possible source, or JAVA_PKG_WANT_SOURCE
java-pkg_get-source() {
echo ${JAVA_PKG_WANT_SOURCE:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")}
}
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_get-target
-#
+# @FUNCTION: java-pkg_get-target
+# @DESCRIPTION:
# Determines what target version should be used, for passing to -target.
# If you don't care about lower versions, you can set _WANT_TARGET to the
# version of your JDK.
#
-# @return string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET
-# ------------------------------------------------------------------------------
+# @RETURN: string - Either the lowest possible target, or JAVA_PKG_WANT_TARGET
java-pkg_get-target() {
echo ${JAVA_PKG_WANT_TARGET:-$(depend-java-query --get-lowest "${DEPEND} ${RDEPEND}")}
}
+# @FUNCTION: java-pkg_get-javac
+# @DESCRIPTION:
+# Returns the compiler executable
java-pkg_get-javac() {
debug-print-function ${FUNCNAME} $*
@@ -1639,14 +1548,12 @@
echo ${compiler_executable}
}
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_javac-args
-#
+# @FUNCTION: java-pkg_javac-args
+# @DESCRIPTION:
# If an ebuild uses javac directly, instead of using ejavac, it should call this
# to know what -source/-target to use.
#
-# @return string - arguments to pass to javac, complete with -target and -source
-# ------------------------------------------------------------------------------
+# @RETURN: string - arguments to pass to javac, complete with -target and -source
java-pkg_javac-args() {
debug-print-function ${FUNCNAME} $*
@@ -1672,7 +1579,9 @@
fi
}
-# TODO document
+# @FUNCTION: java-pkg_get-jni-cflags
+# @DESCRIPTION:
+# Echos the CFLAGS for JNI compilations
java-pkg_get-jni-cflags() {
local flags="-I${JAVA_HOME}/include"
@@ -1695,9 +1604,9 @@
die "${FUNCNAME} was removed. Package mangers handle this already. #278965"
}
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_register-ant-task
-#
+# @FUNCTION: java-pkg_register-ant-task
+# @USAGE: [--version x.y] [<name>]
+# @DESCRIPTION:
# Register this package as ant task, so that ant will load it when no specific
# ANT_TASKS are specified. Note that even without this registering, all packages
# specified in ANT_TASKS will be loaded. Mostly used by the actual ant tasks
@@ -1705,12 +1614,14 @@
# .jar into /usr/share/ant-core/lib to get autoloaded, for backwards
# compatibility.
#
-# @param --version x.y Register only for ant version x.y (otherwise for any ant
+# @CODE
+# Parameters
+# --version x.y Register only for ant version x.y (otherwise for any ant
# version). Used by the ant-* packages to prevent loading of mismatched
# ant-core ant tasks after core was updated, before the tasks are updated,
# without a need for blockers.
-# @param $1 Name to register as. Defaults to JAVA_PKG_NAME ($PN[-$SLOT])
-# ------------------------------------------------------------------------------
+# $1 Name to register as. Defaults to JAVA_PKG_NAME ($PN[-$SLOT])
+# @CODE
java-pkg_register-ant-task() {
local TASKS_DIR="tasks"
@@ -1732,11 +1643,10 @@
touch "${D}/usr/share/ant/${TASKS_DIR}/${TASK_NAME}"
}
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_ant-tasks-depend
-#
+# @FUNCTION: java-pkg_ant-tasks-depend
+# @INTERNAL
+# @DESCRIPTION:
# Translates the WANT_ANT_TASKS variable into valid dependencies.
-# ------------------------------------------------------------------------------
java-pkg_ant-tasks-depend() {
debug-print-function ${FUNCNAME} ${WANT_ANT_TASKS}
@@ -1761,16 +1671,18 @@
}
-# ------------------------------------------------------------------------------
-# @internal-function ejunit_
-#
+# @FUNCTION: ejunit_
+# @INTERNAL
+# @DESCRIPTION:
# 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.
-#
-# @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
+# @CODE
+# Parameters:
+# $1 - junit package (junit or junit-4)
+# $2 - -cp or -classpath
+# $3 - classpath; junit and recorded dependencies get appended
+# $@ - the rest of the parameters are passed to java
+# @CODE
ejunit_() {
debug-print-function ${FUNCNAME} $*
@@ -1800,61 +1712,55 @@
java -cp "${cp}" -Djava.awt.headless=true ${runner} "${@}" || die "Running junit failed"
}
-# ------------------------------------------------------------------------------
-# @ebuild-function ejunit
-#
+# @FUNCTION: ejunit
+# @DESCRIPTION:
# Junit wrapper function. Makes it easier to run the tests and checks for
# dev-java/junit in DEPEND. Launches the tests using org.junit.runner.JUnitCore.
#
+# @CODE
+# Parameters:
+# $1 - -cp or -classpath
+# $2 - classpath; junit and recorded dependencies get appended
+# $@ - the rest of the parameters are passed to java
+#
# 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
-# @param $@ - the rest of the parameters are passed to java
-# ------------------------------------------------------------------------------
+# ejunit org.blinkenlights.jid3.test.FirstTest org.blinkenlights.jid3.test.SecondTest
+# @CODE
ejunit() {
debug-print-function ${FUNCNAME} $*
ejunit_ "junit" "${@}"
}
-# ------------------------------------------------------------------------------
-# @ebuild-function ejunit4
-#
+# @FUNCTION: ejunit4
+# @DESCRIPTION:
# 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.
#
+# @CODE
+# Parameters:
+# $1 - -cp or -classpath
+# $2 - classpath; junit and recorded dependencies get appended
+# $@ - the rest of the parameters are passed to java
+#
# 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
-# @param $@ - the rest of the parameters are passed to java
-# ------------------------------------------------------------------------------
+# @CODE
ejunit4() {
debug-print-function ${FUNCNAME} $*
ejunit_ "junit-4" "${@}"
}
-# ------------------------------------------------------------------------------
-# @section-end helper
-# ------------------------------------------------------------------------------
-
-# ------------------------------------------------------------------------------
-# @eclass-src_prepare
-#
+# @FUNCTION: java-utils-2_src_prepare
+# @DESCRIPTION:
# src_prepare Searches for bundled jars
# Don't call directly, but via java-pkg-2_src_prepare!
-# ------------------------------------------------------------------------------
-
java-utils-2_src_prepare() {
[[ ${EBUILD_PHASE} == prepare ]] &&
java-pkg_func-exists java_prepare && java_prepare
@@ -1870,13 +1776,10 @@
touch "${T}/java-utils-2_src_prepare-run"
}
-# ------------------------------------------------------------------------------
-# @eclass-pkg_preinst
-#
+# @FUNCTION: java-utils-2_pkg_preinst
+# @DESCRIPTION:
# pkg_preinst Searches for missing and unneeded dependencies
# Don't call directly, but via java-pkg-2_pkg_preinst!
-# ------------------------------------------------------------------------------
-
java-utils-2_pkg_preinst() {
if is-java-strict; then
if has_version dev-java/java-dep-check; then
@@ -1897,28 +1800,22 @@
fi
}
-# ------------------------------------------------------------------------------
-# @section-begin build
-# @section-summary Build functions
-#
-# These are some functions for building a package. In particular, it consists of
-# wrappers for javac and ant.
-# ------------------------------------------------------------------------------
-
-# ------------------------------------------------------------------------------
-# @ebuild-function eant
-#
+# @FUNCTION: eant
+# @USAGE: <ant_build_target(s)>
+# @DESCRIPTION:
# Ant wrapper function. Will use the appropriate compiler, based on user-defined
# compiler. Will also set proper ANT_TASKS from the variable ANT_TASKS,
# variables:
+#
+# @CODE
+# Variables:
# 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.
+# 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!
-# *ANT_TASKS - used to determine ANT_TASKS before calling Ant.
-# ------------------------------------------------------------------------------
+# for build-time purposes, the dependency is not recorded to
+# package.env!
+# ANT_TASKS - used to determine ANT_TASKS before calling Ant.
+# @CODE
eant() {
debug-print-function ${FUNCNAME} $*
@@ -2037,14 +1934,11 @@
ant ${antflags} "${@}" || die "eant failed"
}
-# ------------------------------------------------------------------------------
-# @ebuild-function ejavac
-#
+# @FUNCTION: ejavac
+# @USAGE: <javac_arguments>
+# @DESCRIPTION:
# Javac wrapper function. Will use the appropriate compiler, based on
# /etc/java-config/compilers.conf
-#
-# @param $@ - Arguments to be passed to the compiler
-# ------------------------------------------------------------------------------
ejavac() {
debug-print-function ${FUNCNAME} $*
@@ -2068,67 +1962,52 @@
${compiler_executable} ${javac_args} "${@}" || die "ejavac failed"
}
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_filter-compiler
-#
+# @FUNCTION: java-pkg_filter-compiler
+# @USAGE: <compiler(s)_to_filter>
+# @DESCRIPTION:
# Used to prevent the use of some compilers. Should be used in src_compile.
# Basically, it just appends onto JAVA_PKG_FILTER_COMPILER
-#
-# @param $@ - compilers to filter
-# ------------------------------------------------------------------------------
java-pkg_filter-compiler() {
JAVA_PKG_FILTER_COMPILER="${JAVA_PKG_FILTER_COMPILER} $@"
}
-# ------------------------------------------------------------------------------
-# @ebuild-function java-pkg_force-compiler
-#
+# @FUNCTION: java-pkg_force-compiler
+# @USAGE: <compiler(s)_to_force>
+# @DESCRIPTION:
# Used to force the use of particular compilers. Should be used in src_compile.
# A common use of this would be to force ecj-3.1 to be used on amd64, to avoid
# OutOfMemoryErrors that may come up.
-#
-# @param $@ - compilers to force
-# ------------------------------------------------------------------------------
java-pkg_force-compiler() {
JAVA_PKG_FORCE_COMPILER="$@"
}
-# ------------------------------------------------------------------------------
-# @ebuild-function use_doc
+# @FUNCTION: use_doc
+# @DESCRIPTION:
#
# Helper function for getting ant to build javadocs. If the user has USE=doc,
# then 'javadoc' or the argument are returned. Otherwise, there is no return.
#
# The output of this should be passed to ant.
+# @CODE
+# Parameters:
+# $@ - Option value to return. Defaults to 'javadoc'
#
-# Example: build javadocs by calling 'javadoc' target
+# Examples:
+# build javadocs by calling 'javadoc' target
# eant $(use_doc)
-# Example: build javadocs by calling 'apidoc' target
-# eant $(use_doc apidoc)
#
-# @param $@ - Option value to return. Defaults to 'javadoc'
-# @return string - Name of the target to create javadocs
-# ------------------------------------------------------------------------------
+# build javadocs by calling 'apidoc' target
+# eant $(use_doc apidoc)
+# @CODE
+# @RETURN string - Name of the target to create javadocs
use_doc() {
use doc && echo ${@:-javadoc}
}
-# ------------------------------------------------------------------------------
-# @section-end build
-# ------------------------------------------------------------------------------
-
-# ------------------------------------------------------------------------------
-# @section-begin internal
-# @section-summary Internal functions
-#
-# Do __NOT__ use any of these from an ebuild! These are only to be used from
-# within the java eclasses.
-# ------------------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# @function-internal java-pkg_init
-#
+# @FUNCTION: java-pkg_init
+# @INTERNAL
+# @DESCRIPTION:
# The purpose of this function, as the name might imply, is to initialize the
# Java environment. It ensures that that there aren't any environment variables
# that'll muss things up. It initializes some variables, which are used
@@ -2136,8 +2015,6 @@
#
# This shouldn't be used directly. Instead, java-pkg and java-pkg-opt will
# call it during each of the phases of the merge process.
-#
-# -----------------------------------------------------------------------------
java-pkg_init() {
debug-print-function ${FUNCNAME} $*
@@ -2207,9 +2084,9 @@
export ANT_RESPECT_JAVA_HOME=
}
-# ------------------------------------------------------------------------------
-# @function-internal java-pkg-init-compiler_
-#
+# @FUNCTION: java-pkg-init-compiler_
+# @INTERNAL
+# @DESCRIPTION:
# This function attempts to figure out what compiler should be used. It does
# this by reading the file at JAVA_PKG_COMPILERS_CONF, and checking the
# COMPILERS variable defined there.
@@ -2230,8 +2107,7 @@
# by the current VM.
#
#
-# @return name of the compiler to use
-# ------------------------------------------------------------------------------
+# @RETURN name of the compiler to use
java-pkg_init-compiler_() {
debug-print-function ${FUNCNAME} $*
@@ -2321,12 +2197,11 @@
}
-# ------------------------------------------------------------------------------
-# @internal-function init_paths_
-#
+# @FUNCTION: init_paths_
+# @INTERNAL
+# @DESCRIPTION:
# Initializes some variables that will be used. These variables are mostly used
# to determine where things will eventually get installed.
-# ------------------------------------------------------------------------------
java-pkg_init_paths_() {
debug-print-function ${FUNCNAME} $*
@@ -2356,12 +2231,11 @@
debug-print "JAVA_PKG_WARDEST: ${JAVA_PKG_WARDEST}"
}
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_do_write_
-#
+# @FUNCTION: java-pkg_do_write_
+# @INTERNAL
+# @DESCRIPTION:
# Writes the package.env out to disk.
#
-# ------------------------------------------------------------------------------
# TODO change to do-write, to match everything else
java-pkg_do_write_() {
debug-print-function ${FUNCNAME} $*
@@ -2426,15 +2300,17 @@
fi
}
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_record-jar_
-#
+# @FUNCTION: java-pkg_record-jar_
+# @INTERNAL
+# @DESCRIPTION:
# 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
-# ------------------------------------------------------------------------------
+# @CODE
+# Parameters:
+# --optional - record dependency as optional
+# --build - record dependency as build_only
+# $1 - package to record
+# $2 - (optional) jar of package to record
+# @CODE
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"
@@ -2458,15 +2334,19 @@
echo "${append}" >> "${depend_file}"
}
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_append_
-#
+# @FUNCTION: java-pkg_append_
+# @INTERNAL
+# @DESCRIPTION:
# Appends a value to a variable
#
-# Example: java-pkg_append_ CLASSPATH foo.jar
-# @param $1 variable name to modify
-# @param $2 value to append
-# ------------------------------------------------------------------------------
+# @CODE
+# Parameters:
+# $1 variable name to modify
+# $2 value to append
+#
+# Examples:
+# java-pkg_append_ CLASSPATH foo.jar
+# @CODE
java-pkg_append_() {
debug-print-function ${FUNCNAME} $*
@@ -2487,37 +2367,34 @@
fi
}
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_expand_dir_
-#
+# @FUNCTION: java-pkg_expand_dir_
+# @INTERNAL
+# @DESCRIPTION:
# Gets the full path of the file/directory's parent.
-# @param $1 - file/directory to find parent directory for
-# @return - path to $1's parent directory
-# ------------------------------------------------------------------------------
+# @CODE
+# Parameters:
+# $1 - file/directory to find parent directory for
+# @CODE
+# @RETURN: path to $1's parent directory
java-pkg_expand_dir_() {
pushd "$(dirname "${1}")" >/dev/null 2>&1
pwd
popd >/dev/null 2>&1
}
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_func-exists
-#
+# @FUNCTION: java-pkg_func-exists
+# @INTERNAL
+# @DESCRIPTION:
# Does the indicated function exist?
-#
-# @return 0 - function is declared
-# @return 1 - function is undeclared
-# ------------------------------------------------------------------------------
+# @RETURN: 0 - function is declared, 1 - function is undeclared
java-pkg_func-exists() {
declare -F ${1} > /dev/null
}
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_setup-vm
-#
+# @FUNCTION: java-pkg_setup-vm
+# @INTERNAL
+# @DESCRIPTION:
# Sets up the environment for a specific VM
-#
-# ------------------------------------------------------------------------------
java-pkg_setup-vm() {
debug-print-function ${FUNCNAME} $*
@@ -2539,15 +2416,13 @@
fi
}
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_needs-vm
-#
+# @FUNCTION: java-pkg_needs-vm
+# @INTERNAL
+# @DESCRIPTION:
# Does the current package depend on virtual/jdk or does it set
# JAVA_PKG_WANT_BUILD_VM?
#
-# @return 0 - Package depends on virtual/jdk
-# @return 1 - Package does not depend on virtual/jdk
-# ------------------------------------------------------------------------------
+# @RETURN: 0 - Package depends on virtual/jdk; 1 - Package does not depend on virtual/jdk
java-pkg_needs-vm() {
debug-print-function ${FUNCNAME} $*
@@ -2560,20 +2435,16 @@
return 1
}
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_get-current-vm
-#
-# @return - The current VM being used
-# ------------------------------------------------------------------------------
+# @FUNCTION: java-pkg_get-current-vm
+# @INTERNAL
+# @RETURN - The current VM being used
java-pkg_get-current-vm() {
java-config -f
}
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_get-vm-vendor
-#
-# @return - The vendor of the current VM
-# ------------------------------------------------------------------------------
+# @FUNCTION: java-pkg_get-vm-vendor
+# @INTERNAL
+# @RETURN - The vendor of the current VM
java-pkg_get-vm-vendor() {
debug-print-function ${FUNCNAME} $*
@@ -2582,26 +2453,23 @@
echo "${vm}"
}
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_get-vm-version
-#
-# @return - The version of the current VM
-# ------------------------------------------------------------------------------
+# @FUNCTION: java-pkg_get-vm-version
+# @INTERNAL
+# @RETURN - The version of the current VM
java-pkg_get-vm-version() {
debug-print-function ${FUNCNAME} $*
java-config -g PROVIDES_VERSION
}
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_build-vm-from-handle
-#
+# @FUNCTION: java-pkg_build-vm-from-handle
+# @INTERNAL
+# @DESCRIPTION:
# Selects a build vm from a list of vm handles. First checks for the system-vm
# beeing usable, then steps through the listed handles till a suitable vm is
# found.
#
-# @return - VM handle of an available JDK
-# ------------------------------------------------------------------------------
+# @RETURN - VM handle of an available JDK
java-pkg_build-vm-from-handle() {
debug-print-function ${FUNCNAME} "$*"
@@ -2625,13 +2493,12 @@
return 1
}
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_switch-vm
-#
+# @FUNCTION: java-pkg_switch-vm
+# @INTERNAL
+# @DESCRIPTION:
# Switch VM if we're allowed to (controlled by JAVA_PKG_ALLOW_VM_CHANGE), and
# verify that the current VM is sufficient.
# Setup the environment for the VM being used.
-# ------------------------------------------------------------------------------
java-pkg_switch-vm() {
debug-print-function ${FUNCNAME} $*
@@ -2709,12 +2576,11 @@
fi
}
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_die
-#
+# @FUNCTION: java-pkg_die
+# @INTERNAL
+# @DESCRIPTION:
# Enhanced die for Java packages, which displays some information that may be
# useful for debugging bugs on bugzilla.
-# ------------------------------------------------------------------------------
#register_die_hook java-pkg_die
if ! has java-pkg_die ${EBUILD_DEATH_HOOKS}; then
EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} java-pkg_die"
@@ -2741,13 +2607,14 @@
fi
}
-# ------------------------------------------------------------------------------
-# @internal-function java-pkg_verify-classes
-#
+# @FUNCTION: java-pkg_verify-classes
+# @INTERNAL
+# @DESCRIPTION:
# Verify that the classes were compiled for the right source / target. Dies if
# not.
-# @param $1 (optional) - the file to check, otherwise checks whole ${D}
-# ------------------------------------------------------------------------------
+# @CODE
+# $1 (optional) - the file to check, otherwise checks whole ${D}
+# @CODE
java-pkg_verify-classes() {
#$(find ${D} -type f -name '*.jar' -o -name '*.class')
@@ -2785,14 +2652,17 @@
fi
}
-# ----------------------------------------------------------------------------
-# @internal-function java-pkg_ensure-dep
+# @FUNCTION: java-pkg_ensure-dep
+# @INTERNAL
+# @DESCRIPTION:
# Check that a package being used in jarfrom, getjars and getjar is contained
# within DEPEND or RDEPEND.
-# @param $1 - empty - check both vars; "runtime" or "build" - check only
+# @CODE
+# Parameters:
+# $1 - empty - check both vars; "runtime" or "build" - check only
# RDEPEND, resp. DEPEND
-# @param $2 - Package name and slot.
-
+# $2 - Package name and slot.
+# @CODE
java-pkg_ensure-dep() {
debug-print-function ${FUNCNAME} $*
@@ -2840,10 +2710,6 @@
fi
}
-# ------------------------------------------------------------------------------
-# @section-end internal
-# ------------------------------------------------------------------------------
-
java-pkg_check-phase() {
local phase=${1}
local funcname=${FUNCNAME[1]}
@@ -2887,8 +2753,3 @@
[[ -n ${JAVA_PKG_STRICT} ]]
return $?
}
-
-
-# ------------------------------------------------------------------------------
-# @eclass-end
-# ------------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
@ 2014-04-09 21:55 Tim Harder (radhermit)
0 siblings, 0 replies; 18+ messages in thread
From: Tim Harder (radhermit) @ 2014-04-09 21:55 UTC (permalink / raw
To: gentoo-commits
radhermit 14/04/09 21:55:12
Modified: ChangeLog java-utils-2.eclass
Log:
Only refer to DESTTREE within the src_install phase.
Revision Changes Path
1.1202 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1202&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1202&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1201&r2=1.1202
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1201
retrieving revision 1.1202
diff -u -r1.1201 -r1.1202
--- ChangeLog 9 Apr 2014 21:34:10 -0000 1.1201
+++ ChangeLog 9 Apr 2014 21:55:12 -0000 1.1202
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1201 2014/04/09 21:34:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1202 2014/04/09 21:55:12 radhermit Exp $
+
+ 09 Apr 2014; Tim Harder <radhermit@gentoo.org> java-utils-2.eclass:
+ Only refer to DESTTREE within the src_install phase.
09 Apr 2014; Michał Górny <mgorny@gentoo.org> python-r1.eclass:
Re-enable the python_gen_usedep empty argument check.
1.156 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.156&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.156&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.155&r2=1.156
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- java-utils-2.eclass 6 Oct 2013 14:37:31 -0000 1.155
+++ java-utils-2.eclass 9 Apr 2014 21:55:12 -0000 1.156
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.155 2013/10/06 14:37:31 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.156 2014/04/09 21:55:12 radhermit Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -192,6 +192,7 @@
[[ ${#} -lt 1 ]] && die "At least one argument needed"
java-pkg_check-phase install
+ java-pkg_init_paths_
local dest=/usr/share/doc/${PF}/examples
if [[ ${1} == --subdir ]]; then
@@ -543,6 +544,7 @@
# QA checks
java-pkg_check-phase install
+ java-pkg_init_paths_
[[ -z "${dir}" ]] && die "Must specify a directory!"
[[ ! -d "${dir}" ]] && die "${dir} does not exist, or isn't a directory!"
@@ -2060,7 +2062,6 @@
java-pkg_announce-qa-violation "Using old ant_src_unpack. Should be src_unpack"
fi
- java-pkg_init_paths_
java-pkg_switch-vm
PATH=${JAVA_HOME}/bin:${PATH}
@@ -2222,7 +2223,6 @@
[[ -z "${JAVA_PKG_LIBDEST}" ]] && JAVA_PKG_LIBDEST="${DESTTREE}/$(get_libdir)/${JAVA_PKG_NAME}"
[[ -z "${JAVA_PKG_WARDEST}" ]] && JAVA_PKG_WARDEST="${JAVA_PKG_SHAREPATH}/webapps"
-
# TODO maybe only print once?
debug-print "JAVA_PKG_SHAREPATH: ${JAVA_PKG_SHAREPATH}"
debug-print "JAVA_PKG_ENV: ${JAVA_PKG_ENV}"
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
@ 2015-04-14 14:08 James Le Cuirot (chewi)
0 siblings, 0 replies; 18+ messages in thread
From: James Le Cuirot (chewi) @ 2015-04-14 14:08 UTC (permalink / raw
To: gentoo-commits
chewi 15/04/14 14:08:34
Modified: ChangeLog java-utils-2.eclass
Log:
Consider SLOTs when checking Java dependencies. Comment out the longer
error message for now to avoid spamming both users and ourselves
because this issue is currently widespread.
Revision Changes Path
1.1587 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1587&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1587&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1586&r2=1.1587
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1586
retrieving revision 1.1587
diff -u -r1.1586 -r1.1587
--- ChangeLog 11 Apr 2015 17:11:22 -0000 1.1586
+++ ChangeLog 14 Apr 2015 14:08:34 -0000 1.1587
@@ -1,6 +1,11 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1586 2015/04/11 17:11:22 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1587 2015/04/14 14:08:34 chewi Exp $
+
+ 14 Apr 2015; James Le Cuirot <chewi@gentoo.org> java-utils-2.eclass:
+ Consider SLOTs when checking Java dependencies. Comment out the longer error
+ message for now to avoid spamming both users and ourselves because this issue
+ is currently widespread.
11 Apr 2015; Michael Palimaka <kensington@gentoo.org> kde5-functions.eclass,
kde5.eclass:
1.158 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.158&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.158&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.157&r2=1.158
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- java-utils-2.eclass 4 Apr 2015 21:04:49 -0000 1.157
+++ java-utils-2.eclass 14 Apr 2015 14:08:34 -0000 1.158
@@ -2,11 +2,11 @@
#
# Copyright (c) 2004-2005, Thomas Matthijs <axxo@gentoo.org>
# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org>
-# Copyright (c) 2004-2011, Gentoo Foundation
+# Copyright (c) 2004-2015, Gentoo Foundation
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.157 2015/04/04 21:04:49 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.158 2015/04/14 14:08:34 chewi Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -2687,42 +2687,54 @@
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]*\]\)*\)*\(\.\([0-9*]*\(\[[0-9]*\]\)*\)*\)*$//')
+ # Transform into a regular expression to look for a matching package
+ # and SLOT. SLOTs don't have to be numeric so foo-bar could either
+ # mean foo-bar:0 or foo:bar. So you want to get your head around the
+ # line below?
+ #
+ # * The target package first has any dots escaped, e.g. foo-1.2
+ # becomes foo-1\.2.
+ #
+ # * sed then looks at the component following the last - character,
+ # or the whole string if there is no - character. It uses this to
+ # build a new regexp with two significant branches.
+ #
+ # * The first checks for the whole target package string, optionally
+ # followed by a version number, and then :0.
+ #
+ # * The second checks for the first part of the target package
+ # string, optionally followed by a version number, followed by the
+ # aforementioned component, treating that as a SLOT.
+ #
+ local stripped_pkg=/$(sed -r 's/-?([^-]+)$/(\0(-[^:]+)?:0|(-[^:]+)?:\1)/' <<< "${target_pkg//./\\.}")\\b
debug-print "Matching against: ${stripped_pkg}"
- if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ "$stripped_pkg" ) ]]; then
- dev_error="The ebuild is attempting to use ${target_pkg} that is not"
- dev_error="${dev_error} declared in DEPEND."
+ if [[ ${limit_to} != runtime && ! ( "${DEPEND}" =~ $stripped_pkg ) ]]; then
+ dev_error="The ebuild is attempting to use ${target_pkg}, which is not "
+ dev_error+="declared with a SLOT in DEPEND."
if is-java-strict; then
- eerror "${dev_error}"
die "${dev_error}"
- elif [[ ${BASH_SUBSHELL} = 0 ]]; then
- eerror "${dev_error}"
- elog "Because you have this package installed the package will"
- elog "build without problems, but please report this to"
- elog "http://bugs.gentoo.org"
- fi
- fi
-
- if [[ ${limit_to} != build ]]; then
- if [[ ! ( ${RDEPEND} =~ "${stripped_pkg}" ) ]]; then
- if [[ ! ( ${PDEPEND} =~ "${stripped_pkg}" ) ]]; then
- dev_error="The ebuild is attempting to use ${target_pkg},"
- dev_error="${dev_error} without specifying --build-only, that is not declared in RDEPEND"
- dev_error="${dev_error} or PDEPEND."
- if is-java-strict; then
- eerror "${dev_error}"
- die "${dev_error}"
- elif [[ ${BASH_SUBSHELL} = 0 ]]; then
- eerror "${dev_error}"
- elog "The package will build without problems, but may fail to run"
- elog "if you don't have ${target_pkg} installed, so please report"
- elog "this to http://bugs.gentoo.org"
- fi
- fi
+ else
+ eqawarn "${dev_error}"
+ # Uncomment this once we've dealt with more of these or
+ # we'll get hit with a wave of bug reports. :(
+# eerror "Because you have ${target_pkg} installed,"
+# eerror "the package will build without problems, but please"
+# eerror "report this to http://bugs.gentoo.org."
+ fi
+ elif [[ ${limit_to} != build && ! ( "${RDEPEND}${PDEPEND}" =~ ${stripped_pkg} ) ]]; then
+ dev_error="The ebuild is attempting to use ${target_pkg}, which is not "
+ dev_error+="declared with a SLOT in [RP]DEPEND and --build-only wasn't given."
+ if is-java-strict; then
+ die "${dev_error}"
+ else
+ eqawarn "${dev_error}"
+ # Uncomment this once we've dealt with more of these or
+ # we'll get hit with a wave of bug reports. :(
+# eerror "The package will build without problems, but may fail to run"
+# eerror "if you don't have ${target_pkg} installed,"
+# eerror "so please report this to http://bugs.gentoo.org."
fi
fi
}
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
@ 2015-05-02 20:23 James Le Cuirot (chewi)
0 siblings, 0 replies; 18+ messages in thread
From: James Le Cuirot (chewi) @ 2015-05-02 20:23 UTC (permalink / raw
To: gentoo-commits
chewi 15/05/02 20:23:56
Modified: ChangeLog java-utils-2.eclass
Log:
Make java-pkg_doso always install with mode 0755, which is more like
dolib.so. Closes bug #225729.
Revision Changes Path
1.1600 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1600&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1600&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1599&r2=1.1600
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1599
retrieving revision 1.1600
diff -u -r1.1599 -r1.1600
--- ChangeLog 1 May 2015 12:34:31 -0000 1.1599
+++ ChangeLog 2 May 2015 20:23:56 -0000 1.1600
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1599 2015/05/01 12:34:31 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1600 2015/05/02 20:23:56 chewi Exp $
+
+ 02 May 2015; James Le Cuirot <chewi@gentoo.org> java-utils-2.eclass:
+ Make java-pkg_doso always install with mode 0755, which is more like
+ dolib.so. Closes bug #225729.
01 May 2015; <grknight@gentoo.org> mysql.eclass, mysql-multilib.eclass,
mysql-v2.eclass:
1.160 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.160&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.160&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.159&r2=1.160
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- java-utils-2.eclass 28 Apr 2015 20:35:40 -0000 1.159
+++ java-utils-2.eclass 2 May 2015 20:23:56 -0000 1.160
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.159 2015/04/28 20:35:40 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.160 2015/05/02 20:23:56 chewi Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -412,7 +412,7 @@
# install if it isn't a symlink
if [[ ! -L "${lib}" ]] ; then
INSDESTTREE="${JAVA_PKG_LIBDEST}" \
- INSOPTIONS="${LIBOPTIONS}" \
+ INSOPTIONS="-m0755" \
doins "${lib}" || die "failed to install ${lib}"
java-pkg_append_ JAVA_PKG_LIBRARY "${JAVA_PKG_LIBDEST}"
debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}"
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
@ 2015-05-24 22:44 James Le Cuirot (chewi)
0 siblings, 0 replies; 18+ messages in thread
From: James Le Cuirot (chewi) @ 2015-05-24 22:44 UTC (permalink / raw
To: gentoo-commits
chewi 15/05/24 22:44:37
Modified: ChangeLog java-utils-2.eclass
Log:
The depend-java-query wrapper is raising readonly variable warnings
for USE in Portage 2.2.20. As best I can tell, this wrapper just isn't
needed any more because USE is already exported. I guess it wasn't
back in 2006?
Revision Changes Path
1.1621 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1621&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1621&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1620&r2=1.1621
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1620
retrieving revision 1.1621
diff -u -r1.1620 -r1.1621
--- ChangeLog 24 May 2015 20:40:40 -0000 1.1620
+++ ChangeLog 24 May 2015 22:44:37 -0000 1.1621
@@ -1,6 +1,11 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1620 2015/05/24 20:40:40 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1621 2015/05/24 22:44:37 chewi Exp $
+
+ 24 May 2015; James Le Cuirot <chewi@gentoo.org> java-utils-2.eclass:
+ The depend-java-query wrapper is raising readonly variable warnings for USE
+ in Portage 2.2.20. As best I can tell, this wrapper just isn't needed any
+ more because USE is already exported. I guess it wasn't back in 2006?
24 May 2015; James Le Cuirot <chewi@gentoo.org> java-pkg-simple.eclass:
Remove annoying java-pkg-simple build script check. Most people only use
1.162 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.162&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.162&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.161&r2=1.162
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- java-utils-2.eclass 9 May 2015 22:20:44 -0000 1.161
+++ java-utils-2.eclass 24 May 2015 22:44:37 -0000 1.162
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.161 2015/05/09 22:20:44 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.162 2015/05/24 22:44:37 chewi Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -282,18 +282,6 @@
java-pkg_do_write_
}
-# @FUNCTION: depend-java-query
-# @INTERNAL
-# @DESCRIPTION:
-# Wrapper for the depend-java-query binary to enable passing USE in env.
-# Using env variables keeps this eclass working with java-config versions that
-# do not handle use flags.
-depend-java-query() {
- # Used to have a which call here but it caused endless loops for some people
- # that had some weird bashrc voodoo for which.
- USE="${USE}" /usr/bin/depend-java-query "${@}"
-}
-
# @FUNCTION: java-pkg_regjar
# @USAGE: </path/to/installed/jar>
# @DESCRIPTION:
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
@ 2015-06-15 21:09 James Le Cuirot (chewi)
0 siblings, 0 replies; 18+ messages in thread
From: James Le Cuirot (chewi) @ 2015-06-15 21:09 UTC (permalink / raw
To: gentoo-commits
chewi 15/06/15 21:09:06
Modified: ChangeLog java-utils-2.eclass
Log:
Add java-pkg_addres function for adding resource files to an existing
jar.
Revision Changes Path
1.1665 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1665&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1665&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1664&r2=1.1665
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1664
retrieving revision 1.1665
diff -u -r1.1664 -r1.1665
--- ChangeLog 15 Jun 2015 19:09:28 -0000 1.1664
+++ ChangeLog 15 Jun 2015 21:09:06 -0000 1.1665
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1664 2015/06/15 19:09:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1665 2015/06/15 21:09:06 chewi Exp $
+
+ 15 Jun 2015; James Le Cuirot <chewi@gentoo.org> java-utils-2.eclass:
+ Add java-pkg_addres function for adding resource files to an existing jar.
15 Jun 2015; Justin Lecher <jlec@gentoo.org> intel-sdp.eclass:
Don't install uninstall informations, bug 551638; make use of path_exists()
1.163 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.163&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.163&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.162&r2=1.163
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- java-utils-2.eclass 24 May 2015 22:44:37 -0000 1.162
+++ java-utils-2.eclass 15 Jun 2015 21:09:06 -0000 1.163
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.162 2015/05/24 22:44:37 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.163 2015/06/15 21:09:06 chewi Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -217,6 +217,37 @@
dosym "${dest}" "${JAVA_PKG_SHAREPATH}/examples" || die
}
+# @FUNCTION: java-pkg_addres
+# @USAGE: <jar> <dir> [<find arguments> ...]
+# @DESCRIPTION:
+# Adds resource files to an existing jar.
+# It is important that the directory given is actually the root of the
+# corresponding resource tree. The target directory as well as
+# sources.lst, MANIFEST.MF, *.class, *.jar, and *.java files are
+# automatically excluded. Symlinks are always followed. Additional
+# arguments are passed through to find.
+#
+# @CODE
+# java-pkg_addres ${PN}.jar resources ! -name "*.html"
+# @CODE
+#
+# @param $1 - jar file
+# @param $2 - resource tree directory
+# @param $* - arguments to pass to find
+java-pkg_addres() {
+ debug-print-function ${FUNCNAME} $*
+
+ [[ ${#} -lt 2 ]] && die "at least two arguments needed"
+
+ local jar=$(realpath "$1" || die "realpath $1 failed")
+ local dir="$2"
+ shift 2
+
+ pushd "${dir}" > /dev/null || die "pushd ${dir} failed"
+ find -L -type f ! -path "./target/*" ! -path "./sources.lst" ! -name "MANIFEST.MF" ! -regex ".*\.\(class\|jar\|java\)" "${@}" -print0 | xargs -0 jar uf "${jar}" || die "jar failed"
+ popd > /dev/null || die "popd failed"
+}
+
# @FUNCTION: java-pkg_dojar
# @USAGE: <jar1> [<jar2> ...]
# @DESCRIPTION:
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
@ 2015-06-19 14:11 James Le Cuirot (chewi)
0 siblings, 0 replies; 18+ messages in thread
From: James Le Cuirot (chewi) @ 2015-06-19 14:11 UTC (permalink / raw
To: gentoo-commits
chewi 15/06/19 14:11:24
Modified: ChangeLog java-utils-2.eclass
Log:
Allow EANT_GENTOO_CLASSPATH_EXTRA to work when EANT_GENTOO_CLASSPATH
is unset.
Revision Changes Path
1.1676 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1676&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1676&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1675&r2=1.1676
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1675
retrieving revision 1.1676
diff -u -r1.1675 -r1.1676
--- ChangeLog 18 Jun 2015 15:19:04 -0000 1.1675
+++ ChangeLog 19 Jun 2015 14:11:24 -0000 1.1676
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1675 2015/06/18 15:19:04 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1676 2015/06/19 14:11:24 chewi Exp $
+
+ 19 Jun 2015; James Le Cuirot <chewi@gentoo.org> java-utils-2.eclass:
+ Allow EANT_GENTOO_CLASSPATH_EXTRA to work when EANT_GENTOO_CLASSPATH is
+ unset.
18 Jun 2015; William Hubbs <williamh@gentoo.org> golang-vcs.eclass:
Add the EGO_SRC variable for repositories that contain multiple Go
1.164 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.164&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.164&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.163&r2=1.164
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- java-utils-2.eclass 15 Jun 2015 21:09:06 -0000 1.163
+++ java-utils-2.eclass 19 Jun 2015 14:11:24 -0000 1.164
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.163 2015/06/15 21:09:06 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.164 2015/06/19 14:11:24 chewi Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -1934,17 +1934,15 @@
local cp
for atom in ${gcp}; do
- cp="${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})"
+ cp+=":$(java-pkg_getjars ${getjarsarg} ${atom})"
done
- [[ -n "${EANT_NEEDS_TOOLS}" ]] && cp="${cp}:$(java-config --tools)"
+ [[ ${EANT_NEEDS_TOOLS} ]] && cp+=":$(java-config --tools)"
+ [[ ${EANT_GENTOO_CLASSPATH_EXTRA} ]] && cp+=":${EANT_GENTOO_CLASSPATH_EXTRA}"
- if [[ ${cp} ]]; then
+ if [[ ${cp#:} ]]; then
# It seems ant does not like single quotes around ${cp}
- cp=${cp#:}
- [[ ${EANT_GENTOO_CLASSPATH_EXTRA} ]] && \
- cp="${cp}:${EANT_GENTOO_CLASSPATH_EXTRA}"
- antflags="${antflags} -Dgentoo.classpath=\"${cp}\""
+ antflags="${antflags} -Dgentoo.classpath=\"${cp#:}\""
fi
[[ -n ${JAVA_PKG_DEBUG} ]] && echo ant ${antflags} "${@}"
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
@ 2015-06-28 13:33 James Le Cuirot (chewi)
0 siblings, 0 replies; 18+ messages in thread
From: James Le Cuirot (chewi) @ 2015-06-28 13:33 UTC (permalink / raw
To: gentoo-commits
chewi 15/06/28 13:33:48
Modified: ChangeLog java-utils-2.eclass
Log:
The -source flag was added in 1.3 or 1.4 (not sure) and we have
special code to handle this but no one in their right mind would build
with 1.2 or 1.3 now. Removing this code allows the ecj-gcj ebuild to
call java-pkg_javac-args without a proper VM present.
Revision Changes Path
1.1693 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1693&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1693&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1692&r2=1.1693
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1692
retrieving revision 1.1693
diff -u -r1.1692 -r1.1693
--- ChangeLog 28 Jun 2015 13:12:52 -0000 1.1692
+++ ChangeLog 28 Jun 2015 13:33:48 -0000 1.1693
@@ -1,6 +1,12 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1692 2015/06/28 13:12:52 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1693 2015/06/28 13:33:48 chewi Exp $
+
+ 28 Jun 2015; James Le Cuirot <chewi@gentoo.org> java-utils-2.eclass:
+ The -source flag was added in 1.3 or 1.4 (not sure) and we have special code
+ to handle this but no one in their right mind would build with 1.2 or 1.3
+ now. Removing this code allows the ecj-gcj ebuild to call java-pkg_javac-args
+ without a proper VM present.
28 Jun 2015; Johannes Huber <johu@gentoo.org> kde5.eclass:
Loop optimization as suggested by Michal Górny <mgorny@gentoo.org> on -dev
1.165 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.165&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.165&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.164&r2=1.165
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- java-utils-2.eclass 19 Jun 2015 14:11:24 -0000 1.164
+++ java-utils-2.eclass 28 Jun 2015 13:33:48 -0000 1.165
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.164 2015/06/19 14:11:24 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.165 2015/06/28 13:33:48 chewi Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -1592,11 +1592,7 @@
echo "Could not find valid -source/-target values for javac"
return 1
else
- if java-pkg_is-vm-version-ge "1.4"; then
- echo "${source_str} ${target_str}"
- else
- echo "${target_str}"
- fi
+ echo "${source_str} ${target_str}"
fi
}
@@ -2190,14 +2186,11 @@
continue
fi
- # -source was introduced in 1.3, so only check 1.3 and on
- if version_is_at_least "${desired_soure}" "1.3"; then
- # Verify that the compiler supports source
- local supported_source=$(source ${compiler_env} 1>/dev/null 2>&1; echo ${SUPPORTED_SOURCE})
- if ! has ${desired_source} ${supported_source}; then
- ewarn "${compiler} does not support -source ${desired_source}, skipping"
- continue
- fi
+ # Verify that the compiler supports source
+ local supported_source=$(source ${compiler_env} 1>/dev/null 2>&1; echo ${SUPPORTED_SOURCE})
+ if ! has ${desired_source} ${supported_source}; then
+ ewarn "${compiler} does not support -source ${desired_source}, skipping"
+ continue
fi
# if you get here, then the compiler should be good to go
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
@ 2015-07-22 9:20 Patrice Clement (monsieurp)
0 siblings, 0 replies; 18+ messages in thread
From: Patrice Clement (monsieurp) @ 2015-07-22 9:20 UTC (permalink / raw
To: gentoo-commits
monsieurp 15/07/22 09:20:07
Modified: ChangeLog java-utils-2.eclass
Log:
Introduce java-pkg_rm_files as a helper function along with JAVA_RM_FILES array to readily get rid of useless files. Derived from perl_rm_files by Kent Fredric.
Revision Changes Path
1.1724 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1724&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1724&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1723&r2=1.1724
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1723
retrieving revision 1.1724
diff -u -r1.1723 -r1.1724
--- ChangeLog 20 Jul 2015 15:05:49 -0000 1.1723
+++ ChangeLog 22 Jul 2015 09:20:07 -0000 1.1724
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1723 2015/07/20 15:05:49 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1724 2015/07/22 09:20:07 monsieurp Exp $
+
+ 22 Jul 2015; Patrice Clement <monsieurp@gentoo.org> java-utils-2.eclass:
+ Introduce java-pkg_rm_files as a helper function along with JAVA_RM_FILES
+ array to readily get rid of useless files.
20 Jul 2015; Sergei Trofimovich <slyfox@gentoo.org> haskell-cabal.eclass:
Workaround upstream cabal tests hangup bug #537500 by Michael Orlitzky; use
1.166 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.166&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.166&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.165&r2=1.166
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- java-utils-2.eclass 28 Jun 2015 13:33:48 -0000 1.165
+++ java-utils-2.eclass 22 Jul 2015 09:20:07 -0000 1.166
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.165 2015/06/28 13:33:48 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.166 2015/07/22 09:20:07 monsieurp Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -248,6 +248,46 @@
popd > /dev/null || die "popd failed"
}
+# @FUNCTION: java-pkg_rm_files
+# @USAGE: java-pkg_rm_files File1.java File2.java ...
+# @DESCRIPTION:
+# Remove unneeded files in ${S}.
+#
+# Every now and then, you'll run into situations whereby a file needs removing,
+# be it a unit test or a regular java class.
+#
+# You can use this function by either:
+# - calling it yourself in java_prepare() and feeding java-pkg_rm_files with
+# the list of files you wish to remove.
+# - defining an array in the ebuild named JAVA_RM_FILES with the list of files
+# you wish to remove.
+#
+# Both way work and it is left to the developer's preferences. If the
+# JAVA_RM_FILES array is defined, it is will be automatically handed over to
+# java-pkg_rm_files.
+#
+# See java-utils-2_src_prepare.
+#
+# @CODE
+#
+# @param $* - list of files to remove.
+# JAVA_RM_FILES - array containing files to remove.
+# if defined, automatically handed over to java-pkg_rm_files in java-utils-2_src_prepare.
+#
+# @CODE
+java-pkg_rm_files() {
+ debug-print-function ${FUNCNAME} $*
+ OIFS="$IFS"
+ IFS="\n"
+ for filename in "$@"; do
+ [[ ! -f "${filename}" ]] && die "${filename} is not a regular file. Aborting."
+ einfo "Removing unneeded file ${filename}"
+ rm -f "${S}/${filename}" || die "cannot remove ${filename}"
+ eend $?
+ done
+ IFS="$OIFS"
+}
+
# @FUNCTION: java-pkg_dojar
# @USAGE: <jar1> [<jar2> ...]
# @DESCRIPTION:
@@ -1782,6 +1822,12 @@
[[ ${EBUILD_PHASE} == prepare ]] &&
java-pkg_func-exists java_prepare && java_prepare
+ # Check for files in JAVA_RM_FILES array.
+ if [[ ${JAVA_RM_FILES[@]} ]]; then
+ debug-print "$FUNCNAME: removing unneeded files"
+ java-pkg_rm_files "${JAVA_RM_FILES[@]}"
+ fi
+
# 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:"
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
@ 2015-07-30 22:17 James Le Cuirot (chewi)
0 siblings, 0 replies; 18+ messages in thread
From: James Le Cuirot (chewi) @ 2015-07-30 22:17 UTC (permalink / raw
To: gentoo-commits
chewi 15/07/30 22:17:09
Modified: ChangeLog java-utils-2.eclass
Log:
Fix JAVA_RM_FILES by simplifying java-utils-2_src_prepare on the basis
that we won't be committing EAPI 0|1 ebuilds any more.
Revision Changes Path
1.1740 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1740&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1740&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1739&r2=1.1740
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1739
retrieving revision 1.1740
diff -u -r1.1739 -r1.1740
--- ChangeLog 30 Jul 2015 20:34:57 -0000 1.1739
+++ ChangeLog 30 Jul 2015 22:17:08 -0000 1.1740
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1739 2015/07/30 20:34:57 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1740 2015/07/30 22:17:08 chewi Exp $
+
+ 30 Jul 2015; James Le Cuirot <chewi@gentoo.org> java-utils-2.eclass:
+ Fix JAVA_RM_FILES by simplifying java-utils-2_src_prepare on the basis that
+ we won't be committing EAPI 0|1 ebuilds any more.
30 Jul 2015; Brian Evans <grknight@gentoo.org> mysql-multilib.eclass:
Revert bad mycmakeargs changes and introduce 3 eclass variables to have extra
1.167 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.167&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.167&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.166&r2=1.167
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- java-utils-2.eclass 22 Jul 2015 09:20:07 -0000 1.166
+++ java-utils-2.eclass 30 Jul 2015 22:17:08 -0000 1.167
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.166 2015/07/22 09:20:07 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.167 2015/07/30 22:17:08 chewi Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -1819,8 +1819,7 @@
# src_prepare Searches for bundled jars
# Don't call directly, but via java-pkg-2_src_prepare!
java-utils-2_src_prepare() {
- [[ ${EBUILD_PHASE} == prepare ]] &&
- java-pkg_func-exists java_prepare && java_prepare
+ java-pkg_func-exists java_prepare && java_prepare
# Check for files in JAVA_RM_FILES array.
if [[ ${JAVA_RM_FILES[@]} ]]; then
@@ -1828,15 +1827,13 @@
java-pkg_rm_files "${JAVA_RM_FILES[@]}"
fi
- # Remember that eant will call this unless called via Portage
- if [[ ! -e "${T}/java-utils-2_src_prepare-run" ]] && is-java-strict; then
+ if is-java-strict; then
echo "Searching for bundled jars:"
java-pkg_find-normal-jars || echo "None found."
echo "Searching for bundled classes (no output if none found):"
find "${WORKDIR}" -name "*.class"
echo "Search done."
fi
- touch "${T}/java-utils-2_src_prepare-run"
}
# @FUNCTION: java-utils-2_pkg_preinst
@@ -1879,7 +1876,6 @@
if [[ ${EBUILD_PHASE} = compile ]]; then
java-ant-2_src_configure
- java-utils-2_src_prepare
fi
if ! has java-ant-2 ${INHERITED}; then
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
@ 2015-07-31 7:56 Patrice Clement (monsieurp)
0 siblings, 0 replies; 18+ messages in thread
From: Patrice Clement (monsieurp) @ 2015-07-31 7:56 UTC (permalink / raw
To: gentoo-commits
monsieurp 15/07/31 07:56:17
Modified: ChangeLog java-utils-2.eclass
Log:
Document JAVA_RM_FILES variable. Also, fix documentation and correct typos in java-pkg_rm_files.
Revision Changes Path
1.1741 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1741&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1741&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1740&r2=1.1741
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1740
retrieving revision 1.1741
diff -u -r1.1740 -r1.1741
--- ChangeLog 30 Jul 2015 22:17:08 -0000 1.1740
+++ ChangeLog 31 Jul 2015 07:56:17 -0000 1.1741
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1740 2015/07/30 22:17:08 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1741 2015/07/31 07:56:17 monsieurp Exp $
+
+ 31 Jul 2015; Patrice Clement <monsieurp@gentoo.org> java-utils-2.eclass:
+ Document JAVA_RM_FILES variable. Also, fix documentation and correct typos in
+ java-pkg_rm_files.
30 Jul 2015; James Le Cuirot <chewi@gentoo.org> java-utils-2.eclass:
Fix JAVA_RM_FILES by simplifying java-utils-2_src_prepare on the basis that
1.168 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.168&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.168&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.167&r2=1.168
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- java-utils-2.eclass 30 Jul 2015 22:17:08 -0000 1.167
+++ java-utils-2.eclass 31 Jul 2015 07:56:17 -0000 1.168
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.167 2015/07/30 22:17:08 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.168 2015/07/31 07:56:17 monsieurp Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -126,6 +126,20 @@
# JAVA_PKG_WANT_TARGET=1.3 emerge bar
# @CODE
+# @ECLASS-VARIABLE: JAVA_RM_FILES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# An array containing a list of files to remove. If defined, this array will be
+# automatically handed over to java-pkg_rm_files for processing during the
+# src_prepare phase.
+#
+# @CODE
+# JAVA_RM_FILES=(
+# path/to/File1.java
+# DELETEME.txt
+# )
+# @CODE
+
# @VARIABLE: JAVA_PKG_COMPILER_DIR
# @INTERNAL
# @DESCRIPTION:
@@ -263,29 +277,25 @@
# you wish to remove.
#
# Both way work and it is left to the developer's preferences. If the
-# JAVA_RM_FILES array is defined, it is will be automatically handed over to
-# java-pkg_rm_files.
+# JAVA_RM_FILES array is defined, it will be automatically handed over to
+# java-pkg_rm_files during the src_prepare phase.
#
# See java-utils-2_src_prepare.
#
# @CODE
+# java-pkg_rm_files File1.java File2.java
+# @CODE
#
# @param $* - list of files to remove.
-# JAVA_RM_FILES - array containing files to remove.
-# if defined, automatically handed over to java-pkg_rm_files in java-utils-2_src_prepare.
-#
-# @CODE
java-pkg_rm_files() {
debug-print-function ${FUNCNAME} $*
- OIFS="$IFS"
- IFS="\n"
+ local IFS="\n"
for filename in "$@"; do
[[ ! -f "${filename}" ]] && die "${filename} is not a regular file. Aborting."
einfo "Removing unneeded file ${filename}"
rm -f "${S}/${filename}" || die "cannot remove ${filename}"
eend $?
done
- IFS="$OIFS"
}
# @FUNCTION: java-pkg_dojar
^ permalink raw reply [flat|nested] 18+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
@ 2015-08-02 23:12 James Le Cuirot (chewi)
0 siblings, 0 replies; 18+ messages in thread
From: James Le Cuirot (chewi) @ 2015-08-02 23:12 UTC (permalink / raw
To: gentoo-commits
chewi 15/08/02 23:12:16
Modified: ChangeLog java-utils-2.eclass
Log:
Allow java-pkg_get-javac to be called alone. Fixes bug #172594. Thanks
to sping for the patch. Also simplify die logic around
java-pkg_javac-args. die handling has improved since this was written.
Revision Changes Path
1.1742 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1742&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1742&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1741&r2=1.1742
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1741
retrieving revision 1.1742
diff -u -r1.1741 -r1.1742
--- ChangeLog 31 Jul 2015 07:56:17 -0000 1.1741
+++ ChangeLog 2 Aug 2015 23:12:16 -0000 1.1742
@@ -1,6 +1,11 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1741 2015/07/31 07:56:17 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1742 2015/08/02 23:12:16 chewi Exp $
+
+ 02 Aug 2015; James Le Cuirot <chewi@gentoo.org> java-utils-2.eclass:
+ Allow java-pkg_get-javac to be called alone. Fixes bug #172594. Thanks to
+ sping for the patch. Also simplify die logic around java-pkg_javac-args. die
+ handling has improved since this was written.
31 Jul 2015; Patrice Clement <monsieurp@gentoo.org> java-utils-2.eclass:
Document JAVA_RM_FILES variable. Also, fix documentation and correct typos in
1.169 eclass/java-utils-2.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.169&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.169&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.168&r2=1.169
Index: java-utils-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- java-utils-2.eclass 31 Jul 2015 07:56:17 -0000 1.168
+++ java-utils-2.eclass 2 Aug 2015 23:12:16 -0000 1.169
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.168 2015/07/31 07:56:17 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.169 2015/08/02 23:12:16 chewi Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -262,14 +262,14 @@
popd > /dev/null || die "popd failed"
}
-# @FUNCTION: java-pkg_rm_files
+# @FUNCTION: java-pkg_rm_files
# @USAGE: java-pkg_rm_files File1.java File2.java ...
# @DESCRIPTION:
# Remove unneeded files in ${S}.
#
# Every now and then, you'll run into situations whereby a file needs removing,
# be it a unit test or a regular java class.
-#
+#
# You can use this function by either:
# - calling it yourself in java_prepare() and feeding java-pkg_rm_files with
# the list of files you wish to remove.
@@ -1583,7 +1583,7 @@
java-pkg_get-javac() {
debug-print-function ${FUNCNAME} $*
-
+ java-pkg_init-compiler_
local compiler="${GENTOO_COMPILER}"
local compiler_executable
@@ -1602,18 +1602,15 @@
export JAVAC=${old_javac}
if [[ -z ${compiler_executable} ]]; then
- echo "JAVAC is empty or undefined in ${compiler_env}"
- return 1
+ die "JAVAC is empty or undefined in ${compiler_env}"
fi
# check that it's executable
if [[ ! -x ${compiler_executable} ]]; then
- echo "${compiler_executable} doesn't exist, or isn't executable"
- return 1
+ die "${compiler_executable} doesn't exist, or isn't executable"
fi
else
- echo "Could not find environment file for ${compiler}"
- return 1
+ die "Could not find environment file for ${compiler}"
fi
fi
echo ${compiler_executable}
@@ -1638,9 +1635,7 @@
debug-print "want target: ${want_target}"
if [[ -z "${want_source}" || -z "${want_target}" ]]; then
- debug-print "could not find valid -source/-target values for javac"
- echo "Could not find valid -source/-target values for javac"
- return 1
+ die "Could not find valid -source/-target values for javac"
else
echo "${source_str} ${target_str}"
fi
@@ -2006,21 +2001,11 @@
ejavac() {
debug-print-function ${FUNCNAME} $*
- java-pkg_init-compiler_
-
local compiler_executable
compiler_executable=$(java-pkg_get-javac)
- if [[ ${?} != 0 ]]; then
- eerror "There was a problem determining compiler: ${compiler_executable}"
- die "get-javac failed"
- fi
local javac_args
javac_args="$(java-pkg_javac-args)"
- if [[ ${?} != 0 ]]; then
- eerror "There was a problem determining JAVACFLAGS: ${javac_args}"
- die "java-pkg_javac-args failed"
- fi
[[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} ${javac_args} "${@}"
${compiler_executable} ${javac_args} "${@}" || die "ejavac failed"
@@ -2626,10 +2611,6 @@
export JAVA=$(java-config --java)
export JAVAC=$(java-config --javac)
JAVACFLAGS="$(java-pkg_javac-args)"
- if [[ ${?} != 0 ]]; then
- eerror "There was a problem determining JAVACFLAGS: ${JAVACFLAGS}"
- die "java-pkg_javac-args failed"
- fi
[[ -n ${JAVACFLAGS_EXTRA} ]] && JAVACFLAGS="${JAVACFLAGS_EXTRA} ${JAVACFLAGS}"
export JAVACFLAGS
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2015-08-02 23:12 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-13 14:42 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass Ralph Sennhauser (sera)
-- strict thread matches above, loose matches on Subject: below --
2012-03-13 10:05 Ralph Sennhauser (sera)
2012-07-05 20:07 Ralph Sennhauser (sera)
2013-01-16 19:06 Ralph Sennhauser (sera)
2013-04-17 18:01 Ralph Sennhauser (sera)
2013-08-27 5:32 Tim Harder (radhermit)
2013-10-06 14:37 Vlastimil Babka (caster)
2014-04-09 21:55 Tim Harder (radhermit)
2015-04-14 14:08 James Le Cuirot (chewi)
2015-05-02 20:23 James Le Cuirot (chewi)
2015-05-24 22:44 James Le Cuirot (chewi)
2015-06-15 21:09 James Le Cuirot (chewi)
2015-06-19 14:11 James Le Cuirot (chewi)
2015-06-28 13:33 James Le Cuirot (chewi)
2015-07-22 9:20 Patrice Clement (monsieurp)
2015-07-30 22:17 James Le Cuirot (chewi)
2015-07-31 7:56 Patrice Clement (monsieurp)
2015-08-02 23:12 James Le Cuirot (chewi)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox