|
0 |
Index: findbugs/build.xml
|
|
1 |
===================================================================
|
|
2 |
--- findbugs.orig/build.xml 2013-08-29 15:48:36.000000000 +0200
|
|
3 |
+++ findbugs/build.xml 2013-08-29 17:02:00.000000000 +0200
|
|
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}/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 |
@@ -67,8 +67,9 @@
|
|
14 |
<pathelement location="${sys.jar.dir}/asm3-commons.jar"/>
|
|
15 |
<pathelement location="${sys.jar.dir}/asm3-tree.jar"/>
|
|
16 |
<pathelement location="${sys.jar.dir}/jaxen.jar"/>
|
|
17 |
- <pathelement location="${jar.dir}/jsr305.jar"/>
|
|
18 |
- <pathelement location="${jar.dir}/jFormatString.jar"/>
|
|
19 |
+ <pathelement location="${sys.jar.dir}/jsr305.jar"/>
|
|
20 |
+ <!-- need the package -->
|
|
21 |
+ <pathelement location="${sys.jar.dir}/jFormatString.jar"/>
|
|
22 |
<pathelement location="${sys.jar.dir}/commons-lang.jar"/>
|
|
23 |
<pathelement location="${sys.jar.dir}/jcip.jar"/>
|
|
24 |
</path>
|
|
25 |
@@ -125,7 +126,7 @@
|
|
26 |
<target name="mondo" depends="jars">
|
|
27 |
<jar destfile="build/mondo.jar"
|
|
28 |
manifest="etc/MANIFEST-findbugs-mondo.MF">
|
|
29 |
- <zipfileset src="${jar.dir}/bcel.jar"/>
|
|
30 |
+ <zipfileset src="${sys.jar.dir}/bcel.jar"/>
|
|
31 |
<zipfileset src="${sys.jar.dir}/dom4j.jar"/>
|
|
32 |
<!-- <zipfileset src="${jar.dir}/AppleJavaExtensions.jar"/> -->
|
|
33 |
<zipfileset src="${sys.jar.dir}/junit4.jar"/>
|
|
34 |
@@ -133,8 +134,8 @@
|
|
35 |
<zipfileset src="${sys.jar.dir}/asm3-commons.jar"/>
|
|
36 |
<zipfileset src="${sys.jar.dir}/asm3-tree.jar"/>
|
|
37 |
<zipfileset src="${sys.jar.dir}/jaxen.jar"/>
|
|
38 |
- <zipfileset src="${jar.dir}/jsr305.jar"/>
|
|
39 |
- <zipfileset src="${jar.dir}/jFormatString.jar"/>
|
|
40 |
+ <zipfileset src="${sys.jar.dir}/jsr305.jar"/>
|
|
41 |
+ <zipfileset src="${sys.jar.dir}/jFormatString.jar"/>
|
|
42 |
<zipfileset src="${sys.jar.dir}/commons-lang.jar"/>
|
|
43 |
<zipfileset src="${jar.dir}/findbugs.jar"/>
|
|
44 |
</jar>
|
|
45 |
@@ -346,7 +347,7 @@
|
|
46 |
<include name="messages*.xml"/>
|
|
47 |
</fileset>
|
|
48 |
|
|
49 |
- <zipfileset src="${jar.dir}/bcel.jar" excludes="META-INF/**"/>
|
|
50 |
+ <zipfileset src="${sys.jar.dir}/bcel.jar" excludes="META-INF/**"/>
|
|
51 |
|
|
52 |
<zipfileset src="${sys.jar.dir}/asm3.jar" excludes="META-INF/**"/>
|
|
53 |
<zipfileset src="${sys.jar.dir}/asm3-analysis.jar" excludes="META-INF/**"/>
|
|
54 |
@@ -357,8 +358,8 @@
|
|
55 |
|
|
56 |
<zipfileset src="${sys.jar.dir}/dom4j.jar" excludes="META-INF/**"/>
|
|
57 |
<zipfileset src="${sys.jar.dir}/jaxen.jar" excludes="META-INF/**"/>
|
|
58 |
- <zipfileset src="${jar.dir}/jsr305.jar" excludes="META-INF/**"/>
|
|
59 |
- <zipfileset src="${jar.dir}/jFormatString.jar" excludes="META-INF/**"/>
|
|
60 |
+ <zipfileset src="${sys.jar.dir}/jsr305.jar" excludes="META-INF/**"/>
|
|
61 |
+ <zipfileset src="${sys.jar.dir}/jFormatString.jar" excludes="META-INF/**"/>
|
|
62 |
<zipfileset src="${sys.jar.dir}/commons-lang.jar" excludes="META-INF/**"/>
|
|
63 |
</jar>
|
|
64 |
</target>
|
|
65 |
@@ -994,14 +995,14 @@
|
|
66 |
<!-- Generate jnlp jars -->
|
|
67 |
<target name="jnlp" depends="jars">
|
|
68 |
<copy todir="${jnlp.dir}" file="${engine.jar}"/>
|
|
69 |
- <copy todir="${jnlp.dir}" file="${jar.dir}/bcel.jar"/>
|
|
70 |
- <copy todir="${jnlp.dir}" file="${jar.dir}/jsr305.jar"/>
|
|
71 |
+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/bcel.jar"/>
|
|
72 |
+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/jsr305.jar"/>
|
|
73 |
<copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm3.jar"/>
|
|
74 |
<copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm3-commons.jar"/>
|
|
75 |
<copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm3-tree.jar"/>
|
|
76 |
<copy todir="${jnlp.dir}" file="${sys.jar.dir}/dom4j.jar"/>
|
|
77 |
<copy todir="${jnlp.dir}" file="${sys.jar.dir}/jaxen.jar"/>
|
|
78 |
- <copy todir="${jnlp.dir}" file="${jar.dir}/jFormatString.jar"/>
|
|
79 |
+ <copy todir="${jnlp.dir}" file="${sys.jar.dir}/jFormatString.jar"/>
|
|
80 |
<copy todir="${jnlp.dir}" file="${sys.jar.dir}/commons-lang.jar"/>
|
|
81 |
<!-- <copy todir="${jnlp.dir}" file="${jar.dir}/AppleJavaExtensions.jar"/> -->
|
|
82 |
<copy todir="${jnlp.dir}" file="${docsrc.dir}/buggy-sm.png"/>
|