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

SMACK-343 Added bnd wrap task to build to generate OSGi attributes in the manifest files.

Browse source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_2_0@12925 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
rcollier 2011-12-21 14:27:06 +00:00
parent 2115a6b545
commit c60184f852
2 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
build/build.xml
View file

@ -164,21 +164,32 @@
<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/smack-config.xml" />
<jar destfile="${jar.dest.dir}/smack.jar" <jar destfile="${jar.dest.dir}/smack.jar"
basedir="${compile.dir}" basedir="${compile.dir}"
includes="org/jivesoftware/smack/**/*.class, **/smack-config.xml" includes="org/jivesoftware/smack/**/*.class, **/smack-config.xml">
> <zipfileset src="${merge.lib.dir}/xpp.jar"/>
<zipfileset src="${merge.lib.dir}/xpp.jar"/> </jar>
<taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${basedir}/build/build/biz.aQute.bnd.jar"/>
<bndwrap jars="${jar.dest.dir}/smack.jar" output="${jar.dest.dir}/smack.jar" />
<jar file="${jar.dest.dir}/smack.jar" update="true">
<manifest>
<attribute name="Bundle-SymbolicName" value="org.igniterealtime.smack" />
</manifest>
</jar> </jar>
<copy todir="${compile.dir}/META-INF" file="${basedir}/build/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"
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>
<zipfileset src="${merge.lib.dir}/jzlib.jar"/> <zipfileset src="${merge.lib.dir}/jzlib.jar"/>
</jar> </jar>
<bndwrap jars="${jar.dest.dir}/smackx.jar" output="${jar.dest.dir}/smackx.jar" />
<jar file="${jar.dest.dir}/smackx.jar" update="true">
<manifest>
<attribute name="Bundle-SymbolicName" value="org.igniterealtime.smack-ext" />
</manifest>
</jar>
<copy todir="${compile.dir}/images"> <copy todir="${compile.dir}/images">
<fileset dir="${basedir}/build/resources/images"> <fileset dir="${basedir}/build/resources/images">
<include name="*.png"/> <include name="*.png"/>
@ -186,21 +197,31 @@
</copy> </copy>
<jar destfile="${jar.dest.dir}/smackx-debug.jar" <jar destfile="${jar.dest.dir}/smackx-debug.jar"
basedir="${compile.dir}" basedir="${compile.dir}"
includes="org/jivesoftware/smackx/debugger/*.class, **/*.png" includes="org/jivesoftware/smackx/debugger/*.class, **/*.png">
>
<manifest> <manifest>
<attribute name="Class-Path" value="smack.jar" /> <attribute name="Class-Path" value="smack.jar" />
</manifest> </manifest>
</jar>
<bndwrap jars="${jar.dest.dir}/smackx-debug.jar" output="${jar.dest.dir}/smackx-debug.jar" />
<jar file="${jar.dest.dir}/smackx-debug.jar" update="true">
<manifest>
<attribute name="Bundle-SymbolicName" value="org.igniterealtime.smack-ext-debug" />
</manifest>
</jar> </jar>
<jar destfile="${jar.dest.dir}/smackx-jingle.jar" <jar destfile="${jar.dest.dir}/smackx-jingle.jar"
basedir="${compile.dir}/jingle/extension" basedir="${compile.dir}/jingle/extension"
includes="org/jivesoftware/smackx/**/*.class" 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>
<zipfileset src="${jingle.extension.merge.lib.dir}/jstun.jar"/> <zipfileset src="${jingle.extension.merge.lib.dir}/jstun.jar"/>
</jar> </jar>
<bndwrap jars="${jar.dest.dir}/smackx-jingle.jar" output="${jar.dest.dir}/smackx-jingle.jar" />
<jar file="${jar.dest.dir}/smackx-jingle.jar" update="true">
<manifest>
<attribute name="Bundle-SymbolicName" value="org.igniterealtime.smack-ext-jingle" />
</manifest>
</jar>
<delete file="${compile.dir}/META-INF/smack-config.xml" /> <delete file="${compile.dir}/META-INF/smack-config.xml" />
<delete file="${compile.dir}/META-INF/smack.providers" /> <delete file="${compile.dir}/META-INF/smack.providers" />
<delete> <delete>

BIN
build/build/biz.aQute.bnd.jar Normal file
View file

Binary file not shown.