[gentoo-commits] gentoo-x86 commit in dev-java/eclipse-ecj: eclipse-ecj-3.5.1.ebuild metadata.xml ChangeLog

[gentoo-commits] gentoo-x86 commit in dev-java/eclipse-ecj: eclipse-ecj-3.5.1.ebuild metadata.xml ChangeLog

[Vlastimil Babka (caster)]

caster      09/11/04 19:05:36

  Modified:             metadata.xml ChangeLog
  Added:                eclipse-ecj-3.5.1.ebuild
  Log:
  Version bump. Fixes bug #278000 Instead of java6 flag, it builds most using 1.4 bytecode and only 1.6 specific parts with 1.6 bytecode, as upstream does. Adds local USE flag 'ant' enabled by default, which pulls the Ant adapter in PDEPEND.
  (Portage version: 2.2_rc48/cvs/Linux x86_64)

Revision  Changes    Path
1.4                  dev-java/eclipse-ecj/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/eclipse-ecj/metadata.xml?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/eclipse-ecj/metadata.xml?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/eclipse-ecj/metadata.xml?r1=1.3&r2=1.4

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/metadata.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- metadata.xml	11 Feb 2009 20:22:49 -0000	1.3
+++ metadata.xml	4 Nov 2009 19:05:35 -0000	1.4
@@ -9,4 +9,7 @@
 used with Ant by using the -lib option to and and setting
 -Dbuild.compiler=ecj
 </longdescription>
+<use>
+	<flag name="ant">Support using ecj in Ant builds via dev-java/ant-eclipse-ecj</flag>
+</use>
 </pkgmetadata>



1.59                 dev-java/eclipse-ecj/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- ChangeLog	4 Nov 2009 17:50:42 -0000	1.58
+++ ChangeLog	4 Nov 2009 19:05:35 -0000	1.59
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/eclipse-ecj
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.58 2009/11/04 17:50:42 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.59 2009/11/04 19:05:35 caster Exp $
+
+*eclipse-ecj-3.5.1 (04 Nov 2009)
+
+  04 Nov 2009; Vlastimil Babka <caster@gentoo.org>
+  +eclipse-ecj-3.5.1.ebuild, metadata.xml:
+  Version bump. Fixes bug #277998. Instead of java6 flag, it builds most
+  using 1.4 bytecode and only 1.6 specific parts with 1.6 bytecode, as
+  upstream does. Adds local USE flag 'ant' enabled by default, which pulls
+  the Ant adapter in PDEPEND.
 
   04 Nov 2009; Vlastimil Babka <caster@gentoo.org>
   -eclipse-ecj-3.2.2.ebuild, -files/ecj-3.3, -eclipse-ecj-3.3.0-r2.ebuild,



1.1                  dev-java/eclipse-ecj/eclipse-ecj-3.5.1.ebuild

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

Index: eclipse-ecj-3.5.1.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-3.5.1.ebuild,v 1.1 2009/11/04 19:05:35 caster Exp $

EAPI=2

inherit java-pkg-2

MY_PN="ecj"
DMF="R-${PV}-200909170800"
S="${WORKDIR}"

DESCRIPTION="Eclipse Compiler for Java"
HOMEPAGE="http://www.eclipse.org/"
SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-${PV}.zip"

IUSE="+ant"

LICENSE="EPL-1.0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
SLOT="3.5"

CDEPEND=">=app-admin/eselect-ecj-0.3"

JAVA_PKG_WANT_SOURCE=1.4
JAVA_PKG_WANT_TARGET=1.4

DEPEND="${CDEPEND}
	app-arch/unzip
	>=virtual/jdk-1.6
	sys-apps/findutils"
RDEPEND="${CDEPEND}
	>=virtual/jre-1.4"
PDEPEND="ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"

src_unpack() {
	unpack ${A}
	cd "${S}"

	# These have their own package.
	rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die
	rm -fr org/eclipse/jdt/internal/antadapter || die

	# upstream build.xml excludes this
	rm META-INF/eclipse.inf
}

src_compile() {
	local javac_opts javac java jar

	javac_opts="$(java-pkg_javac-args) -encoding ISO-8859-1"
	javac="$(java-config -c)"
	java="$(java-config -J)"
	jar="$(java-config -j)"

	find org/ -path org/eclipse/jdt/internal/compiler/apt -prune -o \
		-path org/eclipse/jdt/internal/compiler/tool -prune -o -name '*.java' \
		-print > sources-1.4
	find org/eclipse/jdt/internal/compiler/{apt,tool} -name '*.java' > sources-1.6

	mkdir -p bootstrap || die
	cp -pPR org bootstrap || die
	cd "${S}/bootstrap" || die

	einfo "bootstrapping ${MY_PN} with ${javac} ..."
	${javac} ${javac_opts} @../sources-1.4 || die
	${javac} -encoding ISO-8859-1 -source 1.6 -target 1.6 @../sources-1.6 || die

	find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' \
		| xargs ${jar} cf ${MY_PN}.jar

	cd "${S}" || die
	einfo "building ${MY_PN} with bootstrapped ${MY_PN} ..."
	${java} -classpath bootstrap/${MY_PN}.jar \
		org.eclipse.jdt.internal.compiler.batch.Main \
		${javac_opts} -nowarn @sources-1.4 || die
	${java} -classpath bootstrap/${MY_PN}.jar \
		org.eclipse.jdt.internal.compiler.batch.Main \
		-encoding ISO-8859-1 -source 1.6 -target 1.6 -nowarn @sources-1.6 || die

	find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' \
		| xargs ${jar} cf ${MY_PN}.jar
}

src_install() {
	java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
		org.eclipse.jdt.internal.compiler.batch.Main

	# disable the class version verify, this has intentionally
	# some classes with 1.6, but most is 1.4
	JAVA_PKG_STRICT="" java-pkg_dojar ${MY_PN}.jar
}

pkg_postinst() {
	einfo "To select between slots of ECJ..."
	einfo " # eselect ecj"

	eselect ecj update ecj-${SLOT}
}

pkg_postrm() {
	eselect ecj update
}