Fix the Ant build; redid source distribution with this change

parent 2ec5199f
...@@ -217,8 +217,9 @@ For help on the automatic tests available, use the Ant target 'help.test'. ...@@ -217,8 +217,9 @@ For help on the automatic tests available, use the Ant target 'help.test'.
<include name="abcl.asd"/> <include name="abcl.asd"/>
<include name="build.xml"/> <include name="build.xml"/>
<include name="abcl.properties.in"/> <!--TODO: massage into abcl.properties at build-time --> <include name="abcl.properties.in"/> <!--TODO: massage into abcl.properties at build-time -->
<include name="abcl.bat"/> <include name="abcl.in"/>
<include name="abcl.bat.in"/> <include name="abcl.bat.in"/>
<include name="etc/ant/*.xml"/>
</patternset> </patternset>
<target name="abcl.stage" <target name="abcl.stage"
...@@ -508,7 +509,7 @@ from ${abcl.home.dir} ...@@ -508,7 +509,7 @@ from ${abcl.home.dir}
</jar> </jar>
</target> </target>
<target name="abcl-aio.jar" depends="abcl.compile,abcl.version"> <target name="abcl-aio.jar" depends="abcl.compile,abcl.stamp">
<mkdir dir="${dist.dir}"/> <mkdir dir="${dist.dir}"/>
<jar destfile="${abcl-aio.jar.path}" <jar destfile="${abcl-aio.jar.path}"
compress="true" compress="true"
...@@ -765,6 +766,8 @@ will compile (if necessary) and load JSS. ...@@ -765,6 +766,8 @@ will compile (if necessary) and load JSS.
<include name="build-abcl.lisp"/> <include name="build-abcl.lisp"/>
<include name="customizations.lisp.in"/> <include name="customizations.lisp.in"/>
<include name="etc/ant/*.xml"/>
</patternset> </patternset>
<!-- TODO merge with artifacts from 'abcl.stage' --> <!-- TODO merge with artifacts from 'abcl.stage' -->
...@@ -776,7 +779,7 @@ will compile (if necessary) and load JSS. ...@@ -776,7 +779,7 @@ will compile (if necessary) and load JSS.
<include name="META-INF/services/javax.script.ScriptEngineFactory"/> <include name="META-INF/services/javax.script.ScriptEngineFactory"/>
</patternset> </patternset>
<target name="abcl.source.prepare" depends="abcl.stamp.version"> <target name="abcl.source.prepare" depends="abcl.stamp">
<property name="abcl.build.src.dir" <property name="abcl.build.src.dir"
value="${build.dir}/abcl-src-${abcl.version}"/> value="${build.dir}/abcl-src-${abcl.version}"/>
<mkdir dir="${abcl.build.src.dir}/src"/> <mkdir dir="${abcl.build.src.dir}/src"/>
......
<project xmlns="antlib:org.apache.tools.ant"> <project xmlns="antlib:org.apache.tools.ant">
<target name="abcl.snapshot" <target name="abcl.snapshot"
depends="abcl.release,abcl.diagnostic,abcl.version,abcl" depends="abcl.release,abcl.diagnostic,abcl"
description="Introspect and dump the current build and description="Introspect and dump the current build and
(presumed ) runtime targets as binary executable JVM objects."> (presumed ) runtime targets as binary executable JVM objects.">
...@@ -21,7 +21,7 @@ abcl.src.version: ${abcl.src.version} ...@@ -21,7 +21,7 @@ abcl.src.version: ${abcl.src.version}
</echo> </echo>
</target> </target>
<target name="abcl.version" depends="abcl.stamp,abcl.version.hg"/> <!-- <target name="abcl.version" depends="abcl.stamp,abcl.version.hg"/> -->
<!-- Introspect for other versioning systems if we haven't determined an upstream SVN version --> <!-- Introspect for other versioning systems if we haven't determined an upstream SVN version -->
<target name="abcl.version.hg" <target name="abcl.version.hg"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment