mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-12-24 03:27:59 +01:00
Move resources dir around, adjusted build/release scripts
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2118 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
parent
a3ba8487a2
commit
b886d27dfa
2 changed files with 17 additions and 5 deletions
|
@ -109,6 +109,7 @@
|
|||
</fileset>
|
||||
<fileset dir="${basedir}/build">
|
||||
<include name="junit.jar"/>
|
||||
<include name="xmlunit.jar"/>
|
||||
</fileset>
|
||||
<pathelement location="${compile.dir}" />
|
||||
</classpath>
|
||||
|
@ -125,7 +126,7 @@
|
|||
>
|
||||
<zipfileset src="${merge.lib.dir}/xpp.jar"/>
|
||||
</jar>
|
||||
<copy todir="${compile.dir}/META-INF" file="${basedir}/resources/META-INF/smack.providers" />
|
||||
<copy todir="${compile.dir}/META-INF" file="${basedir}/build/resources/META-INF/smack.providers" />
|
||||
<jar destfile="${jar.dest.dir}/smackx.jar"
|
||||
basedir="${compile.dir}"
|
||||
includes="org/jivesoftware/smackx/**/*.class, **/*.providers"
|
||||
|
@ -176,6 +177,14 @@
|
|||
<!-- ======================================================================================= -->
|
||||
<target name="test" depends="compile, jar-test" unless="no.test">
|
||||
|
||||
<echo>
|
||||
|
||||
|
||||
**** no.test: ${no.test}
|
||||
|
||||
|
||||
</echo>
|
||||
|
||||
<property name="test.messenger" value="false" />
|
||||
|
||||
<if>
|
||||
|
@ -202,6 +211,9 @@
|
|||
<fileset dir="${build.lib.dir}">
|
||||
<include name="*.jar"/>
|
||||
</fileset>
|
||||
<fileset dir="${basedir}/build">
|
||||
<include name="xmlunit.jar"/>
|
||||
</fileset>
|
||||
<fileset dir="${merge.lib.dir}">
|
||||
<include name="*.jar"/>
|
||||
</fileset>
|
||||
|
@ -236,7 +248,7 @@
|
|||
|
||||
<!-- release -->
|
||||
<!-- ======================================================================================= -->
|
||||
<target name="release" if="release.exists" depends="release-exists, test">
|
||||
<target name="release" if="release.exists" depends="release-exists">
|
||||
<antcall target="jar">
|
||||
<param name="no.test" value="true" />
|
||||
</antcall>
|
||||
|
|
|
@ -76,12 +76,12 @@
|
|||
<fileset dir="${basedir}/test" includes="**/*.java" />
|
||||
</copy>
|
||||
<!-- Copy resources -->
|
||||
<copy todir="${release.dir}/resources">
|
||||
<fileset dir="${basedir}/resources" includes="META-INF/smack.providers" />
|
||||
<copy todir="${release.dir}/build/resources">
|
||||
<fileset dir="${basedir}/build/resources" includes="META-INF/smack.providers" />
|
||||
</copy>
|
||||
<!-- Copy readme.html and changelog.html -->
|
||||
<copy todir="${release.dir}">
|
||||
<fileset dir="${basedir}/resources/releasedocs" includes="*.html" />
|
||||
<fileset dir="${basedir}/build/resources/releasedocs" includes="*.html" />
|
||||
</copy>
|
||||
<!-- Package -->
|
||||
<zip destfile="${basedir}/release/${release.name}.zip"
|
||||
|
|
Loading…
Reference in a new issue