Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 270277 Details for
Bug 363931
build tomcat-7 properly with docs/examples
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch for the ebuild of tomcat-7.0.12
tomcat-7.0.12.ebuild.patch (text/plain), 1.73 KB, created by
Marc Arens
on 2011-04-17 15:34:41 UTC
(
hide
)
Description:
patch for the ebuild of tomcat-7.0.12
Filename:
MIME Type:
Creator:
Marc Arens
Created:
2011-04-17 15:34:41 UTC
Size:
1.73 KB
patch
obsolete
>--- /usr/portage/www-servers/tomcat/tomcat-7.0.12.ebuild >+++ /home/marenz/tomcat/tomcat-7.0.12.ebuild >@@ -57,7 +57,7 @@ > > EANT_NEEDS_TOOLS="true" > EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPIS},eclipse-ecj-${ECJV}" >- >+EANT_GENTOO_CLASSPATH_EXTRA=${S}/output/classes > EANT_BUILD_TARGET="package" > EANT_DOC_TARGET="build-docs" > >@@ -72,7 +72,7 @@ > } > > java_prepare() { >- epatch "${FILESDIR}/${SLOT}/${PV}-build-xml.patch" >+ epatch "${FILESDIR}/${SLOT}/${PV}-build-xml_examples.patch" > > rm -v webapps/examples/WEB-INF/lib/*.jar \ > test/webapp-3.0-fragments/WEB-INF/lib/*.jar || die >@@ -82,6 +82,10 @@ > > if ! use doc; then > EANT_EXTRA_ARGS+=" -Dnobuild.docs=true" >+ fi >+ >+ if ! use examples; then >+ EANT_EXTRA_ARGS+=" -Dnobuild.examples=true" > fi > > EANT_EXTRA_ARGS+=" -Djdt.jar=$(java-pkg_getjar eclipse-ecj-${ECJV} ecj.jar)" >@@ -144,14 +148,19 @@ > cp -pR host-manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die > cp -pR manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die > if use doc; then >+ cd "${S}"/output/build/webapps > cp -pR docs "${D}"/usr/share/${TOMCAT_NAME}/webapps || die > fi > if use examples; then >- cd "${S}"/webapps/examples/WEB-INF/lib >+ cd "${S}"/output/build/webapps/examples/WEB-INF/lib > java-pkg_jar-from jakarta-jstl jstl.jar > java-pkg_jar-from jakarta-jstl standard.jar >- cd "${S}"/webapps >- cp -pR examples "${D}"/usr/share/${TOMCAT_NAME}/webapps || die >+ cd "${S}"/output/build/webapps/examples >+ mkdir META-INF >+ cp "${FILESDIR}/${SLOT}/context.xml" META-INF >+ cd "${S}"/output/build/webapps >+ cp -pR examples "${D}/usr/share/${TOMCAT_NAME}/webapps" || die >+ chown -R tomcat:tomcat "${D}/usr/share/${TOMCAT_NAME}/webapps/examples" > fi > > # replace catalina.policy with gentoo specific one bug #176701
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 363931
:
270275
|
270277
|
270279
|
270925