/[gentoo-x86]/eclass/java-utils-2.eclass
Gentoo

Diff of /eclass/java-utils-2.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.166 Revision 1.167
4# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org> 4# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org>
5# Copyright (c) 2004-2015, Gentoo Foundation 5# Copyright (c) 2004-2015, Gentoo Foundation
6# 6#
7# Licensed under the GNU General Public License, v2 7# Licensed under the GNU General Public License, v2
8# 8#
9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.166 2015/07/22 09:20:07 monsieurp Exp $ 9# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.167 2015/07/30 22:17:08 chewi Exp $
10 10
11# @ECLASS: java-utils-2.eclass 11# @ECLASS: java-utils-2.eclass
12# @MAINTAINER: 12# @MAINTAINER:
13# java@gentoo.org 13# java@gentoo.org
14# @AUTHOR: 14# @AUTHOR:
1817# @FUNCTION: java-utils-2_src_prepare 1817# @FUNCTION: java-utils-2_src_prepare
1818# @DESCRIPTION: 1818# @DESCRIPTION:
1819# src_prepare Searches for bundled jars 1819# src_prepare Searches for bundled jars
1820# Don't call directly, but via java-pkg-2_src_prepare! 1820# Don't call directly, but via java-pkg-2_src_prepare!
1821java-utils-2_src_prepare() { 1821java-utils-2_src_prepare() {
1822 [[ ${EBUILD_PHASE} == prepare ]] &&
1823 java-pkg_func-exists java_prepare && java_prepare 1822 java-pkg_func-exists java_prepare && java_prepare
1824 1823
1825 # Check for files in JAVA_RM_FILES array. 1824 # Check for files in JAVA_RM_FILES array.
1826 if [[ ${JAVA_RM_FILES[@]} ]]; then 1825 if [[ ${JAVA_RM_FILES[@]} ]]; then
1827 debug-print "$FUNCNAME: removing unneeded files" 1826 debug-print "$FUNCNAME: removing unneeded files"
1828 java-pkg_rm_files "${JAVA_RM_FILES[@]}" 1827 java-pkg_rm_files "${JAVA_RM_FILES[@]}"
1829 fi 1828 fi
1830 1829
1831 # Remember that eant will call this unless called via Portage 1830 if is-java-strict; then
1832 if [[ ! -e "${T}/java-utils-2_src_prepare-run" ]] && is-java-strict; then
1833 echo "Searching for bundled jars:" 1831 echo "Searching for bundled jars:"
1834 java-pkg_find-normal-jars || echo "None found." 1832 java-pkg_find-normal-jars || echo "None found."
1835 echo "Searching for bundled classes (no output if none found):" 1833 echo "Searching for bundled classes (no output if none found):"
1836 find "${WORKDIR}" -name "*.class" 1834 find "${WORKDIR}" -name "*.class"
1837 echo "Search done." 1835 echo "Search done."
1838 fi 1836 fi
1839 touch "${T}/java-utils-2_src_prepare-run"
1840} 1837}
1841 1838
1842# @FUNCTION: java-utils-2_pkg_preinst 1839# @FUNCTION: java-utils-2_pkg_preinst
1843# @DESCRIPTION: 1840# @DESCRIPTION:
1844# pkg_preinst Searches for missing and unneeded dependencies 1841# pkg_preinst Searches for missing and unneeded dependencies
1877eant() { 1874eant() {
1878 debug-print-function ${FUNCNAME} $* 1875 debug-print-function ${FUNCNAME} $*
1879 1876
1880 if [[ ${EBUILD_PHASE} = compile ]]; then 1877 if [[ ${EBUILD_PHASE} = compile ]]; then
1881 java-ant-2_src_configure 1878 java-ant-2_src_configure
1882 java-utils-2_src_prepare
1883 fi 1879 fi
1884 1880
1885 if ! has java-ant-2 ${INHERITED}; then 1881 if ! has java-ant-2 ${INHERITED}; then
1886 local msg="You should inherit java-ant-2 when using eant" 1882 local msg="You should inherit java-ant-2 when using eant"
1887 java-pkg_announce-qa-violation "${msg}" 1883 java-pkg_announce-qa-violation "${msg}"

Legend:
Removed from v.1.166  
changed lines
  Added in v.1.167

  ViewVC Help
Powered by ViewVC 1.1.20