Commit c22cf9eec940562bbefa50cf3a78233b5cce3ce8 - findbugs

fix conflict with remote repo yesx 10 years ago

9 changed file(s) with 163 addition(s) and 159 deletion(s). Raw diff Collapse all Expand all

-1

debian/control less more

17	17	Depends: ${misc:Depends}, libdom4j-java (>= 1.6.1), junit4,
18	18	libasm3-java (>= 3.3), libjaxen-java (>= 1.1.1),
19	19	libcommons-lang-java (>= 2.4), libjdepend-java (>= 2.9),
20		libjcip-annotations-java
	20	libjcip-annotations-java, java-wrappers
21	21	Description: Static java code analyzer to find bugs
22	22	Findbugs is a program which uses static analysis to look for bugs in Java
23	23	code. It can analyze programs compiled for any version of Java, from 1.0

-1

debian/docs less more

0		README.txt
1	0	README.txt
2	1	userDict.txt

+18

-18

debian/findbugs.install less more

4	4	lib/jsr305.jar usr/share/findbugs/lib
5	5	lib/buggy.icns usr/share/findbugs/lib
6	6	lib/bug-logo.icns usr/share/findbugs/lib
7		bin/addMessages usr/share/findbugs/bin
8		bin/computeBugHistory usr/share/findbugs/bin
9		bin/convertXmlToText usr/share/findbugs/bin
10		bin/copyBuggySource usr/share/findbugs/bin
11		bin/defectDensity usr/share/findbugs/bin
12		bin/fb usr/share/findbugs/bin
13		bin/fbwrap usr/share/findbugs/bin
14		bin/filterBugs usr/share/findbugs/bin
15		bin/findbugs* usr/share/findbugs/bin
16		bin/listBugDatabaseInfo usr/share/findbugs/bin
17		bin/mineBugHistory usr/share/findbugs/bin
18		bin/printAppVersion usr/share/findbugs/bin
19		bin/printClass usr/share/findbugs/bin
20		bin/rejarForAnalysis usr/share/findbugs/bin
21		bin/setBugDatabaseInfo usr/share/findbugs/bin
22		bin/unionBugs usr/share/findbugs/bin
23		bin/xpathFind usr/share/findbugs/bin
24		bin/findbugs.ico usr/share/findbugs/bin
	7	bin/addMessages usr/bin/
	8	bin/computeBugHistory usr/bin/
	9	bin/convertXmlToText usr/bin/
	10	bin/copyBuggySource usr/bin/
	11	bin/defectDensity usr/bin/
	12	bin/fb usr/bin
	13	bin/fbwrap usr/bin/
	14	bin/filterBugs usr/bin/
	15	bin/findbugs* usr/bin
	16	bin/listBugDatabaseInfo usr/bin/
	17	bin/mineBugHistory usr/bin/
	18	bin/printAppVersion usr/bin/
	19	bin/printClass usr/bin/
	20	bin/rejarForAnalysis usr/bin/
	21	bin/setBugDatabaseInfo usr/bin/
	22	bin/unionBugs usr/bin/
	23	bin/xpathFind usr/bin/
	24	bin/findbugs.ico usr/share/findbugs/
25	25	doc/html usr/share/doc/findbugs

+15

-0

debian/patches/0007-insert-in-script.patch less more

	0	diff --git a/etc/script.properties b/etc/script.properties
	1	index f595a9a..c67c79f 100644
	2	--- a/etc/script.properties
	3	+++ b/etc/script.properties
	4	@@ -76,6 +76,9 @@ script.define.escape_arg=\
	5	# This should be done before executing any code that
	6	# could override fb_javacmd.
	7	script.set.default.java=\
	8	+ . /usr/lib/java-wrappers/java-wrappers.sh\n\
	9	+ find_jars dom4j junit4 commons-lang jaxen jdepend asm3 asm3-commons asm3-tree ant jcip\n\
	10	+ export CLASSPATH=$JAVA_CLASSPATH\n\
	11	# Choose default java binary\n\
	12	fb_javacmd=java\n\
	13	if [ ! -z "$JAVA_HOME" ] && [ -x "$JAVA_HOME/bin/java" ]; then\n\
	14

-125

~~debian/patches/0007-new-findbugs-help-options.patch~~ less more

0		Index: findbugs-2.0.2/src/java/edu/umd/cs/findbugs/ShowHelp.java
1		===================================================================
2		--- findbugs-2.0.2.orig/src/java/edu/umd/cs/findbugs/ShowHelp.java 2013-08-29 21:05:56.000000000 +0800
3		+++ findbugs-2.0.2/src/java/edu/umd/cs/findbugs/ShowHelp.java 2013-08-29 21:07:43.893829925 +0800
4		@@ -18,52 +18,59 @@
5		*/
6		package edu.umd.cs.findbugs;
7
8		-import java.util.TreeSet;
9
10		/**
11		* Show command line help.
12		- *
13		+ *
14		* @author David Hovemeyer
15		*/
16		public class ShowHelp {
17		-
18		+
19		public static void main(String[] args) {
20
21		System.out.println("FindBugs version " + Version.RELEASE + ", " + Version.WEBSITE);
22		-
23		+
24		DetectorFactoryCollection.instance();
25		- System.out.println("Command line options");
26		-
27		+ //System.out.println("Command line options");
28		+
29		+ /*
30		TreeSet<FindBugsMain> cmds = new TreeSet<FindBugsMain>();
31		- for(Plugin p : Plugin.getAllPlugins())
32		- for(FindBugsMain m : p.getAllFindBugsMain())
33		+ for(Plugin p : Plugin.getAllPlugins())
34		+ for(FindBugsMain m : p.getAllFindBugsMain())
35		cmds.add(m);
36		- for(FindBugsMain m : cmds)
37		- System.out.printf("fb %-12s %-12s %s%n", m.cmd, m.kind, m.description);
38		-
39		-// System.out.println();
40		-// System.out.println("GUI Options:");
41		-// FindBugsCommandLine guiCmd = new FindBugsCommandLine(true) {
42		-// };
43		-// guiCmd.printUsage(System.out);
44		-// System.out.println();
45		-// System.out.println("TextUI Options:");
46		-// FindBugs.showCommandLineOptions();
47		+ for(FindBugsMain m : cmds)
48		+ System.out.printf("fb %-12s %-12s %s%n", m.cmd, m.kind, m.description);
49		+ */
50		+ System.out.println();
51		+ showSynopsis();
52		+
53		System.out.println();
54		showGeneralOptions();
55		-
56		+
57		+ System.out.println();
58		+ System.out.println("GUI Options:");
59		+ FindBugsCommandLine guiCmd = new FindBugsCommandLine(true) {
60		+ };
61		+ guiCmd.printUsage(System.out);
62		+
63		+ System.out.println();
64		+ System.out.println("TextUI Options:");
65		+ FindBugs.showCommandLineOptions();
66		+ System.out.println();
67		+
68		}
69
70		public static void showSynopsis() {
71		System.out.println("Usage: findbugs [general options] [gui options]");
72		+ System.out.println(" or: findbugs [general options] -textui [textui options...] [jar/zip/class files, directories...]");
73		}
74
75		public static void showGeneralOptions() {
76		-
77		+
78		System.out.println("General options:");
79		System.out.println(" -jvmArgs args Pass args to JVM");
80		System.out.println(" -maxHeap size Maximum Java heap size in megabytes (default=768)");
81		System.out.println(" -javahome <dir> Specify location of JRE");
82		-
83		+
84		}
85		}
86		Index: findbugs-2.0.2/src/java/edu/umd/cs/findbugs/TextUICommandLine.java
87		===================================================================
88		--- findbugs-2.0.2.orig/src/java/edu/umd/cs/findbugs/TextUICommandLine.java 2013-08-29 21:05:56.000000000 +0800
89		+++ findbugs-2.0.2/src/java/edu/umd/cs/findbugs/TextUICommandLine.java 2013-08-29 21:07:37.913800267 +0800
90		@@ -145,7 +145,7 @@
91		public TextUICommandLine() {
92		addSwitch("-showPlugins", "show list of available detector plugins");
93
94		- startOptionGroup("Output options:");
95		+ startOptionGroup("\nOutput options:");
96		addSwitch("-justListOptions", "throw an exception that lists the provided options");
97		makeOptionUnlisted("-justListOptions");
98
99		@@ -177,7 +177,7 @@
100		makeOptionUnlisted("-outputFile");
101		addSwitchWithOptionalExtraPart("-nested", "true\|false", "analyze nested jar/zip archives (default=true)");
102
103		- startOptionGroup("Output filtering options:");
104		+ startOptionGroup("\nOutput filtering options:");
105		addOption("-bugCategories", "cat1[,cat2...]", "only report bugs in given categories");
106		addOption("-onlyAnalyze", "classes/packages",
107		"only analyze given classes and packages; end with .* to indicate classes in a package, .- to indicate a package prefix");
108		@@ -186,14 +186,14 @@
109		addOption("-include", "filter file", "include only bugs matching given filter");
110		addSwitch("-applySuppression", "Exclude any bugs that match suppression filter loaded from fbp file");
111
112		- startOptionGroup("Detector (visitor) configuration options:");
113		+ startOptionGroup("\nDetector (visitor) configuration options:");
114		addOption("-visitors", "v1[,v2...]", "run only named visitors");
115		addOption("-omitVisitors", "v1[,v2...]", "omit named visitors");
116		addOption("-chooseVisitors", "+v1,-v2,...", "selectively enable/disable detectors");
117		addOption("-choosePlugins", "+p1,-p2,...", "selectively enable/disable plugins");
118		addOption("-adjustPriority", "v1=(raise\|lower)[,...]", "raise/lower priority of warnings for given visitor(s)");
119
120		- startOptionGroup("Project configuration options:");
121		+ startOptionGroup("\nProject configuration options:");
122		addOption("-auxclasspath", "classpath", "set aux classpath for analysis");
123		addSwitch("-auxclasspathFromInput", "read aux classpath from standard input");
124		addOption("-sourcepath", "source path", "set source path for analyzed classes");

+125

-0

debian/patches/0008-new-findbugs-help-options.patch less more

	0	Index: findbugs-2.0.2/src/java/edu/umd/cs/findbugs/ShowHelp.java
	1	===================================================================
	2	--- findbugs-2.0.2.orig/src/java/edu/umd/cs/findbugs/ShowHelp.java 2013-08-29 21:05:56.000000000 +0800
	3	+++ findbugs-2.0.2/src/java/edu/umd/cs/findbugs/ShowHelp.java 2013-08-29 21:07:43.893829925 +0800
	4	@@ -18,52 +18,59 @@
	5	*/
	6	package edu.umd.cs.findbugs;
	7
	8	-import java.util.TreeSet;
	9
	10	/**
	11	* Show command line help.
	12	- *
	13	+ *
	14	* @author David Hovemeyer
	15	*/
	16	public class ShowHelp {
	17	-
	18	+
	19	public static void main(String[] args) {
	20
	21	System.out.println("FindBugs version " + Version.RELEASE + ", " + Version.WEBSITE);
	22	-
	23	+
	24	DetectorFactoryCollection.instance();
	25	- System.out.println("Command line options");
	26	-
	27	+ //System.out.println("Command line options");
	28	+
	29	+ /*
	30	TreeSet<FindBugsMain> cmds = new TreeSet<FindBugsMain>();
	31	- for(Plugin p : Plugin.getAllPlugins())
	32	- for(FindBugsMain m : p.getAllFindBugsMain())
	33	+ for(Plugin p : Plugin.getAllPlugins())
	34	+ for(FindBugsMain m : p.getAllFindBugsMain())
	35	cmds.add(m);
	36	- for(FindBugsMain m : cmds)
	37	- System.out.printf("fb %-12s %-12s %s%n", m.cmd, m.kind, m.description);
	38	-
	39	-// System.out.println();
	40	-// System.out.println("GUI Options:");
	41	-// FindBugsCommandLine guiCmd = new FindBugsCommandLine(true) {
	42	-// };
	43	-// guiCmd.printUsage(System.out);
	44	-// System.out.println();
	45	-// System.out.println("TextUI Options:");
	46	-// FindBugs.showCommandLineOptions();
	47	+ for(FindBugsMain m : cmds)
	48	+ System.out.printf("fb %-12s %-12s %s%n", m.cmd, m.kind, m.description);
	49	+ */
	50	+ System.out.println();
	51	+ showSynopsis();
	52	+
	53	System.out.println();
	54	showGeneralOptions();
	55	-
	56	+
	57	+ System.out.println();
	58	+ System.out.println("GUI Options:");
	59	+ FindBugsCommandLine guiCmd = new FindBugsCommandLine(true) {
	60	+ };
	61	+ guiCmd.printUsage(System.out);
	62	+
	63	+ System.out.println();
	64	+ System.out.println("TextUI Options:");
	65	+ FindBugs.showCommandLineOptions();
	66	+ System.out.println();
	67	+
	68	}
	69
	70	public static void showSynopsis() {
	71	System.out.println("Usage: findbugs [general options] [gui options]");
	72	+ System.out.println(" or: findbugs [general options] -textui [textui options...] [jar/zip/class files, directories...]");
	73	}
	74
	75	public static void showGeneralOptions() {
	76	-
	77	+
	78	System.out.println("General options:");
	79	System.out.println(" -jvmArgs args Pass args to JVM");
	80	System.out.println(" -maxHeap size Maximum Java heap size in megabytes (default=768)");
	81	System.out.println(" -javahome <dir> Specify location of JRE");
	82	-
	83	+
	84	}
	85	}
	86	Index: findbugs-2.0.2/src/java/edu/umd/cs/findbugs/TextUICommandLine.java
	87	===================================================================
	88	--- findbugs-2.0.2.orig/src/java/edu/umd/cs/findbugs/TextUICommandLine.java 2013-08-29 21:05:56.000000000 +0800
	89	+++ findbugs-2.0.2/src/java/edu/umd/cs/findbugs/TextUICommandLine.java 2013-08-29 21:07:37.913800267 +0800
	90	@@ -145,7 +145,7 @@
	91	public TextUICommandLine() {
	92	addSwitch("-showPlugins", "show list of available detector plugins");
	93
	94	- startOptionGroup("Output options:");
	95	+ startOptionGroup("\nOutput options:");
	96	addSwitch("-justListOptions", "throw an exception that lists the provided options");
	97	makeOptionUnlisted("-justListOptions");
	98
	99	@@ -177,7 +177,7 @@
	100	makeOptionUnlisted("-outputFile");
	101	addSwitchWithOptionalExtraPart("-nested", "true\|false", "analyze nested jar/zip archives (default=true)");
	102
	103	- startOptionGroup("Output filtering options:");
	104	+ startOptionGroup("\nOutput filtering options:");
	105	addOption("-bugCategories", "cat1[,cat2...]", "only report bugs in given categories");
	106	addOption("-onlyAnalyze", "classes/packages",
	107	"only analyze given classes and packages; end with .* to indicate classes in a package, .- to indicate a package prefix");
	108	@@ -186,14 +186,14 @@
	109	addOption("-include", "filter file", "include only bugs matching given filter");
	110	addSwitch("-applySuppression", "Exclude any bugs that match suppression filter loaded from fbp file");
	111
	112	- startOptionGroup("Detector (visitor) configuration options:");
	113	+ startOptionGroup("\nDetector (visitor) configuration options:");
	114	addOption("-visitors", "v1[,v2...]", "run only named visitors");
	115	addOption("-omitVisitors", "v1[,v2...]", "omit named visitors");
	116	addOption("-chooseVisitors", "+v1,-v2,...", "selectively enable/disable detectors");
	117	addOption("-choosePlugins", "+p1,-p2,...", "selectively enable/disable plugins");
	118	addOption("-adjustPriority", "v1=(raise\|lower)[,...]", "raise/lower priority of warnings for given visitor(s)");
	119
	120	- startOptionGroup("Project configuration options:");
	121	+ startOptionGroup("\nProject configuration options:");
	122	addOption("-auxclasspath", "classpath", "set aux classpath for analysis");
	123	addSwitch("-auxclasspathFromInput", "read aux classpath from standard input");
	124	addOption("-sourcepath", "source path", "set source path for analyzed classes");

-1

debian/patches/series less more

3	3	0004-remove-manual_ja_xml.patch
4	4	0005-remove-lib-AppleJavaExtensions.patch
5	5	0006-using-gtk-ui-settings.patch
6		0007-new-findbugs-help-options.patch
	6	0007-insert-in-script.patch
	7	0008-new-findbugs-help-options.patch

-4

debian/rules less more

20	20	chmod -x $(CURDIR)/bin/findbugs.ico
21	21
22	22	mkdir -p $(CURDIR)/debian/findbugs/usr/bin
23		install -m 755 $(CURDIR)/debian/wrappers/findbugs \
24		$(CURDIR)/debian/findbugs/usr/bin
25	23
26	24	# install docs here
27		mv $(CURDIR)/doc/manual $(CURDIR)/doc/html
	25	cp -R $(CURDIR)/doc/manual $(CURDIR)/doc/html
28	26
29		dh_install --sourcedir=$(CURDIR)
	27	dh_install --sourcedir=$(CURDIR)
30	28
31	29	override_dh_auto_test:
32	30	ant test

-9

~~debian/wrappers/findbugs~~ less more

0		#!/bin/sh
1
2		# Include the wrappers utility script
3		. /usr/lib/java-wrappers/java-wrappers.sh
4
5		find_jars dom4j junit4 commons-lang jaxen jdepend \
6		asm3 asm3-commons asm3-tree ant jcip
7
8		CLASSPATH=$JAVA_CLASSPATH /usr/share/findbugs/bin/findbugs "$@"