Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Vlastimil Babka (caster)" <caster@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/eclipse-ecj: eclipse-ecj-3.5.1.ebuild metadata.xml ChangeLog
Date: Wed, 04 Nov 2009 19:05:39
Message-Id: E1N5lAm-0002Qd-Gb@stork.gentoo.org
1 caster 09/11/04 19:05:36
2
3 Modified: metadata.xml ChangeLog
4 Added: eclipse-ecj-3.5.1.ebuild
5 Log:
6 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.
7 (Portage version: 2.2_rc48/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.4 dev-java/eclipse-ecj/metadata.xml
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/eclipse-ecj/metadata.xml?rev=1.4&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/eclipse-ecj/metadata.xml?rev=1.4&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/eclipse-ecj/metadata.xml?r1=1.3&r2=1.4
15
16 Index: metadata.xml
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/metadata.xml,v
19 retrieving revision 1.3
20 retrieving revision 1.4
21 diff -u -r1.3 -r1.4
22 --- metadata.xml 11 Feb 2009 20:22:49 -0000 1.3
23 +++ metadata.xml 4 Nov 2009 19:05:35 -0000 1.4
24 @@ -9,4 +9,7 @@
25 used with Ant by using the -lib option to and and setting
26 -Dbuild.compiler=ecj
27 </longdescription>
28 +<use>
29 + <flag name="ant">Support using ecj in Ant builds via dev-java/ant-eclipse-ecj</flag>
30 +</use>
31 </pkgmetadata>
32
33
34
35 1.59 dev-java/eclipse-ecj/ChangeLog
36
37 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/eclipse-ecj/ChangeLog?rev=1.59&view=markup
38 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/eclipse-ecj/ChangeLog?rev=1.59&content-type=text/plain
39 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/eclipse-ecj/ChangeLog?r1=1.58&r2=1.59
40
41 Index: ChangeLog
42 ===================================================================
43 RCS file: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v
44 retrieving revision 1.58
45 retrieving revision 1.59
46 diff -u -r1.58 -r1.59
47 --- ChangeLog 4 Nov 2009 17:50:42 -0000 1.58
48 +++ ChangeLog 4 Nov 2009 19:05:35 -0000 1.59
49 @@ -1,6 +1,15 @@
50 # ChangeLog for dev-java/eclipse-ecj
51 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
52 -# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.58 2009/11/04 17:50:42 caster Exp $
53 +# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.59 2009/11/04 19:05:35 caster Exp $
54 +
55 +*eclipse-ecj-3.5.1 (04 Nov 2009)
56 +
57 + 04 Nov 2009; Vlastimil Babka <caster@g.o>
58 + +eclipse-ecj-3.5.1.ebuild, metadata.xml:
59 + Version bump. Fixes bug #277998. Instead of java6 flag, it builds most
60 + using 1.4 bytecode and only 1.6 specific parts with 1.6 bytecode, as
61 + upstream does. Adds local USE flag 'ant' enabled by default, which pulls
62 + the Ant adapter in PDEPEND.
63
64 04 Nov 2009; Vlastimil Babka <caster@g.o>
65 -eclipse-ecj-3.2.2.ebuild, -files/ecj-3.3, -eclipse-ecj-3.3.0-r2.ebuild,
66
67
68
69 1.1 dev-java/eclipse-ecj/eclipse-ecj-3.5.1.ebuild
70
71 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-3.5.1.ebuild?rev=1.1&view=markup
72 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
73
74 Index: eclipse-ecj-3.5.1.ebuild
75 ===================================================================
76 # Copyright 1999-2009 Gentoo Foundation
77 # Distributed under the terms of the GNU General Public License v2
78 # $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 $
79
80 EAPI=2
81
82 inherit java-pkg-2
83
84 MY_PN="ecj"
85 DMF="R-${PV}-200909170800"
86 S="${WORKDIR}"
87
88 DESCRIPTION="Eclipse Compiler for Java"
89 HOMEPAGE="http://www.eclipse.org/"
90 SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-${PV}.zip"
91
92 IUSE="+ant"
93
94 LICENSE="EPL-1.0"
95 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
96 SLOT="3.5"
97
98 CDEPEND=">=app-admin/eselect-ecj-0.3"
99
100 JAVA_PKG_WANT_SOURCE=1.4
101 JAVA_PKG_WANT_TARGET=1.4
102
103 DEPEND="${CDEPEND}
104 app-arch/unzip
105 >=virtual/jdk-1.6
106 sys-apps/findutils"
107 RDEPEND="${CDEPEND}
108 >=virtual/jre-1.4"
109 PDEPEND="ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
110
111 src_unpack() {
112 unpack ${A}
113 cd "${S}"
114
115 # These have their own package.
116 rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die
117 rm -fr org/eclipse/jdt/internal/antadapter || die
118
119 # upstream build.xml excludes this
120 rm META-INF/eclipse.inf
121 }
122
123 src_compile() {
124 local javac_opts javac java jar
125
126 javac_opts="$(java-pkg_javac-args) -encoding ISO-8859-1"
127 javac="$(java-config -c)"
128 java="$(java-config -J)"
129 jar="$(java-config -j)"
130
131 find org/ -path org/eclipse/jdt/internal/compiler/apt -prune -o \
132 -path org/eclipse/jdt/internal/compiler/tool -prune -o -name '*.java' \
133 -print > sources-1.4
134 find org/eclipse/jdt/internal/compiler/{apt,tool} -name '*.java' > sources-1.6
135
136 mkdir -p bootstrap || die
137 cp -pPR org bootstrap || die
138 cd "${S}/bootstrap" || die
139
140 einfo "bootstrapping ${MY_PN} with ${javac} ..."
141 ${javac} ${javac_opts} @../sources-1.4 || die
142 ${javac} -encoding ISO-8859-1 -source 1.6 -target 1.6 @../sources-1.6 || die
143
144 find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' \
145 | xargs ${jar} cf ${MY_PN}.jar
146
147 cd "${S}" || die
148 einfo "building ${MY_PN} with bootstrapped ${MY_PN} ..."
149 ${java} -classpath bootstrap/${MY_PN}.jar \
150 org.eclipse.jdt.internal.compiler.batch.Main \
151 ${javac_opts} -nowarn @sources-1.4 || die
152 ${java} -classpath bootstrap/${MY_PN}.jar \
153 org.eclipse.jdt.internal.compiler.batch.Main \
154 -encoding ISO-8859-1 -source 1.6 -target 1.6 -nowarn @sources-1.6 || die
155
156 find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' \
157 | xargs ${jar} cf ${MY_PN}.jar
158 }
159
160 src_install() {
161 java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
162 org.eclipse.jdt.internal.compiler.batch.Main
163
164 # disable the class version verify, this has intentionally
165 # some classes with 1.6, but most is 1.4
166 JAVA_PKG_STRICT="" java-pkg_dojar ${MY_PN}.jar
167 }
168
169 pkg_postinst() {
170 einfo "To select between slots of ECJ..."
171 einfo " # eselect ecj"
172
173 eselect ecj update ecj-${SLOT}
174 }
175
176 pkg_postrm() {
177 eselect ecj update
178 }
Report Message
Find on MARC Find on Google Groups