File findbugs-1.3.9-build.patch of Package findbugs
diff -dur findbugs-1.3.9.ORIG/build.xml findbugs-1.3.9/build.xml
--- findbugs-1.3.9.ORIG/build.xml 2009-08-04 20:26:50.000000000 -0600
+++ findbugs-1.3.9/build.xml 2009-08-25 11:31:55.848947432 -0600
@@ -18,6 +18,8 @@
<property file="build.properties" />
<property name="jar.dir" value="lib"/>
+ <property name="systemjar.dir" value="/usr/share/java"/>
+ <property name="xsl.stylesheet.home" value="/usr/share/sgml/docbook/xsl-stylesheets"/>
<property name="plugin.dir" value="plugin"/>
<property name="build.dir" value="build"/>
<property name="classes.dir" value="build/classes"/>
@@ -55,23 +57,24 @@
<property name="version.props.file" value="${build.dir}/classes/edu/umd/cs/findbugs/version.properties"/>
<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.1.jar"/>
- <pathelement location="${jar.dir}/asm-commons-3.1.jar"/>
- <pathelement location="${jar.dir}/asm-tree-3.1.jar"/>
- <pathelement location="${jar.dir}/jaxen-1.1.1.jar"/>
- <pathelement location="${jar.dir}/jsr305.jar"/>
- <pathelement location="${jar.dir}/jFormatString.jar"/>
- <pathelement location="${jar.dir}/commons-lang-2.4.jar"/>
+ <pathelement location="${systemjar.dir}/findbugs-bcel.jar"/>
+ <pathelement location="${systemjar.dir}/dom4j-1.6.1.jar"/>
+ <pathelement location="${systemjar.dir}/junit4.jar"/>
+ <pathelement location="${systemjar.dir}/objectweb-asm/asm-3.1.jar"/>
+ <pathelement location="${systemjar.dir}/objectweb-asm/asm-commons-3.1.jar"/>
+ <pathelement location="${systemjar.dir}/objectweb-asm/asm-tree-3.1.jar"/>
+ <pathelement location="${systemjar.dir}/jaxen-1.1.1.jar"/>
+ <pathelement location="${systemjar.dir}/jsr-305.jar"/>
+ <pathelement location="${systemjar.dir}/jFormatString.jar"/>
+ <pathelement location="${systemjar.dir}/commons-lang.jar"/>
+ <pathelement location="${systemjar.dir}/jcip-annotations.jar"/>
+ <pathelement location="${systemjar.dir}/ant.jar"/>
</path>
<path id="tools.classpath">
<pathelement location="${classes.dir}"/>
<pathelement location="${jar.dir}/findbugs.jar"/>
- <pathelement location="${jar.dir}/jdepend-2.9.jar"/>
+ <pathelement location="${systemjar.dir}/jdepend-2.9.1.jar"/>
<path refid="findbugs.classpath"/>
</path>
@@ -1047,7 +1050,7 @@
<delete dir="${annotationDoc.dir}"/>
<mkdir dir="${annotationDoc.dir}"/>
<javadoc access="public"
- classpath="lib/bcel.jar:lib/junit.jar:lib/dom4j-1.6.1.jar:lib/jsr305.jar:lib/AppleJavaExtensions.jar"
+ classpath="${systemjar.dir}/findbugs-bcel.jar:${systemjar.dir}/junit4.jar:${systemjar.dir}/dom4j-1.6.1.jar:${systemjar.dir}/jsr-305.jar:${systemjar.dir}/jcip-annotations.jar"
destdir="${annotationDoc.dir}"
packagenames="edu.umd.cs.findbugs.annotations"
doctitle="FindBugs Annotation Documentation"
diff -dur findbugs-1.3.9.ORIG/design/architecture/Makefile findbugs-1.3.9/design/architecture/Makefile
--- findbugs-1.3.9.ORIG/design/architecture/Makefile 2006-01-10 14:34:32.000000000 -0700
+++ findbugs-1.3.9/design/architecture/Makefile 2009-08-25 11:31:27.204143518 -0600
@@ -4,6 +4,7 @@
%.pdf : %.tex
pdflatex $*
pdflatex $*
+ pdflatex $*
all : $(PDFS)
diff -dur findbugs-1.3.9.ORIG/etc/MANIFEST-findbugs.MF findbugs-1.3.9/etc/MANIFEST-findbugs.MF
--- findbugs-1.3.9.ORIG/etc/MANIFEST-findbugs.MF 2009-06-13 11:10:40.000000000 -0600
+++ findbugs-1.3.9/etc/MANIFEST-findbugs.MF 2009-08-25 11:31:27.205158785 -0600
@@ -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.1.jar asm-3.1.jar asm-tree-3.1.jar asm-commons-3.1.jar jsr305.jar jFormatString.jar commons-lang-2.4.jar mysql-connector-java-5.1.7-bin.jar
+Class-Path: findbugs-bcel.jar dom4j-1.6.1.jar jaxen-1.1.1.jar objectweb-asm/asm-3.1.jar objectweb-asm/asm-tree-3.1.jar objectweb-asm/asm-commons-3.1.jar jsr-305.jar jFormatString.jar commons-lang.jar
diff -dur findbugs-1.3.9.ORIG/etc/script.properties findbugs-1.3.9/etc/script.properties
--- findbugs-1.3.9.ORIG/etc/script.properties 2008-03-18 16:54:34.000000000 -0600
+++ findbugs-1.3.9/etc/script.properties 2009-08-25 11:31:27.205158785 -0600
@@ -93,7 +93,7 @@
script.wrap.java=\
fb_javacmd=\${fb_javacmd:-"java"}\n\
fb_maxheap=\${fb_maxheap:-"-Xmx584m"}\n\
- fb_appjar=\${fb_appjar:-"$findbugs_home/lib/findbugs.jar"}\n\
+ fb_appjar=\${fb_appjar:-"/usr/share/java/findbugs.jar"}\n\
set -f\n\
#echo command: \\\n\
exec "$fb_javacmd" \\\n\
@@ -105,7 +105,7 @@
script.wrap.jar=\
fb_javacmd=\${fb_javacmd:-"java"}\n\
fb_maxheap=\${fb_maxheap:-"-Xmx584m"}\n\
- fb_appjar=\${fb_appjar:-"$findbugs_home/lib/findbugs.jar"}\n\
+ fb_appjar=\${fb_appjar:-"/usr/share/java/findbugs.jar"}\n\
set -f\n\
#echo command: \\\n\
exec "$fb_javacmd" \\\n\
diff -dur findbugs-1.3.9.ORIG/src/scripts/standard/findbugs findbugs-1.3.9/src/scripts/standard/findbugs
--- findbugs-1.3.9.ORIG/src/scripts/standard/findbugs 2008-07-02 11:48:10.000000000 -0600
+++ findbugs-1.3.9/src/scripts/standard/findbugs 2009-08-25 11:31:27.206143760 -0600
@@ -10,7 +10,7 @@
maxheap=768
-fb_appjar="$findbugs_home/lib/findbugs.jar"
+fb_appjar="/usr/share/java/findbugs.jar"
ShowHelpAndExit() {
fb_mainclass="edu.umd.cs.findbugs.ShowHelp"
diff -dur findbugs-1.3.9.ORIG/src/scripts/standard/findbugs2 findbugs-1.3.9/src/scripts/standard/findbugs2
--- findbugs-1.3.9.ORIG/src/scripts/standard/findbugs2 2009-07-31 10:23:38.000000000 -0600
+++ findbugs-1.3.9/src/scripts/standard/findbugs2 2009-08-25 11:31:27.207327673 -0600
@@ -117,5 +117,5 @@
-Dfindbugs.home="$findbugs_home" \
$jvm_debug $jvm_maxheap $jvm_ea $jvm_conservespace $jvm_user_props \
-Dfindbugs.launchUI=$fb_launchui \
- -jar $findbugs_home/lib/findbugs.jar \
+ -jar /usr/share/java/findbugs.jar \
${@:+"$@"}