Commit 0b53da47 authored by Mark's avatar Mark
Browse files

build: deprecate use of abcl.implementation.version

Use abcl.version instead, fixing manifests for jar packaging.

The usage of abcl.implementation.version is now deprecated as not
working for a long time.  The intention was that if a
given source tree could be unidentified as being under source control
by the presence of given revision control system artifacts, the
abcl.implementation.version would contain a version derived from the
revision control system.

To hack around the non-prescriptive nature of Ant, chains of
conditional targets had to be created that while might have once
worked for Subversion, were going to get increasingly hairy for
Mercurial and Git.
parent 217ed0f2
......@@ -430,6 +430,19 @@ from ${abcl.home.dir}
srcfile="${build.classes.dir}/org/armedbear/lisp/Version.class"/>
</target>
<!--
The usage of abcl.implementation.version is deprecated as not working.
The intention of this value was that if a given source tree could be
unidentified as being under source control by the presence of given
revision control system artifacts, the abcl.implementation.version
would contain a version derived from the revision control system.
To hack around the non-prescriptive nature of Ant, chains of
conditional targets had to be created that while might have once
worked for Subversion, were going to get increasingly hairy for
Mercurial and Git.
-->
<target name="abcl.stamp.version"
depends="abcl.version.src,abcl.stamp.version.1,abcl.stamp.version.2"
unless="abcl.stamp.version.uptodate.p">
......@@ -510,7 +523,7 @@ from ${abcl.home.dir}
<attribute name="Implementation-Title"
value="ABCL"/>
<attribute name="Implementation-Version"
value="${abcl.implementation.version}"/>
value="${abcl.version}"/>
<attribute name="Implementation-Build"
value="${build}"/>
</section>
......@@ -520,7 +533,8 @@ from ${abcl.home.dir}
</jar>
</target>
<target name="abcl-aio.jar" depends="abcl.compile,abcl.stamp">
<target name="abcl-aio.jar"
depends="abcl.jar.uptodate">
<mkdir dir="${dist.dir}"/>
<jar destfile="${abcl-aio.jar.path}"
compress="true"
......@@ -543,7 +557,7 @@ from ${abcl.home.dir}
<attribute name="Implementation-Title"
value="ABCL"/>
<attribute name="Implementation-Version"
value="${abcl.implementation.version}"/>
value="${abcl.version}"/>
<attribute name="Implementation-Build"
value="${build}"/>
</section>
......@@ -552,7 +566,7 @@ from ${abcl.home.dir}
value="org.abcl-contrib"/>
<!-- FIXME: declare separate abcl-contrib version? -->
<attribute name="Implementation-Version"
value="${abcl.implementation.version}"/>
value="${abcl.version}"/>
</section>
<section name="tools">
<attribute name="Implementation-Title"
......@@ -562,7 +576,7 @@ from ${abcl.home.dir}
<attribute name="Implementation-Title"
value="org.abcl-source"/>
<attribute name="Implementation-Version"
value="${abcl.implementation.version}"/>
value="${abcl.version}"/>
</section>
</manifest>
<metainf dir="${src.dir}/META-INF">
......
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