diff options
author | Vlastimil Babka <caster@gentoo.org> | 2007-01-21 21:56:58 +0000 |
---|---|---|
committer | Vlastimil Babka <caster@gentoo.org> | 2007-01-21 21:56:58 +0000 |
commit | 41852bad66a789941e862d604f3eb9b2a0cb499f (patch) | |
tree | dfdf063429e328efe8298151400c255118eb8b24 /dev-java/ant-core | |
parent | Stable on IA64, bug 156662. (diff) | |
download | gentoo-2-41852bad66a789941e862d604f3eb9b2a0cb499f.tar.gz gentoo-2-41852bad66a789941e862d604f3eb9b2a0cb499f.tar.bz2 gentoo-2-41852bad66a789941e862d604f3eb9b2a0cb499f.zip |
Version bump, bug #159820.
(Portage version: 2.1.2-r1)
Diffstat (limited to 'dev-java/ant-core')
-rw-r--r-- | dev-java/ant-core/ChangeLog | 10 | ||||
-rw-r--r-- | dev-java/ant-core/ant-core-1.7.0.ebuild | 85 | ||||
-rwxr-xr-x | dev-java/ant-core/files/1.7.0-ant | 197 | ||||
-rw-r--r-- | dev-java/ant-core/files/digest-ant-core-1.7.0 | 6 |
4 files changed, 296 insertions, 2 deletions
diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog index 0127721ddf80..13651e26aa99 100644 --- a/dev-java/ant-core/ChangeLog +++ b/dev-java/ant-core/ChangeLog @@ -1,11 +1,17 @@ # ChangeLog for dev-java/ant-core -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.59 2006/12/09 12:52:38 caster Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.60 2007/01/21 21:56:58 caster Exp $ # Ant-core blocks lower/older versions of ant-tasks, # since it will not run when there is a version mismatch betwean the 2 packages # Please unemerge ant-tasks when updating ant-core. +*ant-core-1.7.0 (21 Jan 2007) + + 21 Jan 2007; Vlastimil Babka <caster@gentoo.org> +files/1.7.0-ant, + +ant-core-1.7.0.ebuild: + Version bump, bug #159820. + 09 Dec 2006; Vlastimil Babka <caster@gentoo.org> ant-core-1.6.5-r14.ebuild: Block on dev-java/ant-optional because some people still seem to have it. If diff --git a/dev-java/ant-core/ant-core-1.7.0.ebuild b/dev-java/ant-core/ant-core-1.7.0.ebuild new file mode 100644 index 000000000000..9f60d43d5b64 --- /dev/null +++ b/dev-java/ant-core/ant-core-1.7.0.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.7.0.ebuild,v 1.1 2007/01/21 21:56:58 caster Exp $ + +inherit java-pkg-2 + +MY_P="apache-ant-${PV}" + +DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files." +HOMEPAGE="http://ant.apache.org/" +SRC_URI="mirror://apache/ant/source/${MY_P}-src.tar.bz2 + mirror://gentoo/ant-${PV}-gentoo.tar.bz2" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~x86" +IUSE="doc source" + +RDEPEND=">=virtual/jdk-1.4 + !<dev-java/ant-tasks-${PV} + !dev-java/ant-optional" +DEPEND="${RDEPEND} + source? ( app-arch/zip )" + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + unpack ${A} + cd "${S}" + + # remove bundled xerces + rm -v lib/*.jar + + # use our split-ant build.xml + mv -f ${WORKDIR}/build.xml . +} + +src_compile() { + export ANT_HOME="" + + local bsyscp + + # this ensures that when building ant with bootstrapped ant, + # only the source is used for resolving references, and not + # the classes in bootstrapped ant + # but jikes in kaffe has issues with this... + if ! java-pkg_current-vm-matches kaffe; then + bsyscp="-Dbuild.sysclasspath=ignore" + fi + + ./build.sh ${bsyscp} jars-core $(use_doc javadocs) \ + || die "build failed" +} + +src_install() { + newbin ${FILESDIR}/${PV}-ant ant || die "failed to install wrapper" + + dodir /usr/share/${PN}/bin + for each in antRun runant.pl runant.py complete-ant-cmd.pl ; do + dobin ${S}/src/script/${each} + dosym /usr/bin/${each} /usr/share/${PN}/bin/${each} + done + + echo "ANT_HOME=\"/usr/share/${PN}\"" > ${T}/20ant + doenvd ${T}/20ant || die "failed to install env.d file" + + java-pkg_dojar build/lib/ant.jar + java-pkg_dojar build/lib/ant-bootstrap.jar + java-pkg_dojar build/lib/ant-launcher.jar + + use source && java-pkg_dosrc src/main/* + + dodoc README WHATSNEW KEYS + + if use doc; then + dohtml welcome.html + dohtml -r docs/* + java-pkg_dojavadoc build/javadocs + fi +} + +pkg_postinst() { + elog "The way of packaging ant in Gentoo has changed since version 1.7.0." + elog "For more info, please see http://overlays.gentoo.org/proj/java/wiki/Split_Ant" +} diff --git a/dev-java/ant-core/files/1.7.0-ant b/dev-java/ant-core/files/1.7.0-ant new file mode 100755 index 000000000000..e5d1a7100495 --- /dev/null +++ b/dev-java/ant-core/files/1.7.0-ant @@ -0,0 +1,197 @@ +#! /bin/bash + +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Edited for Gentoo Linux +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/files/1.7.0-ant,v 1.1 2007/01/21 21:56:58 caster Exp $ + +# Extract launch and ant arguments, (see details below). +ant_exec_args= +no_config=false +use_jikes_default=false +ant_exec_debug=false +show_help=false +for arg in "$@" ; do + if [ "$arg" = "--noconfig" ] ; then + no_config=true + elif [ "$arg" = "--usejikes" ] ; then + use_jikes_default=true + elif [ "$arg" = "--execdebug" ] ; then + ant_exec_debug=true + elif [ my"$arg" = my"--h" -o my"$arg" = my"--help" ] ; then + show_help=true + ant_exec_args="$ant_exec_args -h" + else + if [ my"$arg" = my"-h" -o my"$arg" = my"-help" ] ; then + show_help=true + fi + ant_exec_args="$ant_exec_args \"$arg\"" + fi +done + +# Source/default ant configuration +if $no_config ; then + rpm_mode=false + usejikes=$use_jikes_default +else + # load system-wide ant configuration (ONLY if ANT_HOME has NOT been set) + if [ -z "$ANT_HOME" -o "$ANT_HOME" = "/usr/share/ant" ]; then + if [ -f "/etc/ant.conf" ] ; then + . /etc/ant.conf + fi + fi + + # load user ant configuration + if [ -f "$HOME/.ant/ant.conf" ] ; then + . $HOME/.ant/ant.conf + fi + if [ -f "$HOME/.antrc" ] ; then + . "$HOME/.antrc" + fi + + # provide default configuration values + if [ -z "$rpm_mode" ] ; then + rpm_mode=false + fi + if [ -z "$usejikes" ] ; then + usejikes=$use_jikes_default + fi +fi + +export WANT_JAVA_CONFIG=2 + +# Always get JAVA_HOME from java-config. +# Use GENTOO_VM to change which VM is used instead. +export JAVA_HOME="$(java-config -g JAVA_HOME)" + +if [ -z $JAVA_HOME ] ; then + echo 'Error: No JDK found!' + echo "Try using java-config script to set your JDK" + echo "Remember that you need a JDK not a JRE" + exit 1 +fi + +ANT_HOME=/usr/share/ant-core + +# set ANT_LIB location +ANT_LIB="${ANT_HOME}/lib" + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + JAVACMD="$JAVA_HOME/bin/java" + else + JAVACMD=`which java 2> /dev/null ` + if [ -z "$JAVACMD" ] ; then + JAVACMD=java + fi + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." + echo " We cannot execute $JAVACMD" + exit 1 +fi + +if [ -z "$LOCALCLASSPATH" ] ; then + LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar +else + LOCALCLASSPATH=$ANT_LIB/ant-launcher.jar:$LOCALCLASSPATH +fi + +# if ANT_TASKS is not set, default to "all" +ANT_TASKS="${ANT_TASKS:-all}" + +# if ANT_TASKS is set to "all", get the tasks list from /usr/share/ant/tasks/ +if [[ "${ANT_TASKS}" == "all" ]]; then + ANT_TASKS="" + # but only if it exists + if [[ -d /usr/share/ant/tasks ]]; then + ANT_TASKS="${ANT_TASKS} "/usr/share/ant/tasks/* + fi + if [[ -d /usr/share/ant/tasks-1.7.0 ]]; then + ANT_TASKS="${ANT_TASKS} "/usr/share/ant/tasks-1.7.0/* + fi +# if set to "none", make ANT_TASKS empty list +elif [[ "${ANT_TASKS}" == "none" ]]; then + ANT_TASKS="" +fi +# otherwise ANT_TASKS defines explicit task list + +# construct the tasks list separated with commas to pass to java-config +TASKS_LIST="" +for task in $ANT_TASKS; do + TASKS_LIST="${TASKS_LIST},$(basename $task)" +done +TASKS_LIST=${TASKS_LIST#,} + +# get the classpath for optional tasks and their dependency .jar files +if [[ -n "${TASKS_LIST}" ]] ; then + ANT_TASKS_CLASSPATH="-lib \"$(java-config -dp ${TASKS_LIST})\"" + ANT_TASKS_LIBPATH="-Djava.library.path=\"$(java-config -di ${TASKS_LIST})\"" +else + ANT_TASKS_CLASSPATH="" + ANT_TASKS_LIBPATH="" +fi + +TOOLS_JAR="$(java-config --tools)" + +if [[ -n "${TOOLS_JAR}" ]] ; then + LOCALCLASSPATH="$LOCALCLASSPATH:${TOOLS_JAR}" +else + echo "Warning: Unable to determine tools.jar location." + echo " If build fails because sun.* classes could not be found," + echo " Make sure you are using a JDK, not JRE as your user/system VM." + echo " and that you have java-config version 2.0.30 or above installed." +fi + +# Allow Jikes support (off by default) +if $usejikes; then + ANT_OPTS="$ANT_OPTS -Dbuild.compiler=jikes" +fi + +# Show script help if requested +if $show_help ; then + echo $0 '[script options] [options] [target [target2 [target3] ..]]' + echo 'Script Options:' + echo ' --help, --h print this message and ant help' + echo ' --noconfig suppress sourcing of /etc/ant.conf,' + echo ' $HOME/.ant/ant.conf, and $HOME/.antrc' + echo ' configuration files' + echo ' --usejikes enable use of jikes by default, unless' + echo ' set explicitly in configuration files' + echo ' --execdebug print ant exec line generated by this' + echo ' launch script' + echo ' ' +fi + +# Execute ant using eval/exec to preserve spaces in paths, +# java options, and ant args +ant_sys_opts= + +if [ -n "$JIKESPATH" ]; then + ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\"" +fi + +ant_exec_command="exec \"${JAVACMD}\" ${ANT_OPTS} -classpath \"${LOCALCLASSPATH}\" \ + -Dant.home=\"${ANT_HOME}\" -Dant.library.dir=\"${ANT_LIB}\" ${ant_sys_opts} \ + ${ANT_TASKS_LIBPATH} org.apache.tools.ant.launch.Launcher \ + ${ANT_TASKS_CLASSPATH} ${ANT_ARGS} -cp \"${CLASSPATH}\" ${ant_exec_args}" + +if $ant_exec_debug ; then + echo $ant_exec_command +fi +eval $ant_exec_command diff --git a/dev-java/ant-core/files/digest-ant-core-1.7.0 b/dev-java/ant-core/files/digest-ant-core-1.7.0 new file mode 100644 index 000000000000..035927394fcb --- /dev/null +++ b/dev-java/ant-core/files/digest-ant-core-1.7.0 @@ -0,0 +1,6 @@ +MD5 9e834373c21fe197ac66f4da51dd47a5 ant-1.7.0-gentoo.tar.bz2 11720 +RMD160 51d24f2c0c98195ed6ef1852045201a567a5d9ea ant-1.7.0-gentoo.tar.bz2 11720 +SHA256 7b1e0c63bec193c010c3fcca7a3524e2e35cc4ca56b86e4571737ac1e169e35c ant-1.7.0-gentoo.tar.bz2 11720 +MD5 22b378e27ab300e4d73bf09d91c7e2a6 apache-ant-1.7.0-src.tar.bz2 6831017 +RMD160 e18ecde1996401f03529d80d2b6f3be2c55e64ab apache-ant-1.7.0-src.tar.bz2 6831017 +SHA256 a6698e8420f6d1cefd9e02c5a6b610b84495a3f9bfe1fc9e1b4fe8a8769e3779 apache-ant-1.7.0-src.tar.bz2 6831017 |