mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-11-26 05:52:06 +01:00
Fixes:
* smack.jar included in release * lib/ and lib/merge/ supported git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@1823 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
parent
20e861aaef
commit
c8e8099401
2 changed files with 14 additions and 3 deletions
|
@ -18,6 +18,7 @@
|
||||||
<property name="jar.dest.dir" value="${basedir}" />
|
<property name="jar.dest.dir" value="${basedir}" />
|
||||||
<property name="javadoc.dest.dir" value="${basedir}/javadoc" />
|
<property name="javadoc.dest.dir" value="${basedir}/javadoc" />
|
||||||
<property name="build.lib.dir" value="${basedir}/build/lib" />
|
<property name="build.lib.dir" value="${basedir}/build/lib" />
|
||||||
|
<property name="merge.lib.dir" value="${basedir}/build/merge" />
|
||||||
|
|
||||||
<property name="version.major" value="1" />
|
<property name="version.major" value="1" />
|
||||||
<property name="version.minor" value="0" />
|
<property name="version.minor" value="0" />
|
||||||
|
@ -45,7 +46,10 @@
|
||||||
<src path="${basedir}/source" />
|
<src path="${basedir}/source" />
|
||||||
<classpath>
|
<classpath>
|
||||||
<fileset dir="${build.lib.dir}">
|
<fileset dir="${build.lib.dir}">
|
||||||
<include name="**/*.jar"/>
|
<include name="*.jar"/>
|
||||||
|
</fileset>
|
||||||
|
<fileset dir="${merge.lib.dir}">
|
||||||
|
<include name="*.jar"/>
|
||||||
</fileset>
|
</fileset>
|
||||||
</classpath>
|
</classpath>
|
||||||
</javac>
|
</javac>
|
||||||
|
@ -59,7 +63,7 @@
|
||||||
basedir="${compile.dir}"
|
basedir="${compile.dir}"
|
||||||
includes="**/*.class"
|
includes="**/*.class"
|
||||||
>
|
>
|
||||||
<zipfileset src="${build.lib.dir}/xpp.jar"/>
|
<zipfileset src="${merge.lib.dir}/xpp.jar"/>
|
||||||
</jar>
|
</jar>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
@ -77,7 +81,10 @@
|
||||||
>
|
>
|
||||||
<classpath>
|
<classpath>
|
||||||
<fileset dir="${build.lib.dir}">
|
<fileset dir="${build.lib.dir}">
|
||||||
<include name="**/*.jar"/>
|
<include name="*.jar"/>
|
||||||
|
</fileset>
|
||||||
|
<fileset dir="${merge.lib.dir}">
|
||||||
|
<include name="*.jar"/>
|
||||||
</fileset>
|
</fileset>
|
||||||
</classpath>
|
</classpath>
|
||||||
<doctitle><![CDATA[<font face="arial,helvetica">Smack ${version.name}</font>]]></doctitle>
|
<doctitle><![CDATA[<font face="arial,helvetica">Smack ${version.name}</font>]]></doctitle>
|
||||||
|
|
|
@ -25,6 +25,10 @@
|
||||||
<property name="release.dir" value="${basedir}/release/${release.name}" />
|
<property name="release.dir" value="${basedir}/release/${release.name}" />
|
||||||
<!-- create release dirs -->
|
<!-- create release dirs -->
|
||||||
<mkdir dir="${release.dir}" />
|
<mkdir dir="${release.dir}" />
|
||||||
|
<!-- Copy smack.jar -->
|
||||||
|
<copy todir="${release.dir}">
|
||||||
|
<fileset dir="${jar.dest.dir}" includes="smack.jar" />
|
||||||
|
</copy>
|
||||||
<!-- Copy build dir -->
|
<!-- Copy build dir -->
|
||||||
<copy todir="${release.dir}/build">
|
<copy todir="${release.dir}/build">
|
||||||
<fileset dir="${basedir}/build">
|
<fileset dir="${basedir}/build">
|
||||||
|
|
Loading…
Reference in a new issue