From: James Le Cuirot Date: Sat, 14 Mar 2015 15:11:46 +0000 (+0000) Subject: Version bump. Proper launcher scripts added. All HTML documentation X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3db5244e50290be100c78b963280b9a5fdb6c361;p=gentoo.git Version bump. Proper launcher scripts added. All HTML documentation now generated. Reassigning to java herd as this is a tricky package to get right, even for us. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x9C6D7DE4 --- diff --git a/dev-util/findbugs/ChangeLog b/dev-util/findbugs/ChangeLog index a1a5c73e56c9..a1c312c9aec5 100644 --- a/dev-util/findbugs/ChangeLog +++ b/dev-util/findbugs/ChangeLog @@ -1,6 +1,20 @@ # ChangeLog for dev-util/findbugs -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/findbugs/ChangeLog,v 1.2 2012/10/07 08:59:31 pacho Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/findbugs/ChangeLog,v 1.3 2015/03/14 15:11:23 chewi Exp $ + +*findbugs-3.0.1 (14 Mar 2015) + + 14 Mar 2015; James Le Cuirot + +files/0001-Support-bcel-6.0-RC3-instead-of-a-random-snapshot.patch, + +files/0002-Don-t-bundle-anything-in-the-annotations-jar.patch, + +files/0003-JDK-1.8-works-fine-for-me.patch, + +files/0004-Don-t-clean-before-generating-docs.patch, +files/launchers/fb, + +files/launchers/fbwrap, +files/launchers/findbugs, + +files/launchers/findbugs2, +findbugs-3.0.1.ebuild, -files/findbugs, + -findbugs-1.3.9.ebuild, metadata.xml: + Version bump. Proper launcher scripts added. All HTML documentation now + generated. Reassigning to java herd as this is a tricky package to get right, + even for us. 07 Oct 2012; Pacho Ramos metadata.xml: Drop maintainer due retirement, #24135. diff --git a/dev-util/findbugs/Manifest b/dev-util/findbugs/Manifest index 36043f184fc9..c2e333d57843 100644 --- a/dev-util/findbugs/Manifest +++ b/dev-util/findbugs/Manifest @@ -1,15 +1,34 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX findbugs 271 SHA256 7c0692f2b4560fc3f69c825985bbf19c8310b3b43305d1d7fd5adf91fa9c1a95 SHA512 14e72d6245f3b0e378cc745771cf5e178c261a4a62a9de386e94f4adf9752a3ec94b810b8324e886237d809c0998b94b11c7e5e55b4effc87c643a4ddbea2a5b WHIRLPOOL bdb7dd64a7a4b63675fdc2fb945e049ca88f69a11beec6d31158af0497fb1c16b150e6b188a68dcb8041cd8e5f57535bf6ae5da76b14f178226c08031a16ed05 -DIST findbugs-1.3.9-source.zip 8221345 SHA256 d3f163b264fd7a319d7739693aa86b7fe4e7b2bfb931ad695a917b318e86f7ec SHA512 bec5a0f570e759639a62d001936f9bd598d9bdce46855e71a0e47a6580f97689738e9f63f8e2e38a4a65a6afb98da6fe18f5c09347bb7a43b8f7abf52f84ccec WHIRLPOOL b4bec4b38ffdf2b150b1a2071a3313ac1dcc3c28eedbed7ce9abcc9ecb4dddccc541b817135e6a042880733273bd43f8448515dfe736999b27ae27e319c12017 -EBUILD findbugs-1.3.9.ebuild 3067 SHA256 4dc1529439897cd380d380448b080a982f6a92e69f73cdf562e9ec989d281444 SHA512 c61410070ed48aa7ac9375e2e118f3825737b2414b227190f527f24f8c997334a25ddd00ba401e1858edea3f508ac2980c6108403deec4767c2c99d3a7ca77f7 WHIRLPOOL 3654b3ca7a7e6997246c95b4c85db7f2625609febe980ebba23937d295632e30fa92a2ed2d9f747c546aafc901fac98cf482fb798afbb33b60e00a4eff43090a -MISC ChangeLog 625 SHA256 32e04712e86ef21de5381be2f89318e64e54910f3b92f2f3bde0240170f5fc2f SHA512 1e09f6df9d91a9107e390961813b72b4ebd8984c310152fd8a0e97fe4e505422ad1e83e2ca49287a11899749e4967dede9b59a8420afafd1ba71baed459ae055 WHIRLPOOL 0d5a3398287b8e7017e2690defd0c55b575d1c027b15fc55ac95417710d78add482d7c458b2aed7af59f096667cd1f35fce6ed9fd10e6ec9fad4567b139784c9 -MISC metadata.xml 164 SHA256 865f07ab7ab719f7ef211c3dea71c63783d5bd717f532880c639eb82bb0c7198 SHA512 f5cd6119c91e89d9eedd6d78bd7f460dda891a2e2841689164cc4096d9b9a1386b7ea049447aa3f317a421e5198cced4276478350f0818f8f34c1bd09658f4a2 WHIRLPOOL d70cc5118ce4a8dbc4b32c0efd3ec0576bfcd936e44c3ee8656f5eeeb0aee886d14a914c41b1c2b565312cf6a5bd6a114b57a2e45b293c156a465e57c6e6b4df +AUX 0001-Support-bcel-6.0-RC3-instead-of-a-random-snapshot.patch 2267 SHA256 9194d96be8a9b64ed82cb478f868c39f777dcdea5d93f2f5cb34336122c83f08 SHA512 66ba7a8f9331b020e7edfae46ca80a1a914bc4ee61b30b2e5f0b18eaf1b60e6dce124e0a3908f588b2e7e240968dcde93125aa32bdf215388b7c3f195a274f83 WHIRLPOOL 1761d47cc064e7b807474b7da4b2d54a8e882005672712e0f134c4024a778a5e67df4c480a1e663fd95522235262d124392964c89cd73bb841a6300289ea28c1 +AUX 0002-Don-t-bundle-anything-in-the-annotations-jar.patch 785 SHA256 df1b73a3743d38a2391722b75f1c848cce60fc2bab8dc1d17b740763387f7f55 SHA512 7810ac73d039bbaf74b6302e73879ac1c13edbe747e400d3d32570f7eeeb89dac5d41c05d2dd5babee4769bb3528bdf826dcb2e244e3a15d8342b9d8f45a6752 WHIRLPOOL 24e500ee5df830a114799ef6a2d835eb667d7c09f52ded9c07b8b0d10d5221b64c7a1e008a9c2f4e7c8b71fb7de479e2fa9e8ac8137c214ffcdbeb5dac6542a6 +AUX 0003-JDK-1.8-works-fine-for-me.patch 932 SHA256 982ae953eccec2713d8cc7a6780446899c0f5d331861adfe78b1a2b658ba2226 SHA512 44dcfc2a45307b71a6106f2c2a8b8343f718816c04614acf9e212cf274f33d0796bab44714c66f75a193d09666269e9e2bdc16b63daad66548faa326780e3fa0 WHIRLPOOL 4b07a37c4511ac837bf770124737a46fee72881c1f24b94c72b1c8eed0beaa8910d8aca20161d527da34d2e99b92fd1268b8845c18b7659b04ccc81a4a4cd357 +AUX 0004-Don-t-clean-before-generating-docs.patch 623 SHA256 bab289bd17f094a2a6fee7bc54b4816aa99aaed9b43e7c5372ec21741a47b3f0 SHA512 4b5eed349a60d78dee3417e20798e8bb6a1054b655438e078d217942379529cb283f36e500b78ab15a893790277111c2ec94ed8c8fe37882aaef126c0af56981 WHIRLPOOL 595a2c0aa6e47181bb9e4d5d97d2b11c22e6f84d4e0e584dd1098fd7eb0b861d67797bab96ff10dc23cd40b8c2b85180bdb69fa8cc175bbd2acd2a8662d5db9c +AUX launchers/fb 1190 SHA256 4bbc11fcac3065b8503988043488ba70a7347de5231a045c58182fd05586ab94 SHA512 1e14856fa31f1115509f5efaa0bde86ba4d82fa195a0b2e5218e955f8c51a0b7d5868c2078e6b6fa72d05145395df63b1aa6e923af4008aa555d43c4de6231cf WHIRLPOOL cffbf923669dafea0b38358c4e1cf1ebdff2cf6d52424511c740b0e8c82d28fc27a6029dd515e7cd4c2531daa18582ce66ca32ffb003db25472a2ca490dcc918 +AUX launchers/fbwrap 41 SHA256 c8cb79523ce39f4790258ea6d85a2559cafe48169a66081b48240e462605a709 SHA512 d7b8cb9e8bbb7509b25abfa4f91efca154239f4b107680e4f6125fb236030a3eaae513b89252b7cb6e5893d52bcd3d4706e44733dc0e08a6a99e30865ea30202 WHIRLPOOL d71fce6937f6954070190abc00716e07d2debe0ea15d3a2e1c0e69645d79abe2b68d1864018e8187bdd4a3735b006c22f34a80fcbeda993a686f2bdc6ffdeb03 +AUX launchers/findbugs 1298 SHA256 75c5633e7951471d07695fda7fba2749df3c93e907e98e1c02ab8bc3313588c2 SHA512 24ba47e65452e36f885a864ae645e58b3a773570bde12371026203d3ca2cd20c2538f4acccf1159b52d2b52d2be913d6ebad794b3f17ab99d4fc3baaa47d1d82 WHIRLPOOL c75a1c36b4ee01c20873cd047f445e0d8cb3b5910e7393d8dd4ae0fa1678c3177e58bece2cdc363947ddf0505769e3a6dd980d4c9a531b5884f6b99f1ef82672 +AUX launchers/findbugs2 1290 SHA256 231464c1b31de2f1cf3defe3857c47f6b3200bee03db278858ea8a3fcd80d65a SHA512 de0eec2986596e67654ef17771c397c30b064d99d8d78dc89bd61ae309c61233091d82ee56b1965005d2dbfd9afb466b3b98554e602df43ffbf72fec60e764ab WHIRLPOOL 11675e234c755558e8bca9080608a9ac9e9b6247518f7a7ed1bb0b637e50e6baf58698f250f9668dd679604cbcfee8cc587555f550435e17097c60c4eb71b320 +DIST findbugs-3.0.1-source.zip 9625065 SHA256 bd8ec66550d419ed40283bd78a6268f9af57dcad20b732a9309fd1835abd33ff SHA512 d967769f2356f28b34d92c7451cf3e2ac004e667bfc3b049b5b10b1c19d7be2cfa0db132a77698d042300330f77a2bb5dd8c4baa0d67c37b7e5ae6da9e83a64f WHIRLPOOL 9e407cb5733560d6a548da37becdf1b1b120459a2453d85d4a345a7ff30a3ba1d92179a2586ebfac3c23c6d20f591aed6429b501d6ec791f4b1a390ab77ce387 +EBUILD findbugs-3.0.1.ebuild 2997 SHA256 5983ee244021aea82ecc8635fa38ae4e29d53bbfee3ded5f4f46af37cf4dfb72 SHA512 b604b6eeeefb929558a72b5e8c652d6fd764d4bc97b45d8d843119e99e63f46f20cfab9e102343bc8b84e41a72e22f1c0e775406406806d65fef941fd4de20aa WHIRLPOOL 70a933c47e1e76c79082f7480e7fee2ef1a18ca8a898b1ff10095b664955419b5517de5ab8c4abbfcf38989b8eaca4e75aa72fdc99a642621ccf4ab4f57aa7d3 +MISC ChangeLog 1302 SHA256 eae7c5fe3be97885dcea7f37a23d7c147c150040ce165a3a8d5478a44b690235 SHA512 d5ea13e41f318239d478bd7f4300895afe1ae1411b920aefca15999875dfb077db166dccb3620065d62d62f9c898b3820b4aece10f277e26e941c247ab2149f4 WHIRLPOOL 5a1044907f0fe111fd058f4f4bf29b8a4f4b8e1dfcc61391ff21a616be96d700b9716089e1f4cb04075b1044a806a77fcecc96a011391af94c736ec2b7ba74f9 +MISC metadata.xml 899 SHA256 1b1288ef152173f2cb2542d572fcdb38301e85861422f64799b99d278feaa6f8 SHA512 5f91257821879ebc310b58331efe7e0c5a767f7c00746d1f9ad6454c29f6d8dea1e426649d1a5c3f0973f46d38c9bc11c26a4451341c620b4a2c3f17e983d43b WHIRLPOOL a27339a7c8bc7de597eecc57d43bc1d8a911e45ada3f05aa8006f0de3c3b6395fc6a3e7701bde1d0549cb263eea7fbf470cf3e7787161aff657f56122e55e015 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0 -iEYEAREIAAYFAlBxRHQACgkQCaWpQKGI+9RnvgCfa1Ds7RDzMPBiYtAx0ZbbeQmM -GLEAn2RLKw4vYp5kU10SiXMckAIdQapD -=GsEV +iQJ8BAEBCABmBQJVBE+tXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy +MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kbfUP/jMBaT2iLAGDaxOvt58abldq +QrWxJ5Ly95ZOBhfDJ0If7NM+3R5Skw2rf8lre58IhU7hUJoxtI/0rltuUMC4+ltZ +6IY7nnDPRA8a0oI5yo6OXBA1fasNhUQZ09HpWPQk0shAjCtOgpRLC+E6tTcoDCAQ +imjyJAj7n1lXgULoPeOVBq7s4RkqPqX36jZ0dngenhR9olXBtb3MbPL5Kdk8VaIu +8XNFDFdtzqbuLypdFuhzLloGJQ3fWSfinckUiUMevBepQGyKNnUfYiDiDkiFC3gU +RLfzxQwJOa+z+1jwQqg3Oqxg3eAdIO1pKuqKUGpw8PoCkcer7i3bh8fLMuiIlxHI +vQ9rVqTOugME0f/Aazss9RBJKX3VYb5RwQ0gP7v2paIXLtUR84LqmIxkj7fCiY3G +9JOJ1qPGwe/GR90WZtEii1TU/knoSqZqKIud+3reo6f0Z7Xxt8KrmPdX3gvVJ2Kx +5BCiQfdKh4bvk/zbjSg2oyuNtqrU6dZXKdt0EhpxrS1qWcS4Sf8Zcr9s2u5retBX +vGLUm+HmhyMjhtB50DXuY9FvhjXRpS1Fffr2t+pYPUGsFRKSooEAaTJ8lBseQNwi +w6j9VRpJS2HFJUWAFvi9b1gueVccqZtSD2iJAJkEgBui1wgsWuJWDcs03hiPnZv5 +u5/oR7cRcX0zhd8a0Ilz +=WAvi -----END PGP SIGNATURE----- diff --git a/dev-util/findbugs/files/0001-Support-bcel-6.0-RC3-instead-of-a-random-snapshot.patch b/dev-util/findbugs/files/0001-Support-bcel-6.0-RC3-instead-of-a-random-snapshot.patch new file mode 100644 index 000000000000..c92e18741ae1 --- /dev/null +++ b/dev-util/findbugs/files/0001-Support-bcel-6.0-RC3-instead-of-a-random-snapshot.patch @@ -0,0 +1,48 @@ +From d4ef7a75e6d0e50f6417825d851ad9e5ed757985 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Tue, 10 Mar 2015 23:47:00 +0000 +Subject: [PATCH 1/2] Support bcel 6.0 RC3 instead of a random snapshot + +--- + .../src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java | 2 +- + findbugs/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/findbugs/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java b/findbugs/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java +index 52468c9..d7cbd0e 100644 +--- a/findbugs/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java ++++ b/findbugs/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java +@@ -50,7 +50,7 @@ import edu.umd.cs.findbugs.bcel.generic.NULL2Z; + * @see Frame + * @see DataflowAnalysis + */ +-public abstract class AbstractFrameModelingVisitor> implements VisitorSupportsInvokeDynamic { ++public abstract class AbstractFrameModelingVisitor> extends EmptyVisitor { + private FrameType frame; + + private Location location; +diff --git a/findbugs/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java b/findbugs/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java +index 5d62092..a36abac 100644 +--- a/findbugs/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java ++++ b/findbugs/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java +@@ -56,7 +56,7 @@ import org.apache.bcel.classfile.StackMap; + import org.apache.bcel.classfile.StackMapEntry; + import org.apache.bcel.classfile.Synthetic; + import org.apache.bcel.classfile.Unknown; +-import org.apache.bcel.classfile.Visitor; ++import org.apache.bcel.classfile.EmptyVisitor; + + /** + * Fixedup of from org.apache.bcel.classfile.Visitor +@@ -64,7 +64,7 @@ import org.apache.bcel.classfile.Visitor; + * @author William Pugh + * @version 980818 + */ +-public abstract class BetterVisitor implements Visitor { ++public abstract class BetterVisitor extends EmptyVisitor { + + /** + * clone() is overridden to change access control from protected to public. +-- +2.0.4 + diff --git a/dev-util/findbugs/files/0002-Don-t-bundle-anything-in-the-annotations-jar.patch b/dev-util/findbugs/files/0002-Don-t-bundle-anything-in-the-annotations-jar.patch new file mode 100644 index 000000000000..67938e4e371c --- /dev/null +++ b/dev-util/findbugs/files/0002-Don-t-bundle-anything-in-the-annotations-jar.patch @@ -0,0 +1,25 @@ +From c956ffd82e5b88be74dca187dc80afcf6559a78f Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Wed, 11 Mar 2015 21:41:36 +0000 +Subject: [PATCH 2/2] Don't bundle anything in the annotations jar + +--- + findbugs/build.xml | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/findbugs/build.xml b/findbugs/build.xml +index 698b91f..3eac5d6 100644 +--- a/findbugs/build.xml ++++ b/findbugs/build.xml +@@ -298,8 +298,6 @@ + + + +- +- + + + +-- +2.0.4 + diff --git a/dev-util/findbugs/files/0003-JDK-1.8-works-fine-for-me.patch b/dev-util/findbugs/files/0003-JDK-1.8-works-fine-for-me.patch new file mode 100644 index 000000000000..ce4e186f0aca --- /dev/null +++ b/dev-util/findbugs/files/0003-JDK-1.8-works-fine-for-me.patch @@ -0,0 +1,30 @@ +From af7e19734c9bbd21d2f1bf8a66b5ca1c131eeacd Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Fri, 13 Mar 2015 00:20:20 +0000 +Subject: [PATCH 3/3] JDK 1.8 works fine for me + +--- + findbugs/build.xml | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/findbugs/build.xml b/findbugs/build.xml +index 3eac5d6..48c8f2b 100644 +--- a/findbugs/build.xml ++++ b/findbugs/build.xml +@@ -122,13 +122,6 @@ + + + +- Requires JDK 7.x (not 8!), using: ${ant.java.version} +- +- +- +- +- +- + + + +Date: Fri, 13 Mar 2015 13:59:22 +0000 +Subject: [PATCH 4/4] Don't clean before generating docs + +--- + findbugs/build.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/findbugs/build.xml b/findbugs/build.xml +index 48c8f2b..d0cbc04 100644 +--- a/findbugs/build.xml ++++ b/findbugs/build.xml +@@ -652,7 +652,7 @@ + + + +- ++ + + + +-- +2.0.4 + diff --git a/dev-util/findbugs/files/findbugs b/dev-util/findbugs/files/findbugs deleted file mode 100644 index 976599bd3535..000000000000 --- a/dev-util/findbugs/files/findbugs +++ /dev/null @@ -1,10 +0,0 @@ -gjl_package=findbugs - -if [ "${1}" = "-help" ] ; then - gjl_main="edu.umd.cs.findbugs.ShowHelp" -else - gjl_main="edu.umd.cs.findbugs.LaunchAppropriateUI" -fi - -gjl_java_args="-Xmx512m -Dfindbugs.home=/usr/share/findbugs" -source /usr/share/java-config-2/launcher/launcher.bash diff --git a/dev-util/findbugs/files/launchers/fb b/dev-util/findbugs/files/launchers/fb new file mode 100644 index 000000000000..79d44a41681d --- /dev/null +++ b/dev-util/findbugs/files/launchers/fb @@ -0,0 +1,75 @@ +escape_arg() { + echo "$1" | sed -e "s,\\([\\\"' ]\\),\\\\\\1,g" +} + +# Set defaults +fb_mainclass="edu.umd.cs.findbugs.workflow.FB" +user_jvmargs='' +ea_arg='' +debug_arg='' +conservespace_arg='' +user_props='' + +# Handle command line arguments. +while [ $# -gt 0 ]; do + case $1 in + -textui) + fb_mainclass="edu.umd.cs.findbugs.FindBugs2" + ;; + + -jvmArgs) + shift + user_jvmargs="$1" + ;; + + -ea) + ea_arg='-ea' + ;; + + -maxHeap) + shift + fb_maxheap="-Xmx$1m" + ;; + + -debug) + debug_arg="-Dfindbugs.debug=true" + ;; + + -conserveSpace) + conservespace_arg="-Dfindbugs.conserveSpace=true" + ;; + + -property) + shift + user_props="-D$1 $user_props" + ;; + + -D*=*) + user_props="$1 $user_props" + ;; + + -version) + fb_mainclass=edu.umd.cs.findbugs.Version + fb_appargs="-release" + while [ $# -gt 0 ]; do + shift + done + ;; + + -help) + fb_mainclass="edu.umd.cs.findbugs.ShowHelp" + ;; + + # All unrecognized arguments will be accumulated and + # passed to the application. + *) + fb_appargs="$fb_appargs `escape_arg "$1"`" + ;; + esac + + shift +done + +fb_maxheap=${fb_maxheap:-"-Xmx768m"} +fb_jvmargs="$fb_maxheap $user_jvmargs $debug_arg $conservespace_arg $user_props $ea_arg" +gjl_pkg_args="$fb_appargs" diff --git a/dev-util/findbugs/files/launchers/fbwrap b/dev-util/findbugs/files/launchers/fbwrap new file mode 100644 index 000000000000..7d208611c13c --- /dev/null +++ b/dev-util/findbugs/files/launchers/fbwrap @@ -0,0 +1,3 @@ +fb_mainclass="$1" +unset fb_jvmargs +shift diff --git a/dev-util/findbugs/files/launchers/findbugs b/dev-util/findbugs/files/launchers/findbugs new file mode 100644 index 000000000000..e557ce516212 --- /dev/null +++ b/dev-util/findbugs/files/launchers/findbugs @@ -0,0 +1,83 @@ +escape_arg() { + echo "$1" | sed -e "s,\\([\\\"' ]\\),\\\\\\1,g" +} + +# Set defaults +fb_mainclass="edu.umd.cs.findbugs.LaunchAppropriateUI" +user_jvmargs='' +ea_arg='' +debug_arg='' +conservespace_arg='' +user_props='' + +# Handle command line arguments. +while [ $# -gt 0 ]; do + case $1 in + -gui) + # this is the default + ;; + + -gui1) + user_props="-Dfindbugs.launchUI=1 $user_props" + ;; + + -textui) + fb_mainclass="edu.umd.cs.findbugs.FindBugs2" + ;; + + -jvmArgs) + shift + user_jvmargs="$1" + ;; + + -ea) + ea_arg='-ea' + ;; + + -maxHeap) + shift + fb_maxheap="-Xmx$1m" + ;; + + -debug) + debug_arg="-Dfindbugs.debug=true" + ;; + + -conserveSpace) + conservespace_arg="-Dfindbugs.conserveSpace=true" + ;; + + -property) + shift + user_props="-D$1 $user_props" + ;; + + -D*=*) + user_props="$1 $user_props" + ;; + + -version) + fb_mainclass=edu.umd.cs.findbugs.Version + fb_appargs="-release" + while [ $# -gt 0 ]; do + shift + done + ;; + + -help) + fb_mainclass="edu.umd.cs.findbugs.ShowHelp" + ;; + + # All unrecognized arguments will be accumulated and + # passed to the application. + *) + fb_appargs="$fb_appargs `escape_arg "$1"`" + ;; + esac + + shift +done + +fb_maxheap=${fb_maxheap:-"-Xmx768m"} +fb_jvmargs="$fb_maxheap $user_jvmargs $debug_arg $conservespace_arg $user_props $ea_arg" +gjl_pkg_args="$fb_appargs" diff --git a/dev-util/findbugs/files/launchers/findbugs2 b/dev-util/findbugs/files/launchers/findbugs2 new file mode 100644 index 000000000000..d87ea82c0907 --- /dev/null +++ b/dev-util/findbugs/files/launchers/findbugs2 @@ -0,0 +1,89 @@ +# Default UI is GUI2 +fb_launchui="2" + +# +# Stuff we're going to pass to the JVM as JVM arguments. +# +jvm_debug="" +jvm_maxheap="-Xmx768m" +jvm_ea="" +jvm_conservespace="" +jvm_user_props="" + +# +# Process command line args until we hit one we don't recognize. +# +finishedArgs=false +while [ $# -gt 0 ] && [ "$finishedArgs" = "false" ]; do + + arg=$1 + + case $arg in + -textui) + shift + fb_launchui="0" + ;; + + -gui) + shift + fb_launchui="2" + ;; + + -gui1) + shift + fb_launchui="1" + ;; + + -maxHeap) + shift + jvm_maxheap="-Xmx$1m" + shift + ;; + + -ea) + shift + jvm_ea="-ea" + ;; + + -debug) + shift + jvm_debug="-Dfindbugs.debug=true" + ;; + + -conserveSpace) + shift + jvm_conservespace="-Dfindbugs.conserveSpace=true" + ;; + + -property) + shift + jvm_user_props="-D$1 $jvm_user_props" + shift + ;; + + -D*=*) + jvm_user_props="$1 $user_props" + shift + ;; + + -version) + shift + fb_launchui="version" + ;; + + -help) + shift + fb_launchui="help" + ;; + + # All arguments starting from the first unrecognized arguments + # are passed on to the Java app. + *) + finishedArgs=true + ;; + esac + +done + +fb_mainclass="edu.umd.cs.findbugs.LaunchAppropriateUI" +fb_jvmargs="$jvm_debug $jvm_maxheap $jvm_ea $jvm_conservespace $jvm_user_props -Dfindbugs.launchUI=$fb_launchui" diff --git a/dev-util/findbugs/findbugs-1.3.9.ebuild b/dev-util/findbugs/findbugs-1.3.9.ebuild deleted file mode 100644 index 71febd28be04..000000000000 --- a/dev-util/findbugs/findbugs-1.3.9.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/findbugs/findbugs-1.3.9.ebuild,v 1.1 2011/04/11 01:26:55 nerdboy Exp $ - -EAPI=3 - -WANT_ANT_TASKS="ant-nodeps ant-junit" -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Find Bugs in Java Programs" -HOMEPAGE="http://findbugs.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}-source.zip" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -CDEPEND="dev-java/ant-core - dev-java/commons-lang:2.1 - dev-java/apple-java-extensions-bin:0 - >=dev-java/asm-3.1:3 - dev-java/dom4j - dev-java/bcel[findbugs] - dev-java/jsr305 - dev-java/jformatstring - =dev-java/jaxen-1.1* - =dev-java/jdepend-2.9* - doc? ( - =dev-java/saxon-6.5* - app-text/docbook-xsl-stylesheets - ) - dev-java/ant-junit - =dev-java/junit-4* -" -RDEPEND=">=virtual/jre-1.5 - dev-java/icu4j:0 - ${CDEPEND}" - -DEPEND=">=virtual/jdk-1.5 - app-arch/unzip - ${CDEPEND}" - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_DOC_TARGET="apiJavadoc" -EANT_BUILD_TARGET="rebuild" -EANT_GENTOO_CLASSPATH="ant-core,jdepend" -EANT_ANT_TASKS="ant-nodeps,junit" -ANT_OPTS="-Xmx256m" - -pkg_setup() { - use doc && ewarn "Installing javadocs does not pass sanity check." - - java-pkg-2_pkg_setup -} - -java_prepare() { - find -name "*.jar" | xargs rm -v - sed -i -e "s|this directory|the plugin directory|" \ - "${S}"/plugin/README - - cd "${S}"/lib - java-pkg_jar-from ant-core ant.jar - java-pkg_jar-from bcel bcel.jar bcel.jar - java-pkg_jar-from apple-java-extensions-bin - java-pkg_jar-from asm-3 asm.jar asm-3.1.jar - java-pkg_jar-from asm-3 asm-analysis.jar asm-analysis-3.1.jar - java-pkg_jar-from asm-3 asm-commons.jar asm-commons-3.1.jar - java-pkg_jar-from asm-3 asm-tree.jar asm-tree-3.1.jar - java-pkg_jar-from asm-3 asm-util.jar asm-util-3.1.jar - java-pkg_jar-from asm-3 asm-xml.jar asm-xml-3.1.jar - java-pkg_jar-from commons-lang-2.1 commons-lang.jar commons-lang-2.4.jar - java-pkg_jar-from dom4j-1 dom4j.jar dom4j-1.6.1.jar - java-pkg_jar-from jsr305 - java-pkg_jar-from jformatstring - java-pkg_jar-from --with-dependencies jdepend - java-pkg_jar-from jaxen-1.1 - - use doc && java-pkg_jar-from saxon-6.5 - - # yes, this needed for the build - java-pkg_jar-from junit-4 - java-pkg_jar-from ant-junit -} - -src_test() { - ANT_TASKS="ant-nodeps ant-junit junit" eant runjunit -} - -src_install() { - java-pkg_dojar "${S}"/lib/${PN}*.jar - java-pkg_dojar "${S}"/lib/annotations.jar "${S}"/lib/findbugs-ant.jar - # no plugins installed yet (see README.plugins) - dodir /usr/share/${PN}/plugin - newdoc "${S}"/plugin/README README.plugin - # "${S}"/plugin/*.jar - # dosym /usr/share/${PN}/lib/coreplugin.jar /usr/share/${PN}/plugin/ - dobin "${FILESDIR}"/findbugs - - use doc && java-pkg_dojavadoc "${S}"/apiJavaDoc - use source && java-pkg_dosrc "${S}"/src -} - -pkg_postinst() { - elog - elog "Scanning large class files can take large amounts of memory, so" - elog "if you experiance out of memory errors, edit /usr/bin/findbugs" - elog "and increase the VM memory allocation (or buy more RAM ;)" - elog -} diff --git a/dev-util/findbugs/findbugs-3.0.1.ebuild b/dev-util/findbugs/findbugs-3.0.1.ebuild new file mode 100644 index 000000000000..cc1cd4a0c344 --- /dev/null +++ b/dev-util/findbugs/findbugs-3.0.1.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/findbugs/findbugs-3.0.1.ebuild,v 1.1 2015/03/14 15:11:23 chewi Exp $ + +EAPI=5 + +JAVA_PKG_IUSE="doc source" + +inherit eutils java-pkg-2 java-ant-2 + +DESCRIPTION="Find Bugs in Java Programs" +HOMEPAGE="http://findbugs.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}-source.zip" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +CDEPEND="dev-java/ant-core:0 + dev-java/apple-java-extensions-bin:0 + dev-java/asm:4 + >=dev-java/bcel-6:0 + dev-java/commons-lang:2.1 + dev-java/dom4j:1 + dev-java/hamcrest-core:1.3 + dev-java/jaxen:1.1 + dev-java/jcip-annotations:0 + dev-java/jdepend:0 + >=dev-java/jformatstring-2.0.3:0 + dev-java/jsr305:0 + dev-java/junit:4" + +RDEPEND=">=virtual/jre-1.7 + ${CDEPEND}" + +DEPEND=">=virtual/jdk-1.7 + app-arch/unzip + doc? ( + app-text/docbook-xsl-stylesheets + dev-java/saxon:6.5 + ) + test? ( dev-java/ant-junit:0 ) + ${CDEPEND}" + +JAVA_ANT_REWRITE_CLASSPATH="true" +EANT_BUILD_TARGET="build" +EANT_DOC_TARGET="apiJavadoc docs" +EANT_TEST_TARGET="runjunit" +EANT_GENTOO_CLASSPATH="ant-core,apple-java-extensions-bin,asm-4,bcel,commons-lang-2.1,dom4j-1,hamcrest-core-1.3,jaxen-1.1,jcip-annotations,jdepend,jformatstring,jsr305,junit-4" + +pkg_setup() { + java-pkg-2_pkg_setup + EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only --with-dependencies saxon-6.5)" + EANT_EXTRA_ARGS="-Dgitrnum=gentoo -Dxsl.stylesheet.home=${EROOT}usr/share/sgml/docbook/xsl-stylesheets" +} + +java_prepare() { + epatch \ + "${FILESDIR}/0001-Support-bcel-6.0-RC3-instead-of-a-random-snapshot.patch" \ + "${FILESDIR}/0002-Don-t-bundle-anything-in-the-annotations-jar.patch" \ + "${FILESDIR}/0003-JDK-1.8-works-fine-for-me.patch" \ + "${FILESDIR}/0004-Don-t-clean-before-generating-docs.patch" + + # Remove bundled jars. + find -name "*.jar" -delete || die +} + +src_install() { + java-pkg_dojar lib/{${PN},${PN}-ant,annotations}.jar + + insinto "/usr/share/${PN}/plugin" + doins plugin/README + + use source && java-pkg_dosrc src/*/edu + + if use doc; then + insinto "/usr/share/doc/${PF}/html/web" + doins -r build/doc/* + java-pkg_dojavadoc apiJavaDoc + fi + + local SCRIPT CLASS + local ARGS="-Dfindbugs.home=${EROOT}usr/share/findbugs" + + ls src/scripts/standard | grep -E -v '^(findbugs2?|fb|fbwrap)$' | while read SCRIPT; do + CLASS=$(grep '^fb_mainclass=' "src/scripts/standard/${SCRIPT}" | sed 's/^.*=//') + java-pkg_dolauncher "findbugs-${SCRIPT#findbugs-}" \ + --java_args "${ARGS}" --main "${CLASS}" + done + + for SCRIPT in findbugs{,2} fb{,wrap}; do + java-pkg_dolauncher "${SCRIPT}" \ + --java_args "\$fb_jvmargs ${ARGS}" --main '$fb_mainclass' \ + -pre "${FILESDIR}/launchers/${SCRIPT}" + done +} + +src_test() { + java-pkg-2_src_test +} + +pkg_postinst() { + elog "findbugs ships with many launcher scripts. Most of these have been" + elog "installed with a findbugs- prefix to avoid conflicts and confusion" + elog "with other executables in the PATH." +} diff --git a/dev-util/findbugs/metadata.xml b/dev-util/findbugs/metadata.xml index 832e902b8fb1..469576a6a5d9 100644 --- a/dev-util/findbugs/metadata.xml +++ b/dev-util/findbugs/metadata.xml @@ -1,5 +1,6 @@ - dev-tools + java + FindBugs uses static analysis to inspect Java bytecode for occurrences of bug patterns. Static analysis means that FindBugs can find bugs by simply inspecting a program's code: executing the program is not necessary. This makes FindBugs very easy to use: in general, you should be able to use it to look for bugs in your code within a few minutes of downloading it. FindBugs works by analyzing Java bytecode (compiled class files), so you don't even need the program's source code to use it. Because its analysis is sometimes imprecise, FindBugs can report false warnings, which are warnings that do not indicate real errors. In practice, the rate of false warnings reported by FindBugs is less than 50%.