[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-ant-2.eclass

[Vlastimil Babka (caster)]

caster      13/10/05 13:40:57

  Modified:             ChangeLog java-ant-2.eclass
  Log:
  Convert comments for eclass manpages. Heavily based on work from ercpe, bug #476946.

Revision  Changes    Path
1.1008               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1008&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1008&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1007&r2=1.1008

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1007
retrieving revision 1.1008
diff -u -r1.1007 -r1.1008
--- ChangeLog	5 Oct 2013 12:07:01 -0000	1.1007
+++ ChangeLog	5 Oct 2013 13:40:57 -0000	1.1008
@@ -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.1007 2013/10/05 12:07:01 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1008 2013/10/05 13:40:57 caster Exp $
+
+  05 Oct 2013; Vlastimil Babka <caster@g.o> java-ant-2.eclass:
+  Convert comments for eclass manpages. Heavily based on work from ercpe, bug
+  #476946.
 
   05 Oct 2013; Vlastimil Babka <caster@g.o> ant-tasks.eclass:
   Convert comments for eclass manpages. Almost completely based on work from



1.57                 eclass/java-ant-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-ant-2.eclass?rev=1.57&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-ant-2.eclass?rev=1.57&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-ant-2.eclass?r1=1.56&r2=1.57

Index: java-ant-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- java-ant-2.eclass	20 Apr 2013 18:23:57 -0000	1.56
+++ java-ant-2.eclass	5 Oct 2013 13:40:57 -0000	1.57
@@ -14,7 +14,18 @@
 #
 # Licensed under the GNU General Public License, v2
 #
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.56 2013/04/20 18:23:57 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.57 2013/10/05 13:40:57 caster Exp $
+
+# @ECLASS: java-ant-2.eclass
+# @MAINTAINER:
+# java@g.o
+# @AUTHOR:
+# kiorky (kiorky@××××××××××.net), Petteri Räty (betelgeuse@g.o)
+# @BLURB: eclass for ant based Java packages
+# @DESCRIPTION:
+# Eclass for Ant-based Java packages. Provides support for both automatic and
+# manual manipulation of build.xml files. Should be inherited after java-pkg-2
+# or java-pkg-opt-2 eclass.
 
 inherit java-utils-2 multilib
 
@@ -22,22 +33,30 @@
 # ant to build. In particular, it will attempt to fix build.xml files, so that
 # they use the appropriate 'target' and 'source' attributes.
 
-# -----------------------------------------------------------------------------
-# @variable-preinherit WANT_ANT_TASKS
-# @variable-default ""
-#
-# Please see the description in java-utils-2.eclass.
+# @ECLASS-VARIABLE: WANT_ANT_TASKS
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# 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-*.
+#
+# @CODE
+# WANT_ANT_TASKS="ant-junit ant-trax"
+# @CODE
+
+#The implementation of dependencies is handled by java-utils-2.eclass
 #WANT_ANT_TASKS
 
-# -----------------------------------------------------------------------------
-# @variable-preinherit JAVA_ANT_DISABLE_ANT_CORE_DEP
-# @variable-default unset for java-pkg-2, true for java-pkg-opt-2
-#
+# @ECLASS-VARIABLE: JAVA_ANT_DISABLE_ANT_CORE_DEP
+# @DEFAULT_UNSET
+# @DESCRIPTION:
 # Setting this variable non-empty before inheriting java-ant-2 disables adding
 # dev-java/ant-core into DEPEND.
-
-# construct ant-speficic DEPEND
-# add ant-core into DEPEND, unless disabled
 if [[ -z "${JAVA_ANT_DISABLE_ANT_CORE_DEP}" ]]; then
 		JAVA_ANT_E_DEPEND="${JAVA_ANT_E_DEPEND} >=dev-java/ant-core-1.8.2"
 fi
@@ -70,79 +89,50 @@
 
 DEPEND="${JAVA_ANT_E_DEPEND}"
 
-# ------------------------------------------------------------------------------
-# @global JAVA_PKG_BSFIX
-#
+# @ECLASS-VARIABLE: JAVA_PKG_BSFIX
+# @DESCRIPTION:
 # Should we attempt to 'fix' ant build files to include the source/target
 # attributes when calling javac?
-#
-# default: on
-# ------------------------------------------------------------------------------
 JAVA_PKG_BSFIX=${JAVA_PKG_BSFIX:-"on"}
 
-# ------------------------------------------------------------------------------
-# @global JAVA_PKG_BSFIX_ALL
-#
+# @ECLASS-VARIABLE: JAVA_PKG_BSFIX_ALL
+# @DESCRIPTION:
 # If we're fixing build files, should we try to fix all the ones we can find?
-#
-# default: yes
-# ------------------------------------------------------------------------------
 JAVA_PKG_BSFIX_ALL=${JAVA_PKG_BSFIX_ALL:-"yes"}
 
-# ------------------------------------------------------------------------------
-# @global JAVA_PKG_BSFIX_NAME
-#
+# @ECLASS-VARIABLE: JAVA_PKG_BSFIX_NAME
+# @DESCRIPTION:
 # Filename of build files to fix/search for
-#
-# default: build.xml
-# ------------------------------------------------------------------------------
 JAVA_PKG_BSFIX_NAME=${JAVA_PKG_BSFIX_NAME:-"build.xml"}
 
-# ------------------------------------------------------------------------------
-# @global JAVA_PKG_BSFIX_TARGETS_TAGS
-#
+# @ECLASS-VARIABLE: JAVA_PKG_BSFIX_TARGET_TAGS
+# @DESCRIPTION:
 # Targets to fix the 'source' attribute in
-#
-# default: javac xjavac javac.preset
-# ------------------------------------------------------------------------------
 JAVA_PKG_BSFIX_TARGET_TAGS=${JAVA_PKG_BSFIX_TARGET_TAGS:-"javac xjavac javac.preset"}
 
-# ------------------------------------------------------------------------------
-# @global JAVA_PKG_BSFIX_SOURCE_TAGS
-#
+# @ECLASS-VARIABLE: JAVA_PKG_BSFIX_SOURCE_TAGS
+# @DESCRIPTION:
 # Targets to fix the 'target' attribute in
-#
-# default: javacdoc javac xjavac javac.preset
-# ------------------------------------------------------------------------------
 JAVA_PKG_BSFIX_SOURCE_TAGS=${JAVA_PKG_BSFIX_SOURCE_TAGS:-"javadoc javac xjavac javac.preset"}
 
-# ------------------------------------------------------------------------------
-# @global JAVA_ANT_CLASSPATH_TAGS
-#
+# @ECLASS-VARIABLE: JAVA_ANT_CLASSPATH_TAGS
+# @DESCRIPTION:
 # Targets to add the classpath attribute to
-#
-# default: javac xjavac
-# ------------------------------------------------------------------------------
 JAVA_ANT_CLASSPATH_TAGS="javac xjavac"
 
-# ------------------------------------------------------------------------------
-# @global JAVA_ANT_IGNORE_SYSTEM_CLASSES
-#
-# Rewrites available tasks to ignore ant classpath.
-#
-# default: off
-# ------------------------------------------------------------------------------
+# @ECLASS-VARIABLE: JAVA_ANT_IGNORE_SYSTEM_CLASSES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# When set, <available> Ant tasks are rewritten to ignore Ant's runtime classpath.
 
 case "${EAPI:-0}" in
 	0|1) : ;;
 	*) EXPORT_FUNCTIONS src_configure ;;
 esac
 
-# ------------------------------------------------------------------------------
-# @eclass-src_configure
-#
-# src_configure rewrites the build.xml files
-# ------------------------------------------------------------------------------
+# @FUNCTION: java-ant-2_src_configure
+# @DESCRIPTION:
+# src_configure rewrites the build.xml files automatically, unless EAPI is undefined, 0 or 1.
 java-ant-2_src_configure() {
 	# if java support is optional, don't perform this when the USE flag is off
 	if has java-pkg-opt-2 ${INHERITED}; then
@@ -159,15 +149,17 @@
 	touch "${T}/java-ant-2_src_configure-run"
 }
 
-# ------------------------------------------------------------------------------
-# @private java-ant_bsfix
+# @FUNCTION: java-ant_bsfix
+# @INTERNAL
+# @DESCRIPTION:
+# Attempts to fix build files.
 #
-# Attempts to fix build files. The following variables will affect its behavior
-# as listed above:
+# @CODE
+# Affected by variables:
 # 	JAVA_PKG_BSFIX
 #	JAVA_PKG_BSFIX_ALL
 #	JAVA_PKG_BSFIX_NAME,
-# ------------------------------------------------------------------------------
+# @CODE
 java-ant_bsfix() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -210,11 +202,13 @@
 	fi
 }
 
-# ------------------------------------------------------------------------------
-# @public java-ant_bsfix_files
+# @FUNCTION: java-ant_bsfix_files
+# @USAGE: <path/to/first/build.xml> [path/to/second.build.xml ...]
+# @DESCRIPTION:
+# Attempts to fix named build files.
 #
-# Attempts to fix named build files. The following variables will affect its behavior
-# as listed above:
+# @CODE
+# Affected by variables:
 #	JAVA_PKG_BSFIX_SOURCE_TAGS
 #	JAVA_PKG_BSFIX_TARGET_TAGS
 #	JAVA_ANT_REWRITE_CLASSPATH
@@ -223,6 +217,7 @@
 #                                directories
 #	JAVA_ANT_BSFIX_EXTRA_ARGS: You can use this to pass extra variables to the
 #	                           rewriter if you know what you are doing.
+# @CODE
 #
 # If JAVA_ANT_JAVADOC_INPUT_DIRS is set, we will turn on the adding of a basic
 # javadoc target to the ant's build.xml with the javadoc xml-rewriter feature.
@@ -232,7 +227,6 @@
 
 # When changing this function, make sure that it works with paths with spaces in
 # them.
-# ------------------------------------------------------------------------------
 java-ant_bsfix_files() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -374,14 +368,16 @@
 }
 
 
-# ------------------------------------------------------------------------------
-# @public java-ant_bsfix_one
-#
-# Attempts to fix named build file. The following variables will affect its behavior
-# as listed above:
+# @FUNCTION: java-ant_bsfix_one
+# @USAGE: <path/to/build.xml>
+# @DESCRIPTION:
+# Attempts to fix named build file.
+# 
+# @CODE
+# Affected by variables:
 #	JAVA_PKG_BSFIX_SOURCE_TAGS
 #	JAVA_PKG_BSFIX_TARGET_TAGS
-# ------------------------------------------------------------------------------
+# @CODE
 java-ant_bsfix_one() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -393,14 +389,15 @@
 	java-ant_bsfix_files "${1}"
 }
 
-# ------------------------------------------------------------------------------
-# @public java-ant_rewrite-classpath
-#
+# @FUNCTION: java-ant_rewrite-classpath
+# @USAGE: [path/to/build.xml]
+# @DESCRIPTION:
 # Adds 'classpath="${gentoo.classpath}"' to specified build file.
+#
 # Affected by:
 #	JAVA_ANT_CLASSPATH_TAGS
-# @param $1 - the file to rewrite (defaults to build.xml)
-# ------------------------------------------------------------------------------
+#
+# Parameter defaults to build.xml when not specified
 java-ant_rewrite-classpath() {
 	debug-print-function ${FUNCNAME} $*
 
@@ -423,14 +420,13 @@
 	fi
 }
 
-# ------------------------------------------------------------------------------
-# @public java-ant_remove-taskdefs
-#
-# Removes (named) taskdef elements from the file.
-# Options:
-#   --name NAME : only remove taskdef with name NAME.
-# @param $1 - the file to rewrite (defaults to build.xml)
-# ------------------------------------------------------------------------------
+# @FUNCTION: java-ant_remove-taskdefs
+# @USAGE: [--name NAME] [path/to/build.xml]
+# @DESCRIPTION:
+# Removes (named) taskdef elements from the build.xml file.
+# When --name NAME is specified, only remove taskdef with name NAME. Otherwise,
+# all taskdefs are removed.
+# The file to rewrite defaults to build.xml when not specified.
 java-ant_remove-taskdefs() {
 	debug-print-function ${FUNCNAME} $*
 	local task_name
@@ -455,12 +451,11 @@
 	[[ $? != 0 ]] && die "Removing taskdefs failed"
 }
 
-# ------------------------------------------------------------------------------
-# @public java-ant_ignore-system-classes
-#
+# @FUNCTION: java-ant_ignore-system-classes
+# @USAGE: [path/to/build.xml]
+# @DESCRIPTION:
 # Makes the available task ignore classes in the system classpath
-# @param $1 - the file to rewrite (defaults to build.xml)
-# ------------------------------------------------------------------------------
+# Parameter defaults to build.xml when not specified
 java-ant_ignore-system-classes() {
 	debug-print-function ${FUNCNAME} $*
 	local file=${1:-build.xml}
@@ -469,10 +464,10 @@
 		-e available -a ignoresystemclasses -v "true"
 }
 
-# ------------------------------------------------------------------------------
-# @public java-ant_xml-rewrite
+# @FUNCTION: java-ant_xml-rewrite
+# @USAGE: <xml rewriter arguments>
+# @DESCRIPTION:
 # Run the right xml-rewrite binary with the given arguments
-# ------------------------------------------------------------------------------
 java-ant_xml-rewrite() {
 	local gen2="/usr/bin/xml-rewrite-2.py"
 	local gen2_1="/usr/$(get_libdir)/javatoolkit/bin/xml-rewrite-2.py"
@@ -488,22 +483,23 @@
 	fi
 }
 
-# ------------------------------------------------------------------------------
-# @public java-ant_rewrite-bootclasspath
-#
+# @FUNCTION: java-ant_rewrite-bootclasspath
+# @USAGE: <version> [path/to/build.xml] [prepend] [append]
+# @DESCRIPTION:
 # Adds bootclasspath to javac-like tasks in build.xml filled with jars of a
 # bootclasspath package of given version.
 #
+# @CODE
 # Affected by:
 #	JAVA_PKG_BSFIX_TARGET_TAGS - the tags of javac tasks
 #
-# @param $1 - the version of bootclasspath (e.g. 1.5), 'auto' for bootclasspath
-#             of the current JDK
-# @param $2 - path to desired build.xml file, defaults to 'build.xml'
-# @param $3 - (optional) what to prepend the bootclasspath with (to override)
-# @param $4 - (optional) what to append to the bootclasspath
-# ------------------------------------------------------------------------------
-
+# Parameters:
+# $1 - the version of bootclasspath (e.g. 1.5), 'auto' for bootclasspath
+#      of the current JDK
+# $2 - path to desired build.xml file, defaults to 'build.xml'
+# $3 - (optional) what to prepend the bootclasspath with (to override)
+# $4 - (optional) what to append to the bootclasspath
+# @CODE
 java-ant_rewrite-bootclasspath() {
 	local version="${1}"
 	local file="${2-build.xml}"