Release file name fixes.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@6957 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Matt Tucker 2007-02-05 18:38:37 +00:00 committed by matt
parent e1b93839d7
commit 290f1f0558
2 changed files with 11 additions and 8 deletions

View File

@ -33,15 +33,18 @@
<if> <if>
<equals arg1="${version.extra}" arg2=""/> <equals arg1="${version.extra}" arg2=""/>
<then> <then>
<property name="version.name" <property name="version"
value="${version.major}.${version.minor}.${version.revision}"/> value="${version.major}.${version.minor}.${version.revision}"/>
<property name="version.filename"
value="${version.major}_${version.minor}_${version.revision}"/>
</then> </then>
<else> <else>
<property name="version.name" <property name="version"
value="${version.major}.${version.minor}.${version.revision}.${version.extra}"/> value="${version.major}.${version.minor}.${version.revision}.${version.extra}"/>
<property name="version.filename"
value="${version.major}_${version.minor}_${version.revision}_${version.extra}"/>
</else> </else>
</if> </if>
<tstamp> <tstamp>
<format property="builddate" pattern="MM/dd/yyyy"/> <format property="builddate" pattern="MM/dd/yyyy"/>
</tstamp> </tstamp>
@ -194,7 +197,7 @@
sourcepath="${basedir}/source" sourcepath="${basedir}/source"
destdir="${javadoc.dest.dir}" destdir="${javadoc.dest.dir}"
author="true" author="true"
windowtitle="Smack ${version.name} Documentation" windowtitle="Smack ${version} Documentation"
overview="${basedir}/source/overview.html" overview="${basedir}/source/overview.html"
> >
<classpath> <classpath>

View File

@ -38,8 +38,8 @@
<property name="release-dev.name" value="smack-dev-${build.date}" /> <property name="release-dev.name" value="smack-dev-${build.date}" />
</then> </then>
<else> <else>
<property name="release.name" value="smack-${version.name}" /> <property name="release.name" value="smack-${version.filename}" />
<property name="release-dev.name" value="smack-dev-${version.name}" /> <property name="release-dev.name" value="smack-dev-${version.filename}" />
</else> </else>
</if> </if>
<property name="release.dir" value="${basedir}/target/release/${release.name}" /> <property name="release.dir" value="${basedir}/target/release/${release.name}" />
@ -106,14 +106,14 @@
<fileset dir="${basedir}/build/resources/releasedocs" includes="*.html" /> <fileset dir="${basedir}/build/resources/releasedocs" includes="*.html" />
<filterset> <filterset>
<filter token="builddate" value="${builddate}"/> <filter token="builddate" value="${builddate}"/>
<filter token="version" value="${version.name}"/> <filter token="version" value="${version}"/>
</filterset> </filterset>
</copy> </copy>
<copy todir="${release-dev.dir}"> <copy todir="${release-dev.dir}">
<fileset dir="${basedir}/build/resources/releasedocs" includes="*.html" /> <fileset dir="${basedir}/build/resources/releasedocs" includes="*.html" />
<filterset> <filterset>
<filter token="builddate" value="${builddate}"/> <filter token="builddate" value="${builddate}"/>
<filter token="version" value="${version.name}"/> <filter token="version" value="${version}"/>
</filterset> </filterset>
</copy> </copy>
<!-- Package --> <!-- Package -->