|
Line
Link Here
|
| 0 |
-- /usr/portage/www-servers/tomcat/tomcat-7.0.12.ebuild |
0 |
++ /home/marenz/tomcat/tomcat-7.0.12.ebuild |
|
Lines 57-63
Link Here
|
| 57 |
|
57 |
|
| 58 |
EANT_NEEDS_TOOLS="true" |
58 |
EANT_NEEDS_TOOLS="true" |
| 59 |
EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPIS},eclipse-ecj-${ECJV}" |
59 |
EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPIS},eclipse-ecj-${ECJV}" |
| 60 |
|
60 |
EANT_GENTOO_CLASSPATH_EXTRA=${S}/output/classes |
| 61 |
EANT_BUILD_TARGET="package" |
61 |
EANT_BUILD_TARGET="package" |
| 62 |
EANT_DOC_TARGET="build-docs" |
62 |
EANT_DOC_TARGET="build-docs" |
| 63 |
|
63 |
|
|
Lines 72-78
Link Here
|
| 72 |
} |
72 |
} |
| 73 |
|
73 |
|
| 74 |
java_prepare() { |
74 |
java_prepare() { |
| 75 |
epatch "${FILESDIR}/${SLOT}/${PV}-build-xml.patch" |
75 |
epatch "${FILESDIR}/${SLOT}/${PV}-build-xml_examples.patch" |
| 76 |
|
76 |
|
| 77 |
rm -v webapps/examples/WEB-INF/lib/*.jar \ |
77 |
rm -v webapps/examples/WEB-INF/lib/*.jar \ |
| 78 |
test/webapp-3.0-fragments/WEB-INF/lib/*.jar || die |
78 |
test/webapp-3.0-fragments/WEB-INF/lib/*.jar || die |
|
Lines 82-87
Link Here
|
| 82 |
|
82 |
|
| 83 |
if ! use doc; then |
83 |
if ! use doc; then |
| 84 |
EANT_EXTRA_ARGS+=" -Dnobuild.docs=true" |
84 |
EANT_EXTRA_ARGS+=" -Dnobuild.docs=true" |
|
|
85 |
fi |
| 86 |
|
| 87 |
if ! use examples; then |
| 88 |
EANT_EXTRA_ARGS+=" -Dnobuild.examples=true" |
| 85 |
fi |
89 |
fi |
| 86 |
|
90 |
|
| 87 |
EANT_EXTRA_ARGS+=" -Djdt.jar=$(java-pkg_getjar eclipse-ecj-${ECJV} ecj.jar)" |
91 |
EANT_EXTRA_ARGS+=" -Djdt.jar=$(java-pkg_getjar eclipse-ecj-${ECJV} ecj.jar)" |
|
Lines 144-157
Link Here
|
| 144 |
cp -pR host-manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die |
148 |
cp -pR host-manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die |
| 145 |
cp -pR manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die |
149 |
cp -pR manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die |
| 146 |
if use doc; then |
150 |
if use doc; then |
|
|
151 |
cd "${S}"/output/build/webapps |
| 147 |
cp -pR docs "${D}"/usr/share/${TOMCAT_NAME}/webapps || die |
152 |
cp -pR docs "${D}"/usr/share/${TOMCAT_NAME}/webapps || die |
| 148 |
fi |
153 |
fi |
| 149 |
if use examples; then |
154 |
if use examples; then |
| 150 |
cd "${S}"/webapps/examples/WEB-INF/lib |
155 |
cd "${S}"/output/build/webapps/examples/WEB-INF/lib |
| 151 |
java-pkg_jar-from jakarta-jstl jstl.jar |
156 |
java-pkg_jar-from jakarta-jstl jstl.jar |
| 152 |
java-pkg_jar-from jakarta-jstl standard.jar |
157 |
java-pkg_jar-from jakarta-jstl standard.jar |
| 153 |
cd "${S}"/webapps |
158 |
cd "${S}"/output/build/webapps/examples |
| 154 |
cp -pR examples "${D}"/usr/share/${TOMCAT_NAME}/webapps || die |
159 |
mkdir META-INF |
|
|
160 |
cp "${FILESDIR}/${SLOT}/context.xml" META-INF |
| 161 |
cd "${S}"/output/build/webapps |
| 162 |
cp -pR examples "${D}/usr/share/${TOMCAT_NAME}/webapps" || die |
| 163 |
chown -R tomcat:tomcat "${D}/usr/share/${TOMCAT_NAME}/webapps/examples" |
| 155 |
fi |
164 |
fi |
| 156 |
|
165 |
|
| 157 |
# replace catalina.policy with gentoo specific one bug #176701 |
166 |
# replace catalina.policy with gentoo specific one bug #176701 |
