add patch for fixing build.xml library dependency for bcel & jformatstring
yesx
10 years ago
| 0 | Index: findbugs-2.0.2/build.xml | |
| 1 | =================================================================== | |
| 2 | --- findbugs-2.0.2.orig/build.xml 2013-09-03 12:18:07.213544502 +0800 | |
| 3 | +++ findbugs-2.0.2/build.xml 2013-09-03 12:24:07.629545682 +0800 | |
| 4 | @@ -59,7 +59,7 @@ | |
| 5 | <property name="version.props.file" value="${build.dir}/classes/edu/umd/cs/findbugs/version.properties"/> | |
| 6 | ||
| 7 | <path id="findbugs.classpath"> | |
| 8 | - <pathelement location="${jar.dir}/bcel.jar"/> | |
| 9 | + <pathelement location="${sys.jar.dir}/findbugs-bcel.jar"/> | |
| 10 | <pathelement location="${sys.jar.dir}/dom4j.jar"/> | |
| 11 | <!-- <pathelement location="${jar.dir}/AppleJavaExtensions.jar"/> --> | |
| 12 | <pathelement location="${sys.jar.dir}/junit4.jar"/> | |
| 13 | @@ -126,7 +126,7 @@ | |
| 14 | <target name="mondo" depends="jars"> | |
| 15 | <jar destfile="build/mondo.jar" | |
| 16 | manifest="etc/MANIFEST-findbugs-mondo.MF"> | |
| 17 | - <zipfileset src="${jar.dir}/bcel.jar"/> | |
| 18 | + <zipfileset src="${sys.jar.dir}/findbugs-bcel.jar"/> | |
| 19 | <zipfileset src="${sys.jar.dir}/dom4j.jar"/> | |
| 20 | <!-- <zipfileset src="${jar.dir}/AppleJavaExtensions.jar"/> --> | |
| 21 | <zipfileset src="${sys.jar.dir}/junit4.jar"/> | |
| 22 | @@ -347,7 +347,7 @@ | |
| 23 | <include name="messages*.xml"/> | |
| 24 | </fileset> | |
| 25 | ||
| 26 | - <zipfileset src="${jar.dir}/bcel.jar" excludes="META-INF/**"/> | |
| 27 | + <zipfileset src="${sys.jar.dir}/findbugs-bcel.jar" excludes="META-INF/**"/> | |
| 28 | ||
| 29 | <zipfileset src="${sys.jar.dir}/asm3.jar" excludes="META-INF/**"/> | |
| 30 | <zipfileset src="${sys.jar.dir}/asm3-analysis.jar" excludes="META-INF/**"/> | |
| 31 | @@ -496,7 +496,7 @@ | |
| 32 | projectName="Byte code Engineering Library (BCEL)" | |
| 33 | outputFile="${sampleoutput.dir}/bcel.xml" | |
| 34 | > | |
| 35 | - <class location="${jar.dir}/bcel.jar" /> | |
| 36 | + <class location="${sys.jar.dir}/findbugs-bcel.jar" /> | |
| 37 | </findbugs> | |
| 38 | <findbugs home="." | |
| 39 | output="xml:withMessages" | |
| 40 | @@ -504,7 +504,7 @@ | |
| 41 | jvmargs="-ea -Xmx1200m" | |
| 42 | projectName="Byte code Engineering Library (BCEL)" | |
| 43 | outputFile="${sampleoutput.dir}/bcel-cloud-appengine.xml" > | |
| 44 | - <class location="${jar.dir}/bcel.jar" /> | |
| 45 | + <class location="${sys.jar.dir}/findbugs-bcel.jar" /> | |
| 46 | </findbugs> | |
| 47 | <!-- | |
| 48 | <findbugs home="." | |
| 49 | @@ -995,7 +995,7 @@ | |
| 50 | <!-- Generate jnlp jars --> | |
| 51 | <target name="jnlp" depends="jars"> | |
| 52 | <copy todir="${jnlp.dir}" file="${engine.jar}"/> | |
| 53 | - <copy todir="${jnlp.dir}" file="${jar.dir}/bcel.jar"/> | |
| 54 | + <copy todir="${jnlp.dir}" file="${sys.jar.dir}/findbugs-bcel.jar"/> | |
| 55 | <copy todir="${jnlp.dir}" file="${sys.jar.dir}/jsr305.jar"/> | |
| 56 | <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm3.jar"/> | |
| 57 | <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm3-commons.jar"/> |