[findbugs] 05/07: rework patches for new upstream release
Tony Mancill
tmancill at moszumanska.debian.org
Sun Jan 10 17:29:52 UTC 2016
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch master
in repository findbugs.
commit f8af55effc025f5518302dbf590028f5adab98d0
Author: tony mancill <tmancill at debian.org>
Date: Sun Jan 10 08:51:44 2016 -0800
rework patches for new upstream release
These should be broken down/combined into fewer patches that
address each category of patch - e.g., the build system,
compilation/porting changes, and docs, etc.
---
.../0001-FixLibraryDependency-RemoveAppleGUI.patch | 366 +++++++--------------
debian/patches/0002-FixJnlpLibraryDir.patch | 30 +-
.../0004-FixLibraryInScriptProperties.patch | 8 +-
debian/patches/0005-FixShowHelpInFindbugs.patch | 29 --
debian/patches/0007-FixManifest.patch | 8 +-
debian/patches/0008-fix-docbook-ref.patch | 10 -
debian/patches/0009-bcel-compatibility.patch | 13 +-
debian/patches/0010-bcel-for-version3.patch | 33 ++
debian/patches/0011-typecast.patch | 12 +
debian/patches/0012-verbose-tests.patch | 19 ++
debian/patches/series | 7 +-
11 files changed, 212 insertions(+), 323 deletions(-)
diff --git a/debian/patches/0001-FixLibraryDependency-RemoveAppleGUI.patch b/debian/patches/0001-FixLibraryDependency-RemoveAppleGUI.patch
index 3b11561..239c7b1 100644
--- a/debian/patches/0001-FixLibraryDependency-RemoveAppleGUI.patch
+++ b/debian/patches/0001-FixLibraryDependency-RemoveAppleGUI.patch
@@ -1,7 +1,6 @@
-Index: findbugs-2.0.3/build.properties
-===================================================================
---- findbugs-2.0.3.orig/build.properties 2013-12-17 19:44:08.738200004 +0800
-+++ findbugs-2.0.3/build.properties 2013-12-17 19:51:27.826196570 +0800
+unchanged:
+--- a/build.properties
++++ b/build.properties
@@ -8,10 +8,12 @@
src/gui/,\
etc
@@ -25,37 +24,24 @@ Index: findbugs-2.0.3/build.properties
# Set this to the directory where FOP (http://xml.apache.org/fop/)
# is installed. (Note: this is disabled for now.)
-Index: findbugs-2.0.3/build.xml
-===================================================================
---- findbugs-2.0.3.orig/build.xml 2013-12-17 19:44:08.738200004 +0800
-+++ findbugs-2.0.3/build.xml 2013-12-17 19:51:27.830196570 +0800
-@@ -60,24 +60,23 @@
- <property name="version.props.file" value="${build.dir}/classes/edu/umd/cs/findbugs/version.properties"/>
+--- a/build.xml
++++ b/build.xml
+@@ -60,12 +60,24 @@
<path id="findbugs.classpath">
-- <pathelement location="${jar.dir}/bcel.jar"/>
-- <pathelement location="${jar.dir}/dom4j-1.6.1.jar"/>
-- <pathelement location="${jar.dir}/AppleJavaExtensions.jar"/>
-- <pathelement location="${jar.dir}/junit.jar"/>
-- <pathelement location="${jar.dir}/asm-3.3.jar"/>
-- <pathelement location="${jar.dir}/asm-commons-3.3.jar"/>
-- <pathelement location="${jar.dir}/asm-tree-3.3.jar"/>
-- <pathelement location="${jar.dir}/jaxen-1.1.6.jar"/>
-- <pathelement location="${jar.dir}/jsr305.jar"/>
-- <pathelement location="${jar.dir}/jFormatString.jar"/>
-- <pathelement location="${jar.dir}/commons-lang-2.6.jar"/>
-- <pathelement location="${jar.dir}/jcip-annotations.jar"/>
+ <fileset dir="${jar.dir}" includes="*.jar"/>
+ <pathelement location="${sys.jar.dir}/bcel.jar"/>
-+ <pathelement location="${sys.jar.dir}/dom4j.jar"/>
-+ <pathelement location="${sys.jar.dir}/junit4.jar"/>
-+ <pathelement location="${sys.jar.dir}/asm3.jar"/>
-+ <pathelement location="${sys.jar.dir}/asm3-commons.jar"/>
-+ <pathelement location="${sys.jar.dir}/asm3-tree.jar"/>
-+ <pathelement location="${sys.jar.dir}/jaxen.jar"/>
++ <pathelement location="${sys.jar.dir}/commons-lang.jar"/>
+ <pathelement location="${sys.jar.dir}/jsr305.jar"/>
++ <pathelement location="${sys.jar.dir}/junit4.jar"/>
++ <pathelement location="${sys.jar.dir}/dom4j.jar"/>
++ <pathelement location="${sys.jar.dir}/jdepend.jar"/>
+ <pathelement location="${sys.jar.dir}/jFormatString.jar"/>
-+ <pathelement location="${sys.jar.dir}/commons-lang.jar"/>
++ <pathelement location="${sys.jar.dir}/asm4.jar"/>
++ <pathelement location="${sys.jar.dir}/asm4-commons.jar"/>
++ <pathelement location="${sys.jar.dir}/asm4-tree.jar"/>
+ <pathelement location="${sys.jar.dir}/jcip.jar"/>
++ <pathelement location="${sys.jar.dir}/ant.jar"/>
</path>
<path id="tools.classpath">
@@ -66,35 +52,7 @@ Index: findbugs-2.0.3/build.xml
<path refid="findbugs.classpath"/>
</path>
-@@ -124,17 +123,16 @@
- <target name="mondo" depends="jars">
- <jar destfile="build/mondo.jar"
- manifest="etc/MANIFEST-findbugs-mondo.MF">
-- <zipfileset src="${jar.dir}/bcel.jar"/>
-- <zipfileset src="${jar.dir}/dom4j-1.6.1.jar"/>
-- <zipfileset src="${jar.dir}/AppleJavaExtensions.jar"/>
-- <zipfileset src="${jar.dir}/junit.jar"/>
-- <zipfileset src="${jar.dir}/asm-3.3.jar"/>
-- <zipfileset src="${jar.dir}/asm-commons-3.3.jar"/>
-- <zipfileset src="${jar.dir}/asm-tree-3.3.jar"/>
-- <zipfileset src="${jar.dir}/jaxen-1.1.6.jar"/>
-- <zipfileset src="${jar.dir}/jsr305.jar"/>
-- <zipfileset src="${jar.dir}/jFormatString.jar"/>
-- <zipfileset src="${jar.dir}/commons-lang-2.6.jar"/>
-+ <zipfileset src="${sys.jar.dir}/bcel.jar"/>
-+ <zipfileset src="${sys.jar.dir}/dom4j.jar"/>
-+ <zipfileset src="${sys.jar.dir}/junit4.jar"/>
-+ <zipfileset src="${sys.jar.dir}/asm3.jar"/>
-+ <zipfileset src="${sys.jar.dir}/asm3-commons.jar"/>
-+ <zipfileset src="${sys.jar.dir}/asm3-tree.jar"/>
-+ <zipfileset src="${sys.jar.dir}/jaxen.jar"/>
-+ <zipfileset src="${sys.jar.dir}/jsr305.jar"/>
-+ <zipfileset src="${sys.jar.dir}/jFormatString.jar"/>
-+ <zipfileset src="${sys.jar.dir}/commons-lang.jar"/>
- <zipfileset src="${jar.dir}/findbugs.jar"/>
- </jar>
- </target>
-@@ -329,8 +327,8 @@
+@@ -298,8 +310,8 @@
<fileset dir="${src.dir}">
<include name="**/annotations/*.java"/>
</fileset>
@@ -105,59 +63,23 @@ Index: findbugs-2.0.3/build.xml
</jar>
</target>
-@@ -362,20 +360,20 @@
- <include name="messages*.xml"/>
- </fileset>
+@@ -645,14 +657,12 @@
+ </target>
-- <zipfileset src="${jar.dir}/bcel.jar" excludes="META-INF/**"/>
-+ <zipfileset src="${sys.jar.dir}/bcel.jar" excludes="META-INF/**"/>
-- <zipfileset src="${jar.dir}/asm-3.3.jar" excludes="META-INF/**"/>
-- <zipfileset src="${jar.dir}/asm-analysis-3.3.jar" excludes="META-INF/**"/>
-- <zipfileset src="${jar.dir}/asm-commons-3.3.jar" excludes="META-INF/**"/>
-- <zipfileset src="${jar.dir}/asm-tree-3.3.jar" excludes="META-INF/**"/>
-- <zipfileset src="${jar.dir}/asm-util-3.3.jar" excludes="META-INF/**"/>
-- <zipfileset src="${jar.dir}/asm-xml-3.3.jar" excludes="META-INF/**"/>
--
-- <zipfileset src="${jar.dir}/dom4j-1.6.1.jar" excludes="META-INF/**"/>
-- <zipfileset src="${jar.dir}/jaxen-1.1.6.jar" excludes="META-INF/**"/>
-- <zipfileset src="${jar.dir}/jsr305.jar" excludes="META-INF/**"/>
-- <zipfileset src="${jar.dir}/jFormatString.jar" excludes="META-INF/**"/>
-- <zipfileset src="${jar.dir}/commons-lang-2.6.jar" excludes="META-INF/**"/>
-+ <zipfileset src="${sys.jar.dir}/asm3.jar" excludes="META-INF/**"/>
-+ <zipfileset src="${sys.jar.dir}/asm3-analysis.jar" excludes="META-INF/**"/>
-+ <zipfileset src="${sys.jar.dir}/asm3-commons.jar" excludes="META-INF/**"/>
-+ <zipfileset src="${sys.jar.dir}/asm3-tree.jar" excludes="META-INF/**"/>
-+ <zipfileset src="${sys.jar.dir}/asm3-util.jar" excludes="META-INF/**"/>
-+ <zipfileset src="${sys.jar.dir}/asm3-xml.jar" excludes="META-INF/**"/>
-+
-+ <zipfileset src="${sys.jar.dir}/dom4j.jar" excludes="META-INF/**"/>
-+ <zipfileset src="${sys.jar.dir}/jaxen.jar" excludes="META-INF/**"/>
-+ <zipfileset src="${sys.jar.dir}/jsr305.jar" excludes="META-INF/**"/>
-+ <zipfileset src="${sys.jar.dir}/jFormatString.jar" excludes="META-INF/**"/>
-+ <zipfileset src="${sys.jar.dir}/commons-lang.jar" excludes="META-INF/**"/>
- </jar>
- </target>
+- <target name="version" depends="classes,-get-git-revision" >
+- <echo>${gitrnum}</echo>
++ <target name="version" depends="classes" >
+ <java classpathref="tools.classpath"
+ output="${version.props.file}"
+ classname="edu.umd.cs.findbugs.Version"
+ failonerror="true">
+ <arg value="-props"/>
+- <sysproperty key="git.revision" value="${gitrnum}"/>
+ </java>
-@@ -511,7 +509,7 @@
- projectName="Byte code Engineering Library (BCEL)"
- outputFile="${sampleoutput.dir}/bcel.xml"
- >
-- <class location="${jar.dir}/bcel.jar" />
-+ <class location="${sys.jar.dir}/bcel.jar" />
- </findbugs>
- <findbugs home="."
- output="xml:withMessages"
-@@ -519,7 +517,7 @@
- jvmargs="-ea -Xmx1200m"
- projectName="Byte code Engineering Library (BCEL)"
- outputFile="${sampleoutput.dir}/bcel-cloud-appengine.xml" >
-- <class location="${jar.dir}/bcel.jar" />
-+ <class location="${jar.dir}/bcel.jar" />
- </findbugs>
- <!--
- <findbugs home="."
-@@ -1029,16 +1027,15 @@
+ <loadproperties srcfile="${version.props.file}"/>
+@@ -943,16 +953,15 @@
<!-- Generate jnlp jars -->
<target name="jnlp" depends="jars">
<copy todir="${jnlp.dir}" file="${engine.jar}"/>
@@ -173,9 +95,9 @@ Index: findbugs-2.0.3/build.xml
- <copy todir="${jnlp.dir}" file="${jar.dir}/AppleJavaExtensions.jar"/>
+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/bcel.jar"/>
+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/jsr305.jar"/>
-+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm3.jar"/>
-+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm3-commons.jar"/>
-+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm3-tree.jar"/>
++ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm4.jar"/>
++ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm4-commons.jar"/>
++ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm4-tree.jar"/>
+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/dom4j.jar"/>
+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/jaxen.jar"/>
+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/jFormatString.jar"/>
@@ -183,69 +105,17 @@ Index: findbugs-2.0.3/build.xml
<copy todir="${jnlp.dir}" file="${docsrc.dir}/buggy-sm.png"/>
<copy todir="${jnlp.dir}">
<fileset refid="plugin.jars"/>
-@@ -1310,7 +1307,7 @@
+@@ -1212,7 +1221,7 @@
<target name="annotationJavadoc">
<javadoc access="public"
- classpath="lib/bcel.jar:lib/junit.jar:lib/dom4j-1.6.1.jar:lib/jsr305.jar:lib/AppleJavaExtensions.jar"
-+ classpath="${sys.jar.dir}/bcel.jar:${sys.jar.dir}/junit4.jar:${sys.jar.dir}/dom4j.jar:${sys.jar.dir}/jsr305.jar"
++ classpath="${sys.jar.dir}/findbugs-bcel.jar:${sys.jar.dir}/junit4.jar:${sys.jar.dir}/dom4j.jar:${sys.jar.dir}/jsr305.jar"
destdir="${annotationDoc.dir}"
packagenames="edu.umd.cs.findbugs.annotations"
doctitle="FindBugs Annotation Documentation"
-Index: findbugs-2.0.3/.classpath
-===================================================================
---- findbugs-2.0.3.orig/.classpath 2013-12-17 19:51:22.710196610 +0800
-+++ findbugs-2.0.3/.classpath 2013-12-17 20:10:22.934187697 +0800
-@@ -15,32 +15,19 @@
- <accessrule kind="nonaccessible" pattern="com/apple/**"/>
- </accessrules>
- </classpathentry>
-- <classpathentry exported="true" kind="lib" path="lib/AppleJavaExtensions.jar"/>
-- <classpathentry exported="true" kind="lib" path="lib/bcel.jar">
-- <attributes>
-- <attribute name="javadoc_location" value="http://jakarta.apache.org/bcel/apidocs/"/>
-- </attributes>
-- </classpathentry>
-- <classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar">
-- <attributes>
-- <attribute name="javadoc_location" value="http://dom4j.org/apidocs/"/>
-- </attributes>
-- </classpathentry>
-- <classpathentry exported="true" kind="lib" path="lib/junit.jar"/>
-- <classpathentry exported="true" kind="lib" path="lib/commons-lang-2.6.jar"/>
-- <classpathentry exported="true" kind="lib" path="lib/jcip-annotations.jar"/>
-- <classpathentry exported="true" kind="lib" path="lib/yjp-controller-api-redist.jar"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-- <classpathentry exported="true" kind="lib" path="lib/jsr305.jar" sourcepath="lib/jsr305.jar"/>
-- <classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.6.jar"/>
-- <classpathentry exported="true" kind="lib" path="lib/jFormatString.jar"/>
-- <classpathentry exported="true" kind="lib" path="lib/jdepend-2.9.jar"/>
-- <classpathentry exported="true" kind="lib" path="lib/asm-3.3.jar" sourcepath="lib/asm-src-3.3.zip"/>
-- <classpathentry exported="true" kind="lib" path="lib/asm-commons-3.3.jar" sourcepath="lib/asm-src-3.3.zip"/>
-- <classpathentry exported="true" kind="lib" path="lib/asm-tree-3.3.jar" sourcepath="lib/asm-src-3.3.zip"/>
-- <classpathentry exported="true" kind="lib" path="lib/ant.jar"/>
-- <classpathentry exported="true" kind="lib" path="lib/asm-analysis-3.3.jar" sourcepath="lib/asm-src-3.3.zip"/>
-- <classpathentry exported="true" kind="lib" path="lib/asm-util-3.3.jar" sourcepath="lib/asm-src-3.3.zip"/>
-- <classpathentry exported="true" kind="lib" path="lib/asm-xml-3.3.jar" sourcepath="lib/asm-src-3.3.zip"/>
-+ <classpathentry kind="lib" path="/usr/share/java/junit4.jar"/>
-+ <classpathentry kind="lib" path="/usr/share/java/asm3.jar"/>
-+ <classpathentry kind="lib" path="/usr/share/java/asm3-tree.jar"/>
-+ <classpathentry kind="lib" path="/usr/share/java/bcel.jar"/>
-+ <classpathentry kind="lib" path="/usr/share/java/dom4j.jar"/>
-+ <classpathentry kind="lib" path="/usr/share/java/asm3-commons.jar"/>
-+ <classpathentry kind="lib" path="/usr/share/java/jaxen.jar"/>
-+ <classpathentry kind="lib" path="/usr/share/java/jsr305.jar"/>
-+ <classpathentry kind="lib" path="/usr/share/java/jFormatString.jar"/>
-+ <classpathentry kind="lib" path="/usr/share/java/commons-lang.jar"/>
-+ <classpathentry kind="lib" path="/usr/share/java/jcip.jar"/>
-+ <classpathentry kind="lib" path="/usr/share/java/ant.jar"/>
-+ <classpathentry kind="lib" path="/usr/share/java/jdepend.jar"/>
- <classpathentry kind="output" path="classesEclipse"/>
- </classpath>
-Index: findbugs-2.0.3/src/gui/edu/umd/cs/findbugs/gui2/OSXAdapter.java
-===================================================================
---- findbugs-2.0.3.orig/src/gui/edu/umd/cs/findbugs/gui2/OSXAdapter.java 2010-09-18 15:46:28.000000000 +0800
-+++ findbugs-2.0.3/src/gui/edu/umd/cs/findbugs/gui2/OSXAdapter.java 2013-12-17 20:04:48.778190308 +0800
+--- a/src/gui/edu/umd/cs/findbugs/gui2/OSXAdapter.java
++++ b/src/gui/edu/umd/cs/findbugs/gui2/OSXAdapter.java
@@ -19,9 +19,6 @@
package edu.umd.cs.findbugs.gui2;
@@ -256,98 +126,108 @@ Index: findbugs-2.0.3/src/gui/edu/umd/cs/findbugs/gui2/OSXAdapter.java
/*
* Based on sample code from Apple.
*
-@@ -29,91 +26,8 @@
+@@ -29,13 +26,13 @@
* This class should only ever be referenced via reflection after
* checking that we are running on Mac OS X.
*/
-public class OSXAdapter extends ApplicationAdapter {
--
-- // pseudo-singleton model; no point in making multiple instances
-- // of the EAWT application or our adapter
-- private static OSXAdapter theAdapter = new OSXAdapter();
--
++public class OSXAdapter {
+
+ // pseudo-singleton model; no point in making multiple instances
+ // of the EAWT application or our adapter
+ private static OSXAdapter theAdapter = new OSXAdapter();
+
- private static final com.apple.eawt.Application theApplication = new com.apple.eawt.Application();
--
-- // reference to the app where the existing quit, about, prefs code is
-- private static MainFrame mainApp;
--
-- private OSXAdapter() {
-- }
--
-- // implemented handler methods. These are basically hooks into
-- // existing functionality from the main app, as if it came
-- // over from another platform.
--
-- @Override
-- public void handleAbout(ApplicationEvent ae) {
-- if (mainApp != null) {
-- ae.setHandled(true);
-- // We need to invoke modal About Dialog asynchronously
-- // otherwise the Application queue is locked for the duration
-- // of the about Dialog, which results in a deadlock if a URL is
-- // selected, and we get a ReOpenApplication event when user
-- // switches back to Findbugs.
-- javax.swing.SwingUtilities.invokeLater(new Runnable() {
-- public void run() {
-- mainApp.about();
-- }
-- });
-- } else {
-- throw new IllegalStateException("handleAbout: " + "MyApp instance detached from listener");
-- }
-- }
--
-- @Override
-- public void handlePreferences(ApplicationEvent ae) {
-- if (mainApp != null) {
-- mainApp.preferences();
-- ae.setHandled(true);
-- } else {
-- throw new IllegalStateException("handlePreferences: MyApp instance " + "detached from listener");
-- }
-- }
--
++ //private static final com.apple.eawt.Application theApplication = new com.apple.eawt.Application();
+
+ // reference to the app where the existing quit, about, prefs code is
+ private static MainFrame mainApp;
+@@ -47,6 +44,7 @@
+ // existing functionality from the main app, as if it came
+ // over from another platform.
+
++ /* disabled for Debian build
+ @Override
+ public void handleAbout(ApplicationEvent ae) {
+ if (mainApp != null) {
+@@ -76,10 +74,12 @@
+ throw new IllegalStateException("handlePreferences: MyApp instance " + "detached from listener");
+ }
+ }
++ */
+
- @Override
- public void handleQuit(ApplicationEvent ae) {
- if (mainApp != null) {
--
-- /*
-- * You MUST setHandled(false) if you want to delay or cancel the
-- * quit. This is important for cross-platform development -- have a
-- * universal quit routine that chooses whether or not to quit, so
-- * the functionality is identical on all platforms. This example
-- * simply cancels the AppleEvent-based quit and defers to that
-- * universal method.
-- */
--
++ // disabled for Debian build
++ //@Override
++ //public void handleQuit(ApplicationEvent ae) {
++ // if (mainApp != null) {
+
+ /*
+ * You MUST setHandled(false) if you want to delay or cancel the
+@@ -90,12 +90,12 @@
+ * universal method.
+ */
+
- ae.setHandled(false);
- mainApp.callOnClose();
- } else {
- throw new IllegalStateException("handleQuit: MyApp instance detached " + "from listener");
- }
- }
--
-- // The main entry-point for this functionality. This is the only method
-- // that needs to be called at runtime, and it can easily be done using
-- // reflection (see MyApp.java)
-- public static void registerMacOSXApplication(MainFrame inApp) {
-- if (mainApp != null)
-- throw new IllegalStateException("application already set");
--
-- mainApp = inApp;
--
++ // ae.setHandled(false);
++ // mainApp.callOnClose();
++ // } else {
++ // throw new IllegalStateException("handleQuit: MyApp instance detached " + "from listener");
++ // }
++ //}
+
+ // The main entry-point for this functionality. This is the only method
+ // that needs to be called at runtime, and it can easily be done using
+@@ -107,15 +107,15 @@
+
+ mainApp = inApp;
+
- theApplication.addApplicationListener(theAdapter);
--
++ //theApplication.addApplicationListener(theAdapter);
+
- theApplication.addPreferencesMenuItem();
-- }
--
-- // Another static entry point for EAWT functionality. Enables the
-- // "Preferences..." menu item in the application menu.
-- public static void enablePrefs(boolean enabled) {
--
++ //theApplication.addPreferencesMenuItem();
+ }
+
+ // Another static entry point for EAWT functionality. Enables the
+ // "Preferences..." menu item in the application menu.
+ public static void enablePrefs(boolean enabled) {
+
- theApplication.setEnabledPreferencesMenu(enabled);
-+public class OSXAdapter {
-+ public OSXAdapter() throws Exception {
-+ throw new Exception("No support for apple in debian.");
++ //theApplication.setEnabledPreferencesMenu(enabled);
}
}
+--- a/src/gui/edu/umd/cs/findbugs/gui2/MainFrameComponentFactory.java
++++ b/src/gui/edu/umd/cs/findbugs/gui2/MainFrameComponentFactory.java
+@@ -461,7 +461,7 @@
+ JToolTip tempToolTip = mainFrame.mainFrameTree.getTableheader().createToolTip();
+ UIManager.put("ToolTip.font", new FontUIResource(tempToolTip.getFont().deriveFont(Driver.getFontSize())));
+
+- setupOSX();
++ //setupOSX();
+
+ String loadFromURL = SystemProperties.getOSDependentProperty("findbugs.loadBugsFromURL");
+
+@@ -486,6 +486,7 @@
+ mainFrame.waitForMainFrameInitialized();
+ }
+
++ /* disabled for Debian
+ private void setupOSX() {
+ if (MainFrame.MAC_OS_X) {
+ try {
+@@ -514,6 +515,7 @@
+ }
+ }
+ }
++ */
+ }
+
+ /**
diff --git a/debian/patches/0002-FixJnlpLibraryDir.patch b/debian/patches/0002-FixJnlpLibraryDir.patch
index 9a17a99..7a07f24 100644
--- a/debian/patches/0002-FixJnlpLibraryDir.patch
+++ b/debian/patches/0002-FixJnlpLibraryDir.patch
@@ -1,23 +1,20 @@
-Index: findbugs-2.0.3/jnlp/core.jnlp
-===================================================================
---- findbugs-2.0.3.orig/jnlp/core.jnlp 2013-12-17 17:59:30.626249087 +0800
-+++ findbugs-2.0.3/jnlp/core.jnlp 2013-12-17 20:24:26.170181104 +0800
+--- a/jnlp/core.jnlp
++++ b/jnlp/core.jnlp
@@ -13,15 +13,14 @@
<all-permissions/>
</security>
<resources>
- <jar href="AppleJavaExtensions.jar"/>
-- <jar href="bcel.jar"/>
+ <jar href="bcel.jar"/>
- <jar href="dom4j-1.6.1.jar"/>
- <jar href="asm-3.3.jar"/>
- <jar href="asm-tree-3.3.jar"/>
- <jar href="asm-commons-3.3.jar"/>
- <jar href="jaxen-1.1.6.jar"/>
-+ <jar href="bcel.jar"/>
+ <jar href="dom4j.jar"/>
-+ <jar href="asm3.jar"/>
-+ <jar href="asm3-tree.jar"/>
-+ <jar href="asm3-commons.jar"/>
++ <jar href="asm4.jar"/>
++ <jar href="asm4-tree.jar"/>
++ <jar href="asm4-commons.jar"/>
+ <jar href="jaxen.jar"/>
<jar href="jFormatString.jar"/>
- <jar href="commons-lang-2.6.jar"/>
@@ -25,26 +22,23 @@ Index: findbugs-2.0.3/jnlp/core.jnlp
<jar href="jsr305.jar"/>
</resources>
<component-desc />
-Index: findbugs-2.0.3/jnlp/findbugs.jnlp
-===================================================================
---- findbugs-2.0.3.orig/jnlp/findbugs.jnlp 2013-12-17 17:59:30.626249087 +0800
-+++ findbugs-2.0.3/jnlp/findbugs.jnlp 2013-12-17 20:25:08.606180771 +0800
+--- a/jnlp/findbugs.jnlp
++++ b/jnlp/findbugs.jnlp
@@ -18,15 +18,14 @@
<resources>
<j2se version="1.5+" initial-heap-size="300m" max-heap-size="600m"/>
<jar href="findbugs.jar"/>
- <jar href="AppleJavaExtensions.jar"/>
-- <jar href="bcel.jar"/>
+ <jar href="bcel.jar"/>
- <jar href="dom4j-1.6.1.jar"/>
- <jar href="asm-3.3.jar"/>
- <jar href="asm-tree-3.3.jar"/>
- <jar href="asm-commons-3.3.jar"/>
- <jar href="jaxen-1.1.6.jar"/>
-+ <jar href="bcel.jar"/>
+ <jar href="dom4j.jar"/>
-+ <jar href="asm3.jar"/>
-+ <jar href="asm3-tree.jar"/>
-+ <jar href="asm3-commons.jar"/>
++ <jar href="asm4.jar"/>
++ <jar href="asm4-tree.jar"/>
++ <jar href="asm4-commons.jar"/>
+ <jar href="jaxen.jar"/>
<jar href="jFormatString.jar"/>
- <jar href="commons-lang-2.6.jar"/>
diff --git a/debian/patches/0004-FixLibraryInScriptProperties.patch b/debian/patches/0004-FixLibraryInScriptProperties.patch
index 32c3be6..f72e98e 100644
--- a/debian/patches/0004-FixLibraryInScriptProperties.patch
+++ b/debian/patches/0004-FixLibraryInScriptProperties.patch
@@ -1,13 +1,11 @@
-Index: findbugs-2.0.3/etc/script.properties
-===================================================================
---- findbugs-2.0.3.orig/etc/script.properties 2013-12-17 21:48:57.158141458 +0800
-+++ findbugs-2.0.3/etc/script.properties 2013-12-17 21:50:54.722140536 +0800
+--- a/etc/script.properties
++++ b/etc/script.properties
@@ -76,6 +76,9 @@
# This should be done before executing any code that
# could override fb_javacmd.
script.set.default.java=\
+ . /usr/lib/java-wrappers/java-wrappers.sh\n\
-+ find_jars dom4j junit4 commons-lang jaxen jdepend asm3 asm3-commons asm3-tree ant jcip jsr305 jFormatString bcel\n\
++ find_jars dom4j junit4 commons-lang jaxen jdepend asm4 asm4-commons asm4-tree ant jcip jsr305 jFormatString bcel\n\
+ export CLASSPATH=$JAVA_CLASSPATH\n\
# Choose default java binary\n\
fb_javacmd=java\n\
diff --git a/debian/patches/0005-FixShowHelpInFindbugs.patch b/debian/patches/0005-FixShowHelpInFindbugs.patch
index df98806..e69de29 100644
--- a/debian/patches/0005-FixShowHelpInFindbugs.patch
+++ b/debian/patches/0005-FixShowHelpInFindbugs.patch
@@ -1,29 +0,0 @@
-Index: findbugs-2.0.3/src/java/edu/umd/cs/findbugs/ShowHelp.java
-===================================================================
---- findbugs-2.0.3.orig/src/java/edu/umd/cs/findbugs/ShowHelp.java 2011-12-20 16:16:10.000000000 +0800
-+++ findbugs-2.0.3/src/java/edu/umd/cs/findbugs/ShowHelp.java 2013-12-17 20:42:32.742172610 +0800
-@@ -32,14 +32,21 @@
- System.out.println("FindBugs version " + Version.RELEASE + ", " + Version.WEBSITE);
-
- DetectorFactoryCollection.instance();
-- System.out.println("Command line options");
-+ //System.out.println("Command line options:");
-
- TreeSet<FindBugsMain> cmds = new TreeSet<FindBugsMain>();
- for(Plugin p : Plugin.getAllPlugins())
- for(FindBugsMain m : p.getAllFindBugsMain())
- cmds.add(m);
-- for(FindBugsMain m : cmds)
-- System.out.printf("fb %-12s %-12s %s%n", m.cmd, m.kind, m.description);
-+ boolean isFirst=true;
-+ for(FindBugsMain m : cmds){
-+ if (isFirst)
-+ System.out.printf("Usage: ");
-+ else
-+ System.out.printf("or: ");
-+ System.out.printf("fb %-12s %-12s %s%n", m.cmd, m.kind, m.description);
-+ isFirst=false;
-+ }
-
- // System.out.println();
- // System.out.println("GUI Options:");
diff --git a/debian/patches/0007-FixManifest.patch b/debian/patches/0007-FixManifest.patch
index eeb8422..4d7f525 100644
--- a/debian/patches/0007-FixManifest.patch
+++ b/debian/patches/0007-FixManifest.patch
@@ -3,12 +3,12 @@
@@ -1,3 +1,3 @@
Manifest-Version: 1.0
Main-Class: edu.umd.cs.findbugs.LaunchAppropriateUI
--Class-Path: bcel.jar dom4j-1.6.1.jar jaxen-1.1.6.jar asm-3.3.jar asm-tree-3.3.jar asm-commons-3.3.jar jsr305.jar jFormatString.jar commons-lang-2.6.jar plastic.jar
-+Class-Path: bcel.jar dom4j.jar jaxen.jar asm3.jar asm3-tree.jar asm3-commons.jar jsr305.jar jFormatString.jar commons-lang.jar plastic.jar
+-Class-Path: bcel-6.0-SNAPSHOT.jar dom4j-1.6.1.jar jaxen-1.1.6.jar asm-debug-all-5.0.2.jar jsr305.jar jFormatString.jar commons-lang-2.6.jar plastic.jar
++Class-Path: bcel.jar dom4j.jar jaxen.jar asm4.jar asm4-tree.jar asm4-commons.jar jsr305.jar jFormatString.jar commons-lang.jar plastic.jar
--- a/etc/MANIFEST-findbugs.MF
+++ b/etc/MANIFEST-findbugs.MF
@@ -1,3 +1,3 @@
Manifest-Version: 1.0
Main-Class: edu.umd.cs.findbugs.LaunchAppropriateUI
--Class-Path: bcel.jar dom4j-1.6.1.jar jaxen-1.1.6.jar asm-3.3.jar asm-tree-3.3.jar asm-commons-3.3.jar jsr305.jar jFormatString.jar commons-lang-2.6.jar
-+Class-Path: bcel.jar dom4j.jar jaxen.jar asm3.jar asm3-tree.jar asm3-commons.jar jsr305.jar jFormatString.jar commons-lang.jar
+-Class-Path: bcel-6.0-SNAPSHOT.jar dom4j-1.6.1.jar jaxen-1.1.6.jar asm-debug-all-5.0.2.jar jsr305.jar jFormatString.jar commons-lang-2.6.jar
++Class-Path: bcel.jar dom4j.jar jaxen.jar asm4.jar asm4-tree.jar asm4-commons.jar jsr305.jar jFormatString.jar commons-lang.jar
diff --git a/debian/patches/0008-fix-docbook-ref.patch b/debian/patches/0008-fix-docbook-ref.patch
index 7ac0bf0..8100945 100644
--- a/debian/patches/0008-fix-docbook-ref.patch
+++ b/debian/patches/0008-fix-docbook-ref.patch
@@ -2,13 +2,3 @@ Description: Use local docbookx.dtd
Author: James Page <jamespage at debian.org>
Forwarded: no
---- a/src/doc/manual_ja.xml
-+++ b/src/doc/manual_ja.xml
-@@ -1,6 +1,5 @@
- <?xml version="1.0" encoding="UTF-8"?>
--<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://findbugs.googlecode.com/svn/trunk/findbugs/etc/docbook/docbookx.dtd"
--[
-+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "file:../../etc/docbook/docbookx.dtd" [
- <!ENTITY FindBugs "<application>FindBugs</application>">
- <!ENTITY Ant "<application>Ant</application>">
- <!ENTITY Saxon "<application>Saxon</application>">
diff --git a/debian/patches/0009-bcel-compatibility.patch b/debian/patches/0009-bcel-compatibility.patch
index 2e2dea1..76c4143 100644
--- a/debian/patches/0009-bcel-compatibility.patch
+++ b/debian/patches/0009-bcel-compatibility.patch
@@ -20,7 +20,7 @@
* clone() is overridden to change access control from protected to public.
--- a/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java
+++ b/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java
-@@ -265,6 +265,9 @@
+@@ -297,6 +297,9 @@
public void visitStackConsumer(StackConsumer obj) {
}
@@ -30,14 +30,3 @@
/*
* ----------------------------------------------------------------------
* General instruction handlers
-@@ -1084,6 +1087,10 @@
- public void visitFADD(FADD obj) {
- handleNormalInstruction(obj);
- }
-+
-+ public void visitINVOKEDYNAMIC(INVOKEDYNAMIC obj) {
-+ handleNormalInstruction(obj);
-+ }
- }
-
- // vim:ts=4
diff --git a/debian/patches/0010-bcel-for-version3.patch b/debian/patches/0010-bcel-for-version3.patch
new file mode 100644
index 0000000..ba4100f
--- /dev/null
+++ b/debian/patches/0010-bcel-for-version3.patch
@@ -0,0 +1,33 @@
+--- a/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java
++++ b/src/java/edu/umd/cs/findbugs/ba/AbstractFrameModelingVisitor.java
+@@ -50,7 +50,7 @@
+ * @see Frame
+ * @see DataflowAnalysis
+ */
+-public abstract class AbstractFrameModelingVisitor<Value, FrameType extends Frame<Value>> implements VisitorSupportsInvokeDynamic {
++public abstract class AbstractFrameModelingVisitor<Value, FrameType extends Frame<Value>> implements Visitor {
+ private FrameType frame;
+
+ private Location location;
+--- a/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java
++++ b/src/java/edu/umd/cs/findbugs/visitclass/BetterVisitor.java
+@@ -50,6 +50,7 @@
+ import org.apache.bcel.classfile.LocalVariableTable;
+ import org.apache.bcel.classfile.LocalVariableTypeTable;
+ import org.apache.bcel.classfile.Method;
++import org.apache.bcel.classfile.MethodParameters;
+ import org.apache.bcel.classfile.Signature;
+ import org.apache.bcel.classfile.SourceFile;
+ import org.apache.bcel.classfile.StackMap;
+@@ -352,6 +353,11 @@
+ }
+
+ @Override
++ public void visitMethodParameters(MethodParameters obj) {
++ // TODO: should we do something here - implement visit(MethodParameters)
++ }
++
++ @Override
+ public void visitSignature(Signature obj) {
+ visit(obj);
+ }
diff --git a/debian/patches/0011-typecast.patch b/debian/patches/0011-typecast.patch
new file mode 100644
index 0000000..1518c79
--- /dev/null
+++ b/debian/patches/0011-typecast.patch
@@ -0,0 +1,12 @@
+--- a/src/java/edu/umd/cs/findbugs/detect/CheckRelaxingNullnessAnnotation.java
++++ b/src/java/edu/umd/cs/findbugs/detect/CheckRelaxingNullnessAnnotation.java
+@@ -202,7 +202,8 @@
+ bug.addClassAndMethod(xmethod);
+ LocalVariableAnnotation lva = null;
+ if (localVariables != null) {
+- for(LocalVariableNode lvn : localVariables) {
++ for(Object obj : localVariables) {
++ LocalVariableNode lvn = (LocalVariableNode)obj;
+ if (lvn.index == i+1) {
+ lva = new LocalVariableAnnotation(lvn.name, i+1, 0);
+ lva.setDescription(LocalVariableAnnotation.PARAMETER_NAMED_ROLE);
diff --git a/debian/patches/0012-verbose-tests.patch b/debian/patches/0012-verbose-tests.patch
new file mode 100644
index 0000000..1adadf0
--- /dev/null
+++ b/debian/patches/0012-verbose-tests.patch
@@ -0,0 +1,19 @@
+--- a/build.xml
++++ b/build.xml
+@@ -78,6 +78,7 @@
+ <pathelement location="${classes.dir}"/>
+ <pathelement location="${jar.dir}/findbugs.jar"/>
+ <pathelement location="${sys.jar.dir}/jdepend.jar"/>
++ <pathelement location="${sys.jar.dir}/jaxen.jar"/>
+ <path refid="findbugs.classpath"/>
+ </path>
+
+@@ -597,7 +598,7 @@
+ <echo>Running JUnit test cases for FindBugs, results will be in: ${junit.dir}</echo>
+ <delete dir="${junit.dir}"/>
+ <mkdir dir="${junit.dir}"/>
+- <junit fork="yes" printsummary="true" haltonfailure="true" haltonerror="true" dir="${basedir}">
++ <junit fork="yes" showoutput="true" printsummary="true" haltonfailure="true" haltonerror="true" dir="${basedir}">
+ <jvmarg value="-ea"/>
+ <jvmarg value="-Xmx1200m"/>
+ <jvmarg value="-Dfindbugs.home=${basedir}"/>
diff --git a/debian/patches/series b/debian/patches/series
index 9a1273e..62c2859 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,8 +2,11 @@
0002-FixJnlpLibraryDir.patch
0003-UseGTKLook.patch
0004-FixLibraryInScriptProperties.patch
-0005-FixShowHelpInFindbugs.patch
+#0005-FixShowHelpInFindbugs.patch
0006-FixLibraryPathInJavaDoc.patch
0007-FixManifest.patch
-0008-fix-docbook-ref.patch
+#0008-fix-docbook-ref.patch
0009-bcel-compatibility.patch
+0010-bcel-for-version3.patch
+0011-typecast.patch
+0012-verbose-tests.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/findbugs.git
More information about the pkg-java-commits
mailing list