|
42 | 42 | <taskdef name="printBugs" classname="edu.umd.cs.findbugs.anttask.ConvertXmlToTextTask" classpath="${fb-ant.jar}"/>
|
43 | 43 | </target>
|
44 | 44 |
|
45 |
| - <target name="build" depends="classes,runfindbugs,runEffort" /> |
| 45 | + <target name="build" depends="clean,runfindbugs,runEffort" /> |
46 | 46 |
|
47 | 47 | <target name="init">
|
48 | 48 | <echo>findbugs.home is ${findbugs.home}</echo>
|
|
91 | 91 | <target name="classes0" if="javac.executable">
|
92 | 92 | <echo message="Compiling with ${javac.executable}"/>
|
93 | 93 | <mkdir dir="build/classes"/>
|
94 |
| - <javac destdir="build/classes" source="1.7" target="1.7" debug="on" encoding="UTF-8" includeantruntime="false" |
95 |
| - > |
96 |
| - <src path="src/java"/> |
97 |
| - <include name="jsr305/validation/*.java"/> |
98 |
| - <classpath> |
99 |
| - <path refid="build.classpath"/> |
100 |
| - </classpath> |
101 |
| - <compilerarg value="-Xlint:none"/> |
102 |
| - </javac> |
103 |
| - <javac destdir="build/classes" source="1.8" target="1.8" debug="on" encoding="UTF-8" includeantruntime="false" |
| 94 | + <echo>Compiling with 1.9, 'javac.executable' should be specified in local.properties</echo> |
| 95 | + <javac destdir="build/classes" source="1.9" target="1.9" debug="on" encoding="UTF-8" includeantruntime="false" |
| 96 | + failonerror="false" |
104 | 97 | fork="yes"
|
105 | 98 | executable="${javac.executable}"
|
106 | 99 | >
|
107 |
| - <src path="src/java"/> |
108 | 100 | <src path="src/fakeAnnotations"/>
|
109 | 101 | <src path="src/fakeLibraries"/>
|
| 102 | + <src path="src/java"/> |
110 | 103 | <exclude name="jsr305/validation/*.java"/>
|
111 | 104 | <classpath>
|
112 | 105 | <path refid="build.classpath"/>
|
113 | 106 | </classpath>
|
114 | 107 | <compilerarg value="-Xlint:none"/>
|
115 | 108 | </javac>
|
| 109 | + <echo message="Compiling with ant default javac and 1.8 target"/> |
| 110 | + <javac destdir="build/classes" source="1.8" target="1.8" debug="on" encoding="UTF-8" includeantruntime="false" |
| 111 | + > |
| 112 | + <src path="src/fakeAnnotations"/> |
| 113 | + <src path="src/fakeLibraries"/> |
| 114 | + <src path="src/java"/> |
| 115 | + <include name="jsr305/validation/*.java"/> |
| 116 | + <classpath> |
| 117 | + <path refid="build.classpath"/> |
| 118 | + </classpath> |
| 119 | + <compilerarg value="-Xlint:none"/> |
| 120 | + </javac> |
116 | 121 | <mkdir dir="build/classes-jdk7"/>
|
| 122 | + <echo message="Compiling with ant default javac and 1.7 target"/> |
117 | 123 | <javac destdir="build/classes-jdk7" source="1.7" target="1.7" debug="on" encoding="UTF-8" includeantruntime="false"
|
118 | 124 | >
|
119 | 125 | <src path="src/java"/>
|
|
156 | 162 |
|
157 | 163 | <target name="clean">
|
158 | 164 | <delete dir="build/classes"/>
|
| 165 | + <delete dir="build/classes-jdk7"/> |
159 | 166 | <mkdir dir="build/classes" />
|
| 167 | + <mkdir dir="build/classes-jdk7" /> |
160 | 168 | <delete file="build/all.jar"/>
|
161 | 169 | <delete failonerror="false">
|
162 | 170 | <fileset dir="build" includes="*.xml"/>
|
|
185 | 193 | </findbugs>
|
186 | 194 | </target>
|
187 | 195 |
|
188 |
| - <target name="runEffort" depends="classes,defineTasks"> |
| 196 | + <target name="runEffort" depends="defineTasks"> |
189 | 197 | <echo>Test expected warnings with *min* effort</echo>
|
190 | 198 | <findbugs home="${findbugs.home}" jvmargs="-ea ${maxHeap}"
|
191 | 199 | jvm="${java.executable}"
|
|
275 | 283 | </target>
|
276 | 284 |
|
277 | 285 |
|
278 |
| - <target name="runNormal" depends="classes,defineTasks"> |
| 286 | + <target name="runNormal" depends="defineTasks"> |
279 | 287 | <echo>Test expected warnings with ${ant.java.version} javac bytecode</echo>
|
280 | 288 | <findbugs home="${findbugs.home}" jvmargs="-ea ${maxHeap} -Dfindbugs.sf.comment=false"
|
281 | 289 | output="xml:withMessages" timestampNow="true" reportLevel="low"
|
|
0 commit comments