2020-07-08 00:09:57 +01:00
|
|
|
--- a/build.xml (revision 4555)
|
|
|
|
|
+++ a/build.xml (working copy)
|
|
|
|
|
@@ -222,13 +222,13 @@
|
|
|
|
|
<property name="svn.version.build" value="none"/>
|
|
|
|
|
|
|
|
|
|
<propertyfile file="${build.classes}/mkgmap-version.properties">
|
|
|
|
|
- <entry key="svn.version" value="${svn.version.build}" />
|
|
|
|
|
- <entry key="build.timestamp" value="${build.timestamp}" />
|
|
|
|
|
+ <entry key="svn.version" value="@version@" />
|
|
|
|
|
+ <entry key="build.timestamp" value="unknown" />
|
|
|
|
|
</propertyfile>
|
2019-08-27 12:30:06 +01:00
|
|
|
</target>
|
|
|
|
|
|
|
|
|
|
<!-- Compile the product itself (no tests). -->
|
|
|
|
|
- <target name="compile" depends="prepare, resolve-compile"
|
|
|
|
|
+ <target name="compile" depends="prepare"
|
|
|
|
|
description="main compilation">
|
|
|
|
|
|
|
|
|
|
<javac srcdir="${src}" destdir="${build.classes}" encoding="utf-8" debug="true" includeantruntime="false">
|
2020-07-08 00:09:57 +01:00
|
|
|
@@ -263,7 +263,7 @@
|
|
|
|
|
</target>
|
|
|
|
|
|
|
|
|
|
<!-- Compile the test classes -->
|
|
|
|
|
- <target name="build-test" depends="build, resolve-test">
|
|
|
|
|
+ <target name="build-test" depends="build">
|
|
|
|
|
<mkdir dir="${build.test}" />
|
|
|
|
|
<javac srcdir="${test}" destdir="${build.test}" encoding="utf-8" debug="true" includeantruntime="false">
|
|
|
|
|
<include name="**/*.java" />
|
|
|
|
|
@@ -271,7 +271,7 @@
|
|
|
|
|
</javac>
|
|
|
|
|
</target>
|
|
|
|
|
|
|
|
|
|
- <target name="test" depends="build-test, obtain-test-input-files" description="Run the junit tests">
|
|
|
|
|
+ <target name="test" depends="build-test" description="Run the junit tests">
|
|
|
|
|
<mkdir dir="tmp/report"/>
|
|
|
|
|
<junit printsummary="yes" failureproperty="junit.failure" forkmode="once">
|
|
|
|
|
|
|
|
|
|
@@ -351,7 +351,7 @@
|
|
|
|
|
ignoreerrors="true"/>
|
|
|
|
|
</target>
|
|
|
|
|
|
|
|
|
|
- <target name="dist" depends="build, check-version, version-file"
|
|
|
|
|
+ <target name="dist" depends="build, version-file"
|
|
|
|
|
description="Make the distribution area">
|
|
|
|
|
|
|
|
|
|
<mkdir dir="${dist}"/>
|
