public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-java/javacc: ChangeLog javacc-5.0.ebuild
@ 2010-03-16 11:12 Alistair Bush (ali_bush)
  0 siblings, 0 replies; 2+ messages in thread
From: Alistair Bush (ali_bush) @ 2010-03-16 11:12 UTC (permalink / raw
  To: gentoo-commits

ali_bush    10/03/16 11:12:42

  Modified:             ChangeLog
  Added:                javacc-5.0.ebuild
  Log:
  Version Bump javacc to 5.0.
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.31                 dev-java/javacc/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/javacc/ChangeLog?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/javacc/ChangeLog?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/javacc/ChangeLog?r1=1.30&r2=1.31

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ChangeLog	21 Jun 2009 09:21:22 -0000	1.30
+++ ChangeLog	16 Mar 2010 11:12:41 -0000	1.31
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/javacc
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.30 2009/06/21 09:21:22 caster Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.31 2010/03/16 11:12:41 ali_bush Exp $
+
+*javacc-5.0 (16 Mar 2010)
+
+  16 Mar 2010; Alistair Bush <ali_bush@gentoo.org> +javacc-5.0.ebuild:
+  Version Bump javacc to 5.0
 
   21 Jun 2009; Vlastimil Babka <caster@gentoo.org> javacc-4.2.ebuild:
   Fix building with ecj (bug #249288) and depend on 1.5 jdk only when tests



1.1                  dev-java/javacc/javacc-5.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/javacc/javacc-5.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/javacc/javacc-5.0.ebuild?rev=1.1&content-type=text/plain

Index: javacc-5.0.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/javacc-5.0.ebuild,v 1.1 2010/03/16 11:12:41 ali_bush Exp $

JAVA_PKG_IUSE="doc examples source test"
EAPI="2"

inherit java-pkg-2 java-ant-2 eutils

DESCRIPTION="Java Compiler Compiler - The Java Parser Generator"
HOMEPAGE="https://javacc.dev.java.net/"
SRC_URI="https://${PN}.dev.java.net/files/documents/17/142527/${P}src.tar.gz"
LICENSE="BSD"
SLOT="0"
IUSE=""
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
DEPEND=">=virtual/jdk-1.5
	dev-java/junit:0
	test? (
		>=virtual/jdk-1.5
		dev-java/ant-junit
	)
	!test? ( >=virtual/jdk-1.4 )"
RDEPEND=">=virtual/jre-1.4
	dev-java/junit:0"

# We don't want 1.5 bytecode just because of the testcase
JAVA_PKG_WANT_TARGET="1.4"
JAVA_PKG_WANT_SOURCE="1.4"

S="${WORKDIR}/${PN}"

java_prepare() {
	epatch "${FILESDIR}"/${PN}-4.0-javadoc.patch
	rm -v lib/junit*/*.jar || die
}

_eant() {
	eant -Djunit.jar="$(java-pkg_getjar --build-only junit junit.jar)" "${@}"
}

src_compile() {
	_eant jar $(use_doc)
}

src_test() {
	# this testcase wants 1.5 and this seems the easiest way to do it
	JAVA_PKG_WANT_SOURCE="1.5" JAVA_PKG_WANT_TARGET="1.5" java-ant_bsfix_one examples/JavaGrammars/1.5/build.xml
	ANT_TASKS="ant-junit" _eant test
}

src_install() {
	java-pkg_dojar bin/lib/${PN}.jar

	dodoc README || die

	if use doc; then
		java-pkg_dohtml -r www/*
		java-pkg_dojavadoc doc/api
	fi
	if use examples; then
		dodir /usr/share/doc/${PF}/examples
		cp -R examples/* "${D}"/usr/share/doc/${PF}/examples
	fi
	use source && java-pkg_dosrc src/*

	echo "JAVACC_HOME=/usr/share/javacc/" > "${T}"/22javacc
	doenvd "${T}"/22javacc

	echo "export VERSION=${PV}" > "${T}"/pre

	local launcher
	for launcher in javacc jjdoc jjtree
	do
		java-pkg_dolauncher ${launcher} -pre "${T}"/pre --main ${launcher}
	done
}






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-java/javacc: ChangeLog javacc-5.0.ebuild
@ 2011-01-29 11:07 Miroslav Sulc (fordfrog)
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Sulc (fordfrog) @ 2011-01-29 11:07 UTC (permalink / raw
  To: gentoo-commits

fordfrog    11/01/29 11:07:07

  Modified:             ChangeLog javacc-5.0.ebuild
  Log:
  dev-java/javacc: some fixes
  
  (Portage version: 2.1.9.35/cvs/Linux x86_64)

Revision  Changes    Path
1.33                 dev-java/javacc/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javacc/ChangeLog?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javacc/ChangeLog?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javacc/ChangeLog?r1=1.32&r2=1.33

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ChangeLog	21 Mar 2010 15:32:57 -0000	1.32
+++ ChangeLog	29 Jan 2011 11:07:07 -0000	1.33
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/javacc
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.32 2010/03/21 15:32:57 phajdan.jr Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/ChangeLog,v 1.33 2011/01/29 11:07:07 fordfrog Exp $
+
+  29 Jan 2011; Miroslav Šulc <fordfrog@gentoo.org> javacc-5.0.ebuild:
+  Did some fixes with regard to jdk version in the ebuild, but it still fails
+  tests
 
   21 Mar 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> javacc-4.2.ebuild:
   x86 stable wrt bug #309265



1.2                  dev-java/javacc/javacc-5.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javacc/javacc-5.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javacc/javacc-5.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/javacc/javacc-5.0.ebuild?r1=1.1&r2=1.2

Index: javacc-5.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/javacc/javacc-5.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- javacc-5.0.ebuild	16 Mar 2010 11:12:41 -0000	1.1
+++ javacc-5.0.ebuild	29 Jan 2011 11:07:07 -0000	1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/javacc-5.0.ebuild,v 1.1 2010/03/16 11:12:41 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/javacc-5.0.ebuild,v 1.2 2011/01/29 11:07:07 fordfrog Exp $
 
 JAVA_PKG_IUSE="doc examples source test"
 EAPI="2"
@@ -16,18 +16,10 @@
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 DEPEND=">=virtual/jdk-1.5
 	dev-java/junit:0
-	test? (
-		>=virtual/jdk-1.5
-		dev-java/ant-junit
-	)
-	!test? ( >=virtual/jdk-1.4 )"
-RDEPEND=">=virtual/jre-1.4
+	test? (	dev-java/ant-junit )"
+RDEPEND=">=virtual/jre-1.5
 	dev-java/junit:0"
 
-# We don't want 1.5 bytecode just because of the testcase
-JAVA_PKG_WANT_TARGET="1.4"
-JAVA_PKG_WANT_SOURCE="1.4"
-
 S="${WORKDIR}/${PN}"
 
 java_prepare() {
@@ -40,12 +32,12 @@
 }
 
 src_compile() {
+	# this testcase wants 1.5 and this seems the easiest way to do it
+	JAVA_PKG_WANT_SOURCE="1.5" JAVA_PKG_WANT_TARGET="1.5" java-ant_bsfix_one examples/JavaGrammars/1.5/build.xml
 	_eant jar $(use_doc)
 }
 
 src_test() {
-	# this testcase wants 1.5 and this seems the easiest way to do it
-	JAVA_PKG_WANT_SOURCE="1.5" JAVA_PKG_WANT_TARGET="1.5" java-ant_bsfix_one examples/JavaGrammars/1.5/build.xml
 	ANT_TASKS="ant-junit" _eant test
 }
 






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-01-29 11:07 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-29 11:07 [gentoo-commits] gentoo-x86 commit in dev-java/javacc: ChangeLog javacc-5.0.ebuild Miroslav Sulc (fordfrog)
  -- strict thread matches above, loose matches on Subject: below --
2010-03-16 11:12 Alistair Bush (ali_bush)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox