mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-07-30 10:38:07 -07:00
dev-java/netty-common: Simply build process by using java-pkg-simple in lieu of java-ant-2. Remove corresponding ant build.xml files. Fixes bug 557288.
Package-Manager: portage-2.2.18 Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
This commit is contained in:
Patrice Clement
@@ -1,229 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
|
||||
<!-- ====================================================================== -->
|
||||
<!-- -->
|
||||
<!-- Any modifications will be overwritten. -->
|
||||
<!-- -->
|
||||
<!-- Generated by Maven Ant Plugin on 5/15/14 7:11 PM -->
|
||||
<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
|
||||
<!-- -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<project name="netty-common-from-maven" default="package" basedir=".">
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Build environment properties -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<property file="${user.home}/.m2/maven.properties"/>
|
||||
<property file="maven-build.properties"/>
|
||||
|
||||
<property name="maven.build.finalName" value="netty-common-4.0.21.Final"/>
|
||||
<property name="maven.build.dir" value="target"/>
|
||||
<property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
|
||||
<property name="maven.build.srcDir.0" value="src/main/java"/>
|
||||
<property name="maven.build.resourceDir.0" value="src/main/resources"/>
|
||||
<property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
|
||||
<property name="maven.build.testDir.0" value="src/test/java"/>
|
||||
<property name="maven.build.testResourceDir.0" value="src/test/resources"/>
|
||||
<property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
|
||||
<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
|
||||
|
||||
<property name="maven.repo.local" value="${user.home}/.m2/repository"/>
|
||||
<property name="maven.settings.offline" value="false"/>
|
||||
<property name="maven.settings.interactiveMode" value="true"/>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Defining classpaths -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<path id="build.classpath">
|
||||
</path>
|
||||
<path id="build.test.classpath">
|
||||
</path>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Cleaning up target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="clean" description="Clean the output directory">
|
||||
<delete dir="${maven.build.dir}"/>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Compilation target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="compile" description="Compile the code">
|
||||
<mkdir dir="${maven.build.outputDir}"/>
|
||||
<javac destdir="${maven.build.outputDir}"
|
||||
nowarn="true"
|
||||
debug="true"
|
||||
optimize="true"
|
||||
deprecation="true"
|
||||
target="1.6"
|
||||
verbose="false"
|
||||
fork="true"
|
||||
memoryInitialSize="1024m"
|
||||
source="1.6">
|
||||
<src>
|
||||
<pathelement location="${maven.build.srcDir.0}"/>
|
||||
</src>
|
||||
<classpath refid="build.classpath"/>
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Test-compilation target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="compile-tests"
|
||||
depends="compile"
|
||||
description="Compile the test code"
|
||||
unless="maven.test.skip">
|
||||
<mkdir dir="${maven.build.testOutputDir}"/>
|
||||
<javac destdir="${maven.build.testOutputDir}"
|
||||
nowarn="true"
|
||||
debug="true"
|
||||
optimize="true"
|
||||
deprecation="true"
|
||||
target="1.6"
|
||||
verbose="false"
|
||||
fork="true"
|
||||
memoryInitialSize="1024m"
|
||||
source="1.6">
|
||||
<src>
|
||||
<pathelement location="${maven.build.testDir.0}"/>
|
||||
</src>
|
||||
<classpath>
|
||||
<path refid="build.test.classpath"/>
|
||||
<pathelement location="${maven.build.outputDir}"/>
|
||||
</classpath>
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Run all tests -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="test"
|
||||
depends="compile-tests, junit-missing"
|
||||
unless="junit.skipped"
|
||||
description="Run the test cases">
|
||||
<mkdir dir="${maven.test.reports}"/>
|
||||
<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
|
||||
<sysproperty key="basedir" value="."/>
|
||||
<formatter type="xml"/>
|
||||
<formatter type="plain" usefile="false"/>
|
||||
<classpath>
|
||||
<path refid="build.test.classpath"/>
|
||||
<pathelement location="${maven.build.outputDir}"/>
|
||||
<pathelement location="${maven.build.testOutputDir}"/>
|
||||
</classpath>
|
||||
<batchtest todir="${maven.test.reports}" unless="test">
|
||||
<fileset dir="${maven.build.testDir.0}">
|
||||
<include name="**/*Test*.java"/>
|
||||
<include name="**/*Benchmark*.java"/>
|
||||
<exclude name="**/Abstract*"/>
|
||||
<exclude name="**/TestUtil*"/>
|
||||
</fileset>
|
||||
</batchtest>
|
||||
<batchtest todir="${maven.test.reports}" if="test">
|
||||
<fileset dir="${maven.build.testDir.0}">
|
||||
<include name="**/${test}.java"/>
|
||||
<exclude name="**/Abstract*"/>
|
||||
<exclude name="**/TestUtil*"/>
|
||||
</fileset>
|
||||
</batchtest>
|
||||
</junit>
|
||||
</target>
|
||||
|
||||
<target name="test-junit-present">
|
||||
<available classname="junit.framework.Test" property="junit.present"/>
|
||||
</target>
|
||||
|
||||
<target name="test-junit-status"
|
||||
depends="test-junit-present">
|
||||
<condition property="junit.missing">
|
||||
<and>
|
||||
<isfalse value="${junit.present}"/>
|
||||
<isfalse value="${maven.test.skip}"/>
|
||||
</and>
|
||||
</condition>
|
||||
<condition property="junit.skipped">
|
||||
<or>
|
||||
<isfalse value="${junit.present}"/>
|
||||
<istrue value="${maven.test.skip}"/>
|
||||
</or>
|
||||
</condition>
|
||||
</target>
|
||||
|
||||
<target name="junit-missing"
|
||||
depends="test-junit-status"
|
||||
if="junit.missing">
|
||||
<echo>=================================== WARNING ===================================</echo>
|
||||
<echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
|
||||
<echo>===============================================================================</echo>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Javadoc target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="javadoc" description="Generates the Javadoc of the application">
|
||||
<javadoc sourcepath="${maven.build.srcDir.0}"
|
||||
packagenames="*"
|
||||
destdir="${maven.reporting.outputDirectory}/apidocs"
|
||||
access="protected"
|
||||
old="false"
|
||||
verbose="false"
|
||||
version="false"
|
||||
use="true"
|
||||
author="false"
|
||||
splitindex="false"
|
||||
nodeprecated="false"
|
||||
nodeprecatedlist="false"
|
||||
notree="false"
|
||||
noindex="false"
|
||||
nohelp="false"
|
||||
nonavbar="false"
|
||||
serialwarn="false"
|
||||
charset="ISO-8859-1"
|
||||
linksource="false"
|
||||
breakiterator="true"/>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Package target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="package" depends="compile,test" description="Package the application">
|
||||
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
|
||||
compress="true"
|
||||
index="false"
|
||||
basedir="${maven.build.outputDir}"
|
||||
excludes="**/package.html"/>
|
||||
</target>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- A dummy target for the package named after the type it creates -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="jar" depends="package" description="Builds the jar for the application"/>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
<!-- Download dependencies target -->
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
<target name="test-offline">
|
||||
<condition property="maven.mode.offline">
|
||||
<equals arg1="${maven.settings.offline}" arg2="true"/>
|
||||
</condition>
|
||||
</target>
|
||||
</project>
|
||||
@@ -6,7 +6,7 @@ EAPI="5"
|
||||
|
||||
JAVA_PKG_IUSE="doc source"
|
||||
|
||||
inherit java-pkg-2 java-ant-2
|
||||
inherit java-pkg-2 java-pkg-simple
|
||||
|
||||
MY_PN="netty"
|
||||
MY_P="${MY_PN}-${PV}"
|
||||
@@ -21,32 +21,26 @@ KEYWORDS="amd64 x86"
|
||||
CDEPEND="dev-java/commons-logging:0
|
||||
dev-java/javassist:3
|
||||
dev-java/log4j:0
|
||||
dev-java/slf4j-nop:0
|
||||
dev-java/slf4j-api:0"
|
||||
RDEPEND=">=virtual/jre-1.7
|
||||
RDEPEND=">=virtual/jre-1.6
|
||||
${CDEPEND}"
|
||||
DEPEND=">=virtual/jdk-1.7
|
||||
DEPEND=">=virtual/jdk-1.6
|
||||
${CDEPEND}"
|
||||
|
||||
S="${WORKDIR}/${MY_PN}-${MY_P}.Final/${PN/${MY_PN}-}"
|
||||
|
||||
EANT_BUILD_TARGET="package"
|
||||
JAVA_ANT_REWRITE_CLASSPATH="true"
|
||||
EANT_GENTOO_CLASSPATH="commons-logging,log4j,javassist-3,slf4j-api"
|
||||
JAVA_GENTOO_CLASSPATH="
|
||||
log4j
|
||||
slf4j-api
|
||||
slf4j-nop
|
||||
javassist-3
|
||||
commons-logging"
|
||||
|
||||
JAVA_SRC_DIR="src/main/java"
|
||||
|
||||
# Tests fail as they might need logging to be properly set up and/or compatible.
|
||||
#
|
||||
# junit.framework.AssertionFailedError: expected:<[foo]> but was:<[NOP]>
|
||||
# at io.netty.util.internal.logging.Slf4JLoggerFactoryTest.testCreation
|
||||
RESTRICT="test"
|
||||
|
||||
java_prepare() {
|
||||
#EANT_EXTRA_ARGS="-Dgentoo.classpath=$(java-pkg_getjars --build-only commons-logging,log4j,javassist-3,slf4j-api)"
|
||||
cp "${FILESDIR}"/${P}-build.xml build.xml || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
java-pkg_newjar target/${MY_PN}-*.jar ${PN}.jar
|
||||
|
||||
use doc && java-pkg_dojavadoc target/site/apidocs
|
||||
use source && java-pkg_dosrc src/main/java/*
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user