Skip to content

Commit 96c780b

Browse files
committed
Merge pull request #2 from RX14/master
Fix the build and update gitignore
2 parents c7e17c4 + 1bd33f5 commit 96c780b

File tree

3 files changed

+21
-12
lines changed

3 files changed

+21
-12
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
/bin
22
/output
3-
3+
/doc
4+
/dist
5+
/build.number

build.xml

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<property file="${user.home}/.ant/${project}.build.properties"/>
1010
<property file="${user.home}/build.properties"/>
1111
<property file="${basedir}/${project}.build.properties"/>
12-
12+
1313
<!-- The version file name -->
1414
<property file="${basedir}/version.properties"/>
1515
<property file="${basedir}/build.number"/>
@@ -63,7 +63,7 @@
6363
<property name="dir.output.reports.findbugs" value="${dir.output.reports}/findbugs"/>
6464
<property name="dir.output.reports.findbugs.xml" value="${dir.output.reports.findbugs}/xml"/>
6565
<property name="dir.output.reports.jdepend" value="${dir.output.reports}/jdepend"/>
66-
66+
6767
<property name="dir.output.deploy" value="${dir.output}/deploy"/>
6868
<property name="dir.output.war" value="${dir.output}/war"/>
6969

@@ -74,7 +74,7 @@
7474
<property name="database.dir" value="${basedir}/database" />
7575
<property name="schema.baseline.file" value="${schema.dir}/000_blank_database.xml"/>
7676
<property name="schema.changelog.file" value="${schema.dir}/websat.xml"/>
77-
77+
7878
<!-- properties file used to configure the environment for running unit tests -->
7979
<property name="test.jdbc.properties"
8080
value="${test.src.dir}/jdbc.properties" />
@@ -147,7 +147,7 @@
147147
<taskdef resource="checkstyletask.properties" classpathref="path.classpath.checkstyle" />
148148
<taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask"
149149
classpathref="path.classpath.findbugs" />
150-
<taskdef resource="liquibasetasks.properties"
150+
<taskdef resource="liquibasetasks.properties"
151151
classpathref="path.classpath.test"/>
152152

153153
<!-- jdepend libraries must be on the global classpath, within ~/.ant/lib or specified with -lib
@@ -312,6 +312,9 @@
312312
<mkdir dir="${dir.output.reports.test.html}"/>
313313

314314
<junit fork="yes" forkmode="once" printsummary="yes" failureproperty="failure.unittest">
315+
316+
<jvmarg value="-XX:-UseSplitVerifier" />
317+
315318
<sysproperty key="net.sourceforge.cobertura.datafile"
316319
file="${file.coverage.data}" />
317320

@@ -352,7 +355,7 @@
352355
<mkdir dir="${dir.output.reports.findbugs.xml}"/>
353356
<findbugs home="${findbugs.home.dir}"
354357
output="xml"
355-
outputFile="${dir.output.reports.findbugs.xml}/findbugs.xml"
358+
outputFile="${dir.output.reports.findbugs.xml}/findbugs.xml"
356359
jvmargs="-Xmx512M">
357360
<sourcePath path="${dir.src.main}" />
358361
<auxClasspath>
@@ -369,14 +372,17 @@
369372
<buildnumber />
370373
<jar file="${dir.dist}/predict4java_${version.majorminor}.${svn.revision}.${build.number}.jar" basedir="${dir.output.classes.main}"/>
371374
</target>
372-
375+
373376
<target name="canDoSvn">
374377
<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>
380386
</condition>
381387
</target>
382388

resources/main/.gitkeep

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

0 commit comments

Comments
 (0)