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

Gentoo Archives: gentoo-commits

From: "Jean-Noel Rivasseau (elvanor)" <elvanor@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/groovy: groovy-1.6.3.ebuild ChangeLog groovy-1.5.4-r1.ebuild
Date: Tue, 28 Jul 2009 14:35:18
Message-Id: E1MVnls-0002KB-US@stork.gentoo.org
1 elvanor 09/07/28 14:35:16
2
3 Modified: ChangeLog
4 Added: groovy-1.6.3.ebuild
5 Removed: groovy-1.5.4-r1.ebuild
6 Log:
7 Groovy-1.6.3 version bump (#235272)
8 (Portage version: 2.1.6.13/cvs/Linux i686)
9
10 Revision Changes Path
11 1.32 dev-java/groovy/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/groovy/ChangeLog?rev=1.32&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/groovy/ChangeLog?rev=1.32&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/groovy/ChangeLog?r1=1.31&r2=1.32
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v
20 retrieving revision 1.31
21 retrieving revision 1.32
22 diff -u -r1.31 -r1.32
23 --- ChangeLog 29 Mar 2009 16:40:07 -0000 1.31
24 +++ ChangeLog 28 Jul 2009 14:35:16 -0000 1.32
25 @@ -1,6 +1,17 @@
26 # ChangeLog for dev-java/groovy
27 -# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.31 2009/03/29 16:40:07 betelgeuse Exp $
29 +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
30 +# $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/ChangeLog,v 1.32 2009/07/28 14:35:16 elvanor Exp $
31 +
32 +*groovy-1.6.3 (28 Jul 2009)
33 +
34 + 28 Jul 2009; Jean-Noël Rivasseau <elvanor@×××××.com>
35 + -files/build.xml-1.0_rc01, -files/build.xml-1.0,
36 + -files/groovy-1.0-compiler-exit-code.patch,
37 + -files/groovy-1.0_rc01-compiler-exit-code.patch, -groovy-1.5.4-r1.ebuild,
38 + +groovy-1.6.3.ebuild, +files/groovy-build.patch,
39 + -files/groovy-build.xml.patch:
40 + Version bump to 1.6.3 (#235272), implemented partly doc USE flag,
41 + restricted tests, removed old ebuilds.
42
43 29 Mar 2009; Petteri Räty <betelgeuse@g.o> -groovy-1.5.4.ebuild,
44 groovy-1.5.4-r1.ebuild:
45
46
47
48 1.1 dev-java/groovy/groovy-1.6.3.ebuild
49
50 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/groovy/groovy-1.6.3.ebuild?rev=1.1&view=markup
51 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/groovy/groovy-1.6.3.ebuild?rev=1.1&content-type=text/plain
52
53 Index: groovy-1.6.3.ebuild
54 ===================================================================
55 # Copyright 1999-2009 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 # $Header: /var/cvsroot/gentoo-x86/dev-java/groovy/groovy-1.6.3.ebuild,v 1.1 2009/07/28 14:35:16 elvanor Exp $
58
59 # Groovy's build system is Ant based, but they use Maven for fetching the dependencies.
60 # We just have to remove the fetch dependencies target, and then we can use Ant for this ebuild.
61
62 # We currently do not build the embeddable jar (which is created using JarJar).
63 # We could provide that via an USE flag.
64 # We also don't use automatic build rewriting as there seems to be already some level of support
65 # in the upstream build system
66
67 # TODO: Install all 3 documentation packages. Currently only the Groovy GDK documentation is installed
68 # as our java-pkg_dojavadoc function does not support multiple Javadoc installations.
69 # There is also a bug (visible when loading groovyConsole for instance) where asm-1.5 is put on the cp,
70 # this conflicts with the 2.2 version needed by Groovy.
71
72 EAPI="2"
73 WANT_ANT_TASKS="ant-antlr"
74 JAVA_PKG_IUSE="doc source"
75
76 inherit versionator java-pkg-2 java-ant-2
77
78 MY_PV=${PV/_rc/-RC-}
79 MY_P="${PN}-${MY_PV}"
80
81 DESCRIPTION="Groovy is a high-level dynamic language for the JVM"
82 HOMEPAGE="http://groovy.codehaus.org/"
83
84 SRC_URI="http://dist.groovy.codehaus.org/distributions/${PN}-src-${PV}.zip"
85 LICENSE="codehaus-groovy"
86 SLOT="0"
87 KEYWORDS="~amd64 ~ppc ~x86"
88 IUSE="test"
89 RESTRICT="test"
90
91 CDEPEND="
92 dev-java/asm:2.2
93 dev-java/antlr:0
94 >=dev-java/xstream-1.3
95 >=dev-java/junit-3.8.2:0
96 >=dev-java/jline-0.9.91
97 >=dev-java/ant-core-1.7.0
98 >=dev-java/commons-cli-1.2
99 dev-java/servletapi:2.4
100 >=dev-java/bsf-2.4
101 java-virtuals/jmx"
102
103 RDEPEND=">=virtual/jre-1.5
104 ${CDEPEND}"
105
106 DEPEND=">=virtual/jdk-1.5
107 dev-java/ant-ivy:2
108 doc? (
109 dev-java/qdox
110 )
111 test? (
112 dev-java/jmock
113 dev-java/xmlunit
114 dev-db/hsqldb
115 dev-java/commons-logging
116 dev-java/ant-junit
117 dev-java/ant-trax
118 )
119 ${CDEPEND}"
120
121 S="${WORKDIR}/${MY_P}"
122
123 JAVA_PKG_BSFIX=""
124
125 src_prepare() {
126 epatch "${FILESDIR}/${PN}-build.patch"
127
128 rm -rf bootstrap
129 # security directory is needed for tests, but they currently don't pass
130 #rm -rf security
131 mkdir -p target/lib && cd target/lib
132 mkdir compile && mkdir runtime && mkdir tools
133 cd compile
134
135 java-pkg_jar-from commons-cli-1,ant-core,antlr,asm-2.2,xstream
136 java-pkg_jar-from jline,junit,servletapi-2.4,bsf-2.3
137 java-pkg_jar-from --virtual jmx
138 java-pkg_jar-from --build-only ant-ivy:2
139 use doc && java-pkg_jar-from --build-only qdox-1.6
140 }
141
142 src_compile() {
143 eant -DskipTests="true" -DruntimeLibDirectory="target/lib/compile" \
144 -DtoolsLibDirectory="target/lib/compile" -DskipFetch="true" -DskipEmbeddable="true"
145
146 use doc && ANT_OPTS="-Duser.home=${T}" eant -Dno.grammars -DruntimeLibDirectory="target/lib/compile" \
147 -DtoolsLibDirectory="target/lib/compile" -DtestLibDirectory="target/lib/compile" -DskipFetch="true" doc
148 }
149
150 src_test() {
151 cd "${S}/target/lib" && mkdir test && mkdir extras && cd compile
152
153 java-pkg_jar-from --build-only ant-junit,jmock-1.0,xmlunit-1,hsqldb,commons-logging,cglib-2.1
154
155 cd "${S}"
156 ANT_TASKS="ant-junit ant-antlr ant-trax" ANT_OPTS="-Duser.home=${T}" eant \
157 -DruntimeLibDirectory="target/lib/compile" -DtestLibDirectory="target/lib/compile" -DskipFetch="true" test
158 }
159
160 src_install() {
161 java-pkg_newjar "target/dist/${PN}.jar"
162 use doc && java-pkg_dojavadoc "target/html/groovy-jdk/"
163
164 # FIXME: install those two later
165 #
166 #use doc && java-pkg_dojavadoc "target/html/api/"
167 #use doc && java-pkg_dojavadoc "target/html/gapi/"
168
169 use source && java-pkg_dosrc "src/main/groovy" "src/main/org"
170 java-pkg_dolauncher "groovyc" --main org.codehaus.groovy.tools.FileSystemCompiler
171 java-pkg_dolauncher "groovy" --main groovy.ui.GroovyMain
172 java-pkg_dolauncher "groovysh" --main groovy.ui.InteractiveShell
173 java-pkg_dolauncher "groovyConsole" --main groovy.ui.Console
174 }
Report Message
Find on MARC Find on Google Groups