Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-22 22:32:06 +01:00
Code Issues Releases Wiki Activity

build.xml: Use metainf instead of copy

Browse source
This commit is contained in:
Florian Schmaus 2014-02-03 18:38:39 +01:00
parent b5cac9c68a
commit 7eb57d3896
1 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
build/build.xml
View file

@ -211,14 +211,12 @@
<!-- jar --> <!-- jar -->
<!-- ======================================================================================= --> <!-- ======================================================================================= -->
<target name="jar" depends="compile" unless="jar.uptodate" description="Produces smack.jar"> <target name="jar" depends="compile" unless="jar.uptodate" description="Produces smack.jar">
<copy todir="${compile.dir}/META-INF" file="${basedir}/build/resources/META-INF/jul.properties" />
<copy todir="${compile.dir}/META-INF" file="${basedir}/build/resources/META-INF/smack-config.xml" />
<copy todir="${compile.dir}/META-INF" file="${basedir}/build/resources/META-INF/core.providers" />
<property name="smack.jar.name" value="${jar.dest.dir}/smack-${version}.jar" /> <property name="smack.jar.name" value="${jar.dest.dir}/smack-${version}.jar" />
<jar destfile="${smack.jar.name}" <jar destfile="${smack.jar.name}"
basedir="${compile.dir}" basedir="${compile.dir}"
includes="org/jivesoftware/smack/**/*.class, **/smack-config.xml, **/core.providers, **/jul.properties"> includes="org/jivesoftware/smack/**/*.class" >
<zipfileset src="${merge.lib.dir}/xpp.jar"/> <zipfileset src="${merge.lib.dir}/xpp.jar" />
<metainf dir="${basedir}/build/resources/META-INF/" includes="jul.properties smack-config.xml core.providers" />
</jar> </jar>
<taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${basedir}/build/build/biz.aQute.bnd.jar"/> <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${basedir}/build/build/biz.aQute.bnd.jar"/>
<bndwrap jars="${smack.jar.name}" output="${smack.jar.name}" /> <bndwrap jars="${smack.jar.name}" output="${smack.jar.name}" />
@ -230,14 +228,14 @@
</jar> </jar>
<property name="smackx.jar.name" value="${jar.dest.dir}/smackx-${version}.jar" /> <property name="smackx.jar.name" value="${jar.dest.dir}/smackx-${version}.jar" />
<copy todir="${compile.dir}/META-INF" file="${basedir}/build/resources/META-INF/extension.providers" />
<jar destfile="${smackx.jar.name}" <jar destfile="${smackx.jar.name}"
basedir="${compile.dir}" basedir="${compile.dir}"
includes="org/jivesoftware/smackx/**/*.class, **/extension.providers" includes="org/jivesoftware/smackx/**/*.class"
excludes="org/jivesoftware/smackx/debugger/*.class"> excludes="org/jivesoftware/smackx/debugger/*.class">
<manifest> <manifest>
<attribute name="Class-Path" value="smack.jar" /> <attribute name="Class-Path" value="smack.jar" />
</manifest> </manifest>
<metainf dir="${basedir}/build/resources/META-INF/" includes="extension.providers" />
<zipfileset src="${merge.lib.dir}/jzlib.jar"/> <zipfileset src="${merge.lib.dir}/jzlib.jar"/>
</jar> </jar>
<bndwrap jars="${smackx.jar.name}" output="${smackx.jar.name}" /> <bndwrap jars="${smackx.jar.name}" output="${smackx.jar.name}" />
@ -290,13 +288,13 @@
</jar> </jar>
<property name="workgroup.jar.name" value="${jar.dest.dir}/smackx-workgroup-${version}.jar" /> <property name="workgroup.jar.name" value="${jar.dest.dir}/smackx-workgroup-${version}.jar" />
<copy todir="${compile.dir}/workgroup/META-INF" file="${basedir}/workgroup/resources/META-INF/workgroup.providers" />
<jar destfile="${workgroup.jar.name}" <jar destfile="${workgroup.jar.name}"
basedir="${compile.dir}/workgroup" basedir="${compile.dir}/workgroup"
includes="org/jivesoftware/smackx/workgroup/**/*.class, **/workgroup.providers"> includes="org/jivesoftware/smackx/workgroup/**/*.class">
<manifest> <manifest>
<attribute name="Class-Path" value="smack.jar, smackx.jar" /> <attribute name="Class-Path" value="smack.jar, smackx.jar" />
</manifest> </manifest>
<metainf dir="${basedir}/workgroup/resources/META-INF/" includes="workgroup.providers" />
</jar> </jar>
<bndwrap jars="${workgroup.jar.name}" output="${workgroup.jar.name}" /> <bndwrap jars="${workgroup.jar.name}" output="${workgroup.jar.name}" />
<jar file="${workgroup.jar.name}" update="true"> <jar file="${workgroup.jar.name}" update="true">
@ -308,13 +306,13 @@
</jar> </jar>
<property name="experimental.jar.name" value="${jar.dest.dir}/smackx-experimental-${experimental.version}.jar" /> <property name="experimental.jar.name" value="${jar.dest.dir}/smackx-experimental-${experimental.version}.jar" />
<copy todir="${compile.dir}/experimental/META-INF" file="${basedir}/experimental/resources/META-INF/experimental.providers" />
<jar destfile="${experimental.jar.name}" <jar destfile="${experimental.jar.name}"
basedir="${compile.dir}/experimental" basedir="${compile.dir}/experimental"
includes="org/jivesoftware/smackx/**/*.class, **/experimental.providers"> includes="org/jivesoftware/smackx/**/*.class" >
<manifest> <manifest>
<attribute name="Class-Path" value="smack.jar, smackx.jar" /> <attribute name="Class-Path" value="smack.jar, smackx.jar" />
</manifest> </manifest>
<metainf dir="${basedir}/experimental/resources/META-INF/" includes="experimental.providers" />
</jar> </jar>
<bndwrap jars="${experimental.jar.name}" output="${experimental.jar.name}" /> <bndwrap jars="${experimental.jar.name}" output="${experimental.jar.name}" />
<jar file="${experimental.jar.name}" update="true"> <jar file="${experimental.jar.name}" update="true">
@ -339,21 +337,19 @@
<!-- jar --> <!-- jar -->
<!-- ======================================================================================= --> <!-- ======================================================================================= -->
<target name="jar-test" depends="compile-test" description="Produces jar of test code"> <target name="jar-test" depends="compile-test" description="Produces jar of test code">
<copy todir="${compile.test.dir}/META-INF" file="${basedir}/build/resources/META-INF/jul.properties" />
<copy todir="${compile.test.dir}/META-INF" file="${basedir}/build/resources/META-INF/smack-config.xml" />
<copy todir="${compile.test.dir}/META-INF" file="${basedir}/build/resources/META-INF/core.providers" />
<jar destfile="${jar.dest.dir}/smack-test.jar" <jar destfile="${jar.dest.dir}/smack-test.jar"
basedir="${compile.test.dir}" basedir="${compile.test.dir}"
includes="org/jivesoftware/smack/**/*.class, **/smack-config.xml, **/core.providers, **/jul.properties" includes="org/jivesoftware/smack/**/*.class" >
/> <metainf dir="${basedir}/build/resources/META-INF/" includes="jul.properties smack-config.xml core.providers" />
</jar>
</target> </target>
<target name="jar-test-smackx" depends="compile-test" description="Produces jar of test code"> <target name="jar-test-smackx" depends="compile-test" description="Produces jar of test code">
<copy todir="${compile.test.dir}/META-INF" file="${basedir}/build/resources/META-INF/extension.providers" />
<jar destfile="${jar.dest.dir}/smack-test-smackx.jar" <jar destfile="${jar.dest.dir}/smack-test-smackx.jar"
basedir="${compile.test.dir}" basedir="${compile.test.dir}"
includes="org/jivesoftware/smackx/**/*.class, org/jivesoftware/util/**/*.class, **/extension.providers" includes="org/jivesoftware/smackx/**/*.class, org/jivesoftware/util/**/*.class" >
/> <metainf dir="${basedir}/build/resources/META-INF/" includes="extension.providers" />
</jar>
</target> </target>