Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-18 21:02:04 +01:00
Code Issues Releases Wiki Activity

Move resources dir around, adjusted build/release scripts

Browse source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2118 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Bill Lynch 2003-09-28 18:45:09 +00:00 committed by blynch
parent a3ba8487a2
commit b886d27dfa
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
build/build.xml
View file

@ -109,6 +109,7 @@
</fileset> </fileset>
<fileset dir="${basedir}/build"> <fileset dir="${basedir}/build">
<include name="junit.jar"/> <include name="junit.jar"/>
<include name="xmlunit.jar"/>
</fileset> </fileset>
<pathelement location="${compile.dir}" /> <pathelement location="${compile.dir}" />
</classpath> </classpath>
@ -125,7 +126,7 @@
> >
<zipfileset src="${merge.lib.dir}/xpp.jar"/> <zipfileset src="${merge.lib.dir}/xpp.jar"/>
</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" <jar destfile="${jar.dest.dir}/smackx.jar"
basedir="${compile.dir}" basedir="${compile.dir}"
includes="org/jivesoftware/smackx/**/*.class, **/*.providers" includes="org/jivesoftware/smackx/**/*.class, **/*.providers"
@ -176,6 +177,14 @@
<!-- ======================================================================================= --> <!-- ======================================================================================= -->
<target name="test" depends="compile, jar-test" unless="no.test"> <target name="test" depends="compile, jar-test" unless="no.test">
<echo>
**** no.test: ${no.test}
</echo>
<property name="test.messenger" value="false" /> <property name="test.messenger" value="false" />
<if> <if>
@ -202,6 +211,9 @@
<fileset dir="${build.lib.dir}"> <fileset dir="${build.lib.dir}">
<include name="*.jar"/> <include name="*.jar"/>
</fileset> </fileset>
<fileset dir="${basedir}/build">
<include name="xmlunit.jar"/>
</fileset>
<fileset dir="${merge.lib.dir}"> <fileset dir="${merge.lib.dir}">
<include name="*.jar"/> <include name="*.jar"/>
</fileset> </fileset>
@ -236,7 +248,7 @@
<!-- release --> <!-- release -->
<!-- ======================================================================================= --> <!-- ======================================================================================= -->
<target name="release" if="release.exists" depends="release-exists, test"> <target name="release" if="release.exists" depends="release-exists">
<antcall target="jar"> <antcall target="jar">
<param name="no.test" value="true" /> <param name="no.test" value="true" />
</antcall> </antcall>

6
build/release.xml
View file

@ -76,12 +76,12 @@
<fileset dir="${basedir}/test" includes="**/*.java" /> <fileset dir="${basedir}/test" includes="**/*.java" />
</copy> </copy>
<!-- Copy resources --> <!-- Copy resources -->
<copy todir="${release.dir}/resources"> <copy todir="${release.dir}/build/resources">
<fileset dir="${basedir}/resources" includes="META-INF/smack.providers" /> <fileset dir="${basedir}/build/resources" includes="META-INF/smack.providers" />
</copy> </copy>
<!-- Copy readme.html and changelog.html --> <!-- Copy readme.html and changelog.html -->
<copy todir="${release.dir}"> <copy todir="${release.dir}">
<fileset dir="${basedir}/resources/releasedocs" includes="*.html" /> <fileset dir="${basedir}/build/resources/releasedocs" includes="*.html" />
</copy> </copy>
<!-- Package --> <!-- Package -->
<zip destfile="${basedir}/release/${release.name}.zip" <zip destfile="${basedir}/release/${release.name}.zip"