|
9 | 9 | <property file="${user.home}/.ant/${project}.build.properties"/>
|
10 | 10 | <property file="${user.home}/build.properties"/>
|
11 | 11 | <property file="${basedir}/${project}.build.properties"/>
|
12 |
| - |
| 12 | + |
13 | 13 | <!-- The version file name -->
|
14 | 14 | <property file="${basedir}/version.properties"/>
|
15 | 15 | <property file="${basedir}/build.number"/>
|
|
63 | 63 | <property name="dir.output.reports.findbugs" value="${dir.output.reports}/findbugs"/>
|
64 | 64 | <property name="dir.output.reports.findbugs.xml" value="${dir.output.reports.findbugs}/xml"/>
|
65 | 65 | <property name="dir.output.reports.jdepend" value="${dir.output.reports}/jdepend"/>
|
66 |
| - |
| 66 | + |
67 | 67 | <property name="dir.output.deploy" value="${dir.output}/deploy"/>
|
68 | 68 | <property name="dir.output.war" value="${dir.output}/war"/>
|
69 | 69 |
|
|
74 | 74 | <property name="database.dir" value="${basedir}/database" />
|
75 | 75 | <property name="schema.baseline.file" value="${schema.dir}/000_blank_database.xml"/>
|
76 | 76 | <property name="schema.changelog.file" value="${schema.dir}/websat.xml"/>
|
77 |
| - |
| 77 | + |
78 | 78 | <!-- properties file used to configure the environment for running unit tests -->
|
79 | 79 | <property name="test.jdbc.properties"
|
80 | 80 | value="${test.src.dir}/jdbc.properties" />
|
|
147 | 147 | <taskdef resource="checkstyletask.properties" classpathref="path.classpath.checkstyle" />
|
148 | 148 | <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask"
|
149 | 149 | classpathref="path.classpath.findbugs" />
|
150 |
| - <taskdef resource="liquibasetasks.properties" |
| 150 | + <taskdef resource="liquibasetasks.properties" |
151 | 151 | classpathref="path.classpath.test"/>
|
152 | 152 |
|
153 | 153 | <!-- jdepend libraries must be on the global classpath, within ~/.ant/lib or specified with -lib
|
|
312 | 312 | <mkdir dir="${dir.output.reports.test.html}"/>
|
313 | 313 |
|
314 | 314 | <junit fork="yes" forkmode="once" printsummary="yes" failureproperty="failure.unittest">
|
| 315 | + |
| 316 | + <jvmarg value="-XX:-UseSplitVerifier" /> |
| 317 | + |
315 | 318 | <sysproperty key="net.sourceforge.cobertura.datafile"
|
316 | 319 | file="${file.coverage.data}" />
|
317 | 320 |
|
|
352 | 355 | <mkdir dir="${dir.output.reports.findbugs.xml}"/>
|
353 | 356 | <findbugs home="${findbugs.home.dir}"
|
354 | 357 | output="xml"
|
355 |
| - outputFile="${dir.output.reports.findbugs.xml}/findbugs.xml" |
| 358 | + outputFile="${dir.output.reports.findbugs.xml}/findbugs.xml" |
356 | 359 | jvmargs="-Xmx512M">
|
357 | 360 | <sourcePath path="${dir.src.main}" />
|
358 | 361 | <auxClasspath>
|
|
369 | 372 | <buildnumber />
|
370 | 373 | <jar file="${dir.dist}/predict4java_${version.majorminor}.${svn.revision}.${build.number}.jar" basedir="${dir.output.classes.main}"/>
|
371 | 374 | </target>
|
372 |
| - |
| 375 | + |
373 | 376 | <target name="canDoSvn">
|
374 | 377 | <condition property="can.do.svn">
|
375 |
| - <available file="svn" type="file"> |
376 |
| - <filepath> |
377 |
| - <pathelement path="${env.PATH}"/> |
378 |
| - </filepath> |
379 |
| - </available> |
| 378 | + <and> |
| 379 | + <available file="svn" type="file"> |
| 380 | + <filepath> |
| 381 | + <pathelement path="${env.PATH}"/> |
| 382 | + </filepath> |
| 383 | + </available> |
| 384 | + <available file=".svn" type="dir" /> |
| 385 | + </and> |
380 | 386 | </condition>
|
381 | 387 | </target>
|
382 | 388 |
|
|
0 commit comments