commit: 365b7d96ce16ca62a8ddfd590cff1932b37064f4 Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com> AuthorDate: Fri Apr 3 20:23:01 2015 +0000 Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com> CommitDate: Fri Apr 3 20:23:01 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=365b7d96
dev-java/gluegen: rework ebuild starting from 2.1.4 Package-Manager: portage-2.2.18 dev-java/gluegen/ChangeLog | 5 ++ dev-java/gluegen/files/2.2.4-dont-copy-jars.patch | 17 ++++++ dev-java/gluegen/files/2.2.4-dont-strip.patch | 22 ++++++++ .../gluegen/files/2.2.4-dont-test-archive.patch | 16 ++++++ dev-java/gluegen/gluegen-2.2.4.ebuild | 60 +++++++--------------- 5 files changed, 78 insertions(+), 42 deletions(-) diff --git a/dev-java/gluegen/ChangeLog b/dev-java/gluegen/ChangeLog index c8a71e9..4982a6b 100644 --- a/dev-java/gluegen/ChangeLog +++ b/dev-java/gluegen/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 03 Apr 2015; Guillaume Horel <[email protected]> + +files/2.2.4-dont-copy-jars.patch, +files/2.2.4-dont-strip.patch, + +files/2.2.4-dont-test-archive.patch, gluegen-2.2.4.ebuild: + dev-java/gluegen: rework ebuild starting from 2.1.4 + *gluegen-2.2.4 (03 Apr 2015) 03 Apr 2015; Guillaume Horel <[email protected]> diff --git a/dev-java/gluegen/files/2.2.4-dont-copy-jars.patch b/dev-java/gluegen/files/2.2.4-dont-copy-jars.patch new file mode 100644 index 0000000..dca10dc --- /dev/null +++ b/dev-java/gluegen/files/2.2.4-dont-copy-jars.patch @@ -0,0 +1,17 @@ +diff --git a/gluegen-2.1.4_rc01/make/build.xml b/gluegen-2.1.4_rc01/make/build.xml +index 55ef270..bce6d12 100644 +--- a/gluegen-2.1.4_rc01/make/build.xml ++++ b/gluegen-2.1.4_rc01/make/build.xml +@@ -806,12 +806,6 @@ + </fileset> + </jar> + +- <!-- Copy antlr.jar into build directory for convenience so +- gluegen.jar can be run via "java -jar". antlr.jar is +- referenced via a Class-Path entry in the Manifest of +- gluegen.jar. --> +- <copy file="${antlr.jar}" todir="${build}" /> +- + <!-- copy a jnlp with empty codebase into build folder for local testing + overwrite property in gluegen.proerpties if desired --> + <property name="gluegen.jnlp.codebase" value=""/> diff --git a/dev-java/gluegen/files/2.2.4-dont-strip.patch b/dev-java/gluegen/files/2.2.4-dont-strip.patch new file mode 100644 index 0000000..02020d2 --- /dev/null +++ b/dev-java/gluegen/files/2.2.4-dont-strip.patch @@ -0,0 +1,22 @@ +diff --git a/gluegen-2.1.4_rc01/make/gluegen-cpptasks-base.xml b/gluegen-2.1.4_rc01/make/gluegen-cpptasks-base.xml +index 8b8b82e..ec39aeb 100755 +--- a/gluegen-2.1.4_rc01/make/gluegen-cpptasks-base.xml ++++ b/gluegen-2.1.4_rc01/make/gluegen-cpptasks-base.xml +@@ -1511,17 +1511,6 @@ + - Helper strip.libraries for stripping off debug information + --> + <target name="gluegen.cpptasks.striplibs" depends="gluegen.cpptasks.initialize" if="c.strip.libraries"> +- <echo message="Strip symbols from libs in ${libdir}" /> +- <apply dir="${libdir}" executable="${c.strip.tool}" parallel="false" +- failonerror="true"> +- <arg line="${c.strip.args}"/> +- <fileset dir="${libdir}"> +- <include name="**/*.so"/> <!-- unix --> +- <include name="**/*.dll"/> <!-- windows --> +- <include name="**/*.dylib"/> <!-- macosx --> +- <include name="**/*.jnilib"/> <!-- macosx --> +- </fileset> +- </apply> + </target> + + <!-- ================================================================== --> diff --git a/dev-java/gluegen/files/2.2.4-dont-test-archive.patch b/dev-java/gluegen/files/2.2.4-dont-test-archive.patch new file mode 100644 index 0000000..3eb061f --- /dev/null +++ b/dev-java/gluegen/files/2.2.4-dont-test-archive.patch @@ -0,0 +1,16 @@ +diff --git a/gluegen-2.1.4_rc01/make/build-test.xml b/gluegen-2.1.4_rc01/make/build-test.xml +index 31dc773..e872a0a 100644 +--- a/gluegen-2.1.4_rc01/make/build-test.xml ++++ b/gluegen-2.1.4_rc01/make/build-test.xml +@@ -614,9 +614,11 @@ chmod 644 ${results}/* \${line.separator} + + <!-- updates / create the test results zip file --> + <target name="test-zip-archive" depends="init"> ++ <!-- + <archive.7z destfile="${build}/${test.archive.name}.7z" + basedir="${project.root}" + includes="${rootrel.build}/test/results ${rootrel.build}/test/results-x64 ${rootrel.build}/test/results-x32" /> ++ --> + </target> + + diff --git a/dev-java/gluegen/gluegen-2.2.4.ebuild b/dev-java/gluegen/gluegen-2.2.4.ebuild index 3ecca4b..e2f5a47 100644 --- a/dev-java/gluegen/gluegen-2.2.4.ebuild +++ b/dev-java/gluegen/gluegen-2.2.4.ebuild @@ -2,24 +2,16 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -############################################################################### -# WARNING: don't add to main tree without fixing QA issues first! -############################################################################### - EAPI=5 -RESTRICT="test" #require jardiff - JAVA_PKG_IUSE="doc source test" +WANT_ANT_TASKS="ant-antlr ant-contrib dev-java/cpptasks:0" inherit java-pkg-2 java-ant-2 -MY_PV=v"${PV}" -MY_P="${PN}"-"${MY_PV}" -DESCRIPTION="GlueGen is a tool which automatically generates the Java and JNI -code necessary to call C libraries" +DESCRIPTION="Automatically generate the JNI code necessary to call C libraries" HOMEPAGE="http://jogamp.org/gluegen/www/"; -SRC_URI="http://jogamp.org/deployment/archive/rc/${MY_PV}/archive/Sources/${MY_P}.tar.7z"; +SRC_URI="https://github.com/sgothel/gluegen/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="2.2" @@ -31,50 +23,34 @@ COMMON_DEP=" dev-java/antlr:0" RDEPEND="${COMMON_DEP} >=virtual/jre-1.5" + DEPEND="${COMMON_DEP} >=virtual/jdk-1.5 - app-arch/p7zip - dev-java/ant-antlr:0 - dev-java/ant-contrib:0 - dev-java/ant-nodeps:0 dev-java/cpptasks:0 - test? ( dev-java/junit:4 )" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - default - unpack ./${MY_P}.tar -} - -java_prepare() { - rm -rf make/lib -} + test? ( + dev-java/junit:4 + dev-java/ant-junit4 + )" JAVA_ANT_REWRITE_CLASSPATH="yes" - EANT_BUILD_XML="make/build.xml" -EANT_BUILD_TARGET="init gluegen.build.java gluegen.build.c tag.build" -EANT_TEST_TARGET="junit.run" +EANT_BUILD_TARGET="all.no_junit" EANT_DOC_TARGET="" EANT_GENTOO_CLASSPATH="antlr,ant-core" EANT_NEEDS_TOOLS="yes" -EANT_ANT_TASKS="ant-antlr ant-contrib ant-nodeps cpptasks" - -src_configure() { - use test && EANT_GENTOO_CLASSPATH+=",junit-4" - default -} +EANT_TEST_TARGET="junit.run" +EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4" +EANT_GENTOO_CLASSPATH_EXTRA="${S}/build/${PN}{,-rt}.jar" +EANT_EXTRA_ARGS="-Dc.strip.libraries=false" -src_compile() { - # FIXME don't copy around jars - EANT_EXTRA_ARGS+=" -Dantlr.jar=\"$(java-pkg_getjar --build-only antlr antlr.jar)\"" - java-pkg-2_src_compile +java_prepare() { + rm -rf make/lib + epatch "${FILESDIR}"/${PV}-*.patch + java-ant_bsfix_files "${S}/make/build-test.xml" } src_test() { - EANT_EXTRA_ARGS+=" -Djunit.jar=\"$(java-pkg_getjar --build-only junit-4 junit.jar)\"" - java-pkg-2_src_test + EANT_TASKS="ant-junit4" java-pkg-2_src_test } src_install() {
