chewi 15/03/14 15:11:23
Added: 0003-JDK-1.8-works-fine-for-me.patch
0004-Don-t-clean-before-generating-docs.patch
0002-Don-t-bundle-anything-in-the-annotations-jar.patch
0001-Support-bcel-6.0-RC3-instead-of-a-random-snapshot.patch
Removed: findbugs
Log:
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.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
9C6D7DE4)
Revision Changes Path
1.1
dev-util/findbugs/files/0003-JDK-1.8-works-fine-for-me.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/findbugs/files/0003-JDK-1.8-works-fine-for-me.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/findbugs/files/0003-JDK-1.8-works-fine-for-me.patch?rev=1.1&content-type=text/plain
Index: 0003-JDK-1.8-works-fine-for-me.patch
===================================================================
>From af7e19734c9bbd21d2f1bf8a66b5ca1c131eeacd Mon Sep 17 00:00:00 2001
From: James Le Cuirot <[email protected]>
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 @@
</javac>
</target>
<target name="classes" depends="init">
- <echo>Requires JDK 7.x (not 8!), using: ${ant.java.version}</echo>
- <fail message="Requires JDK 7.x (not 8!), using: ${ant.java.version}">
- <condition>
- <equals arg1="1.8" arg2="${ant.java.version}"/>
- </condition>
- </fail>
-
<!-- Compile Java source files. -->
<echo level="info" message="compiling findbugs"/>
<javac
--
2.0.4
1.1
dev-util/findbugs/files/0004-Don-t-clean-before-generating-docs.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/findbugs/files/0004-Don-t-clean-before-generating-docs.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/findbugs/files/0004-Don-t-clean-before-generating-docs.patch?rev=1.1&content-type=text/plain
Index: 0004-Don-t-clean-before-generating-docs.patch
===================================================================
>From c73984b12bb3c80a67d993a30c894ee05613d422 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <[email protected]>
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 @@
</target>
- <target name="checkdocs" depends="clean">
+ <target name="checkdocs">
<!-- FIXME: check whether docs are up to date -->
</target>
--
2.0.4
1.1
dev-util/findbugs/files/0002-Don-t-bundle-anything-in-the-annotations-jar.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/findbugs/files/0002-Don-t-bundle-anything-in-the-annotations-jar.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/findbugs/files/0002-Don-t-bundle-anything-in-the-annotations-jar.patch?rev=1.1&content-type=text/plain
Index: 0002-Don-t-bundle-anything-in-the-annotations-jar.patch
===================================================================
>From c956ffd82e5b88be74dca187dc80afcf6559a78f Mon Sep 17 00:00:00 2001
From: James Le Cuirot <[email protected]>
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 @@
<fileset dir="${src.dir}">
<include name="**/annotations/*.java"/>
</fileset>
- <zipfileset src="${jar.dir}/jcip-annotations.jar"
excludes="META-INF/**,**/*.html"/>
- <zipfileset src="${jar.dir}/jsr305.jar"
excludes="META-INF/**,**/*.html"/>
</jar>
</target>
--
2.0.4
1.1
dev-util/findbugs/files/0001-Support-bcel-6.0-RC3-instead-of-a-random-snapshot.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/findbugs/files/0001-Support-bcel-6.0-RC3-instead-of-a-random-snapshot.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/findbugs/files/0001-Support-bcel-6.0-RC3-instead-of-a-random-snapshot.patch?rev=1.1&content-type=text/plain
Index: 0001-Support-bcel-6.0-RC3-instead-of-a-random-snapshot.patch
===================================================================
>From d4ef7a75e6d0e50f6417825d851ad9e5ed757985 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <[email protected]>
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<Value, FrameType extends
Frame<Value>> implements VisitorSupportsInvokeDynamic {
+public abstract class AbstractFrameModelingVisitor<Value, FrameType extends
Frame<Value>> 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 <A HREF="http://www.cs.umd.edu/~pugh";>William Pugh</A>
* @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
