Lines 18-42
Link Here
|
18 |
KEYWORDS="amd64 x86" |
18 |
KEYWORDS="amd64 x86" |
19 |
|
19 |
|
20 |
CDEPEND=" |
20 |
CDEPEND=" |
21 |
dev-java/junit:4 |
21 |
dev-java/ant-core:0 |
22 |
dev-java/ant-junit:0 |
22 |
dev-java/ant-junit:0 |
23 |
dev-java/ant-nodeps:0 |
23 |
dev-java/ant-nodeps:0 |
|
|
24 |
dev-java/hamcrest-core:0 |
25 |
dev-java/jflex:0 |
24 |
contrib? ( |
26 |
contrib? ( |
|
|
27 |
dev-java/junit:4 |
25 |
dev-java/jakarta-regexp:1.4 |
28 |
dev-java/jakarta-regexp:1.4 |
26 |
dev-java/commons-compress:0 |
29 |
dev-java/commons-compress:0 |
27 |
dev-java/commons-collections:0 |
30 |
dev-java/commons-collections:0 |
28 |
dev-java/commons-digester:0 |
31 |
dev-java/commons-digester:0 |
29 |
dev-java/commons-logging:0 |
32 |
dev-java/commons-logging:0 |
30 |
dev-java/commons-beanutils:1.7 |
33 |
dev-java/commons-beanutils:1.7 |
|
|
34 |
dev-java/commons-codec:0 |
35 |
dev-java/icu4j:56 |
31 |
)" |
36 |
)" |
32 |
|
37 |
|
33 |
DEPEND=" |
38 |
DEPEND=" |
34 |
${CDEPEND} |
39 |
${CDEPEND} |
35 |
>=virtual/jdk-1.6 |
40 |
>=virtual/jdk-1.6" |
36 |
test? ( |
|
|
37 |
dev-java/junit:4 |
38 |
dev-java/ant-core:0 |
39 |
)" |
40 |
|
41 |
|
41 |
RDEPEND=" |
42 |
RDEPEND=" |
42 |
${CDEPEND} |
43 |
${CDEPEND} |
Lines 48-117
Link Here
|
48 |
JRE_VERSION_MIGRATION.txt |
49 |
JRE_VERSION_MIGRATION.txt |
49 |
) |
50 |
) |
50 |
|
51 |
|
51 |
# All tests fail with the following error: |
52 |
# [0]: Patch so that we can compile the package against ICU 50 and above |
52 |
# junit.framework.AssertionFailedError: ensure your setUp() calls super.setUp()!!! |
53 |
PATCHES=( |
|
|
54 |
"${FILESDIR}"/lucene_contrib_icu4j_v50.patch |
55 |
) |
56 |
|
57 |
EANT_GENTOO_CLASSPATH=" |
58 |
ant-core |
59 |
ant-junit |
60 |
junit-4 |
61 |
hamcrest-core |
62 |
jflex |
63 |
" |
64 |
EANT_EXTRA_ARGS="-Dversion=${PV} -Dfailonjavadocwarning=false" |
65 |
EANT_DOC_TARGET="javadocs-core" |
66 |
|
67 |
EANT_TEST_TARGET="test-core" |
68 |
EANT_TEST_EXTRA_ARGS="-Dheadless=true -Djava.io.tmpdir=${T}" |
69 |
EANT_TEST_GENTOO_CLASSPATH=" |
70 |
ant-core |
71 |
ant-junit |
72 |
junit-4 |
73 |
" |
74 |
EANT_TEST_ANT_TASKS="ant-junit" |
75 |
|
76 |
JAVA_ANT_REWRITE_CLASSPATH="yes" |
77 |
|
78 |
# All tests in contrib/icu/test fail. |
53 |
RESTRICT="test" |
79 |
RESTRICT="test" |
54 |
|
80 |
|
55 |
src_prepare() { |
81 |
src_prepare() { |
56 |
default |
82 |
default |
57 |
java-pkg_clean |
83 |
|
58 |
sed -i \ |
84 |
sed -i \ |
59 |
-e '/-Xmax/ d' \ |
85 |
-e '/-Xmax/ d' \ |
|
|
86 |
-e '/property="ivy.available"/s,resource="${ivy.resource}",file="." type="dir",g' \ |
87 |
-e '/<ivy:retrieve/d' \ |
60 |
common-build.xml || die |
88 |
common-build.xml || die |
61 |
|
89 |
|
62 |
# FIXME: contrib builds do not work if junit not included |
|
|
63 |
#java-pkg_jar-from --build-only --into lib \ |
64 |
# junit-4 junit.jar junit-4.7.jar |
65 |
java-pkg_jar-from --build-only --into lib \ |
66 |
ant-core ant.jar ant-1.7.1.jar |
67 |
java-pkg_jar-from --build-only --into lib \ |
68 |
ant-junit ant-junit.jar ant-junit-1.7.1.jar |
69 |
|
70 |
if use contrib; then |
71 |
cd contrib/ || die |
72 |
java-pkg_jar-from --build-only --into queries/lib \ |
73 |
jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexpt-1.4.jar |
74 |
java-pkg_jar-from --build-only --into benchmark/lib \ |
75 |
commons-compress commons-compress.jar commons-compress-1.1.jar |
76 |
java-pkg_jar-from --build-only --into benchmark/lib \ |
77 |
commons-collections commons-collections.jar commons-collections-3.1.jar |
78 |
java-pkg_jar-from --build-only --into benchmark/lib \ |
79 |
commons-digester commons-digester.jar commons-digester-1.7.jar |
80 |
java-pkg_jar-from --build-only --into benchmark/lib \ |
81 |
commons-logging commons-logging.jar commons-logging-1.0.4.jar |
82 |
java-pkg_jar-from --build-only --into benchmark/lib \ |
83 |
commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar |
84 |
fi |
85 |
} |
86 |
|
87 |
src_compile() { |
88 |
# FIXME: docs do not build if behind a proxy, -autoproxy does not work |
90 |
# FIXME: docs do not build if behind a proxy, -autoproxy does not work |
89 |
java-ant_xml-rewrite -f common-build.xml \ |
91 |
java-ant_xml-rewrite -f common-build.xml \ |
90 |
-c -e javadoc \ |
92 |
-c -e javadoc \ |
91 |
-a failonerror \ |
93 |
-a failonerror \ |
92 |
-v "false" |
94 |
-v "false" \ |
|
|
95 |
-a additionalparam \ |
96 |
-v "-Xdoclint:none" |
97 |
|
98 |
# There are some JS in the javadocs's bootom and in VM >= 1.8 the --allow-script-in-comments |
99 |
# is needed so docs could be built |
100 |
if java-pkg_is-vm-version-ge "1.8" ; then |
101 |
java-ant_xml-rewrite -f common-build.xml \ |
102 |
-c -e javadoc \ |
103 |
-a additionalparam \ |
104 |
-v "-Xdoclint:none --allow-script-in-comments" |
105 |
fi |
106 |
|
107 |
java-pkg-2_src_prepare |
108 |
} |
93 |
|
109 |
|
94 |
ANT_TASKS="none" \ |
110 |
src_compile() { |
95 |
eant -Dversion=${PV} \ |
111 |
EANT_BUILD_TARGET="jar-core" |
96 |
-Dfailonjavadocwarning=false \ |
|
|
97 |
jar-core \ |
98 |
$(use_doc javadocs-core) |
99 |
|
112 |
|
100 |
if use contrib; then |
113 |
if use contrib; then |
101 |
ANT_TASKS="none" \ |
114 |
EANT_GENTOO_CLASSPATH+=" |
102 |
eant -Dversion=${PV} \ |
115 |
jakarta-regexp-1.4 |
103 |
-Dfailonjavadocwarning=false \ |
116 |
commons-compress |
104 |
build-contrib \ |
117 |
commons-collections |
105 |
$(use_doc javadocs-all) |
118 |
commons-digester |
|
|
119 |
commons-logging |
120 |
commons-beanutils-1.7 |
121 |
commons-codec |
122 |
icu4j-56 |
123 |
" |
124 |
EANT_BUILD_TARGET+=" build-contrib" |
125 |
EANT_DOC_TARGET+=" javadocs-all" |
106 |
fi |
126 |
fi |
|
|
127 |
|
128 |
java-ant_rewrite-classpath common-build.xml |
129 |
|
130 |
default |
131 |
java-pkg-2_src_compile |
107 |
} |
132 |
} |
108 |
|
133 |
|
109 |
src_test() { |
134 |
src_test() { |
110 |
# FIXME: test does not get run, even when selected |
135 |
if use contrib; then |
111 |
java-ant_rewrite-classpath common-build.xml |
136 |
EANT_TEST_GENTOO_CLASSPATH+=" commons-codec ${EANT_GENTOO_CLASSPATH}" |
112 |
EANT_GENTOO_CLASSPATH="junit-4 ant-core ant-junit" \ |
137 |
EANT_TEST_TARGET+=" test-contrib" |
113 |
ANT_TASKS="ant-junit" \ |
138 |
fi |
114 |
eant test-core |
139 |
|
|
|
140 |
java-pkg-2_src_test |
115 |
} |
141 |
} |
116 |
|
142 |
|
117 |
src_install() { |
143 |
src_install() { |