aboutsummaryrefslogtreecommitdiffstats
path: root/build.xml
diff options
context:
space:
mode:
authorLyubomir Marinov <lyubomir.marinov@jitsi.org>2015-05-28 14:27:59 +0300
committerLyubomir Marinov <lyubomir.marinov@jitsi.org>2015-05-28 14:27:59 +0300
commit22ab9d81ebc6e04759c6f11e72ddc8815bff8aad (patch)
treef4de061cd8d7f6574f34c002e837fb5122c08a3c /build.xml
parent6e17c33e661e6e47af18c5a5efe296e13b03ff11 (diff)
downloadjitsi-22ab9d81ebc6e04759c6f11e72ddc8815bff8aad.zip
jitsi-22ab9d81ebc6e04759c6f11e72ddc8815bff8aad.tar.gz
jitsi-22ab9d81ebc6e04759c6f11e72ddc8815bff8aad.tar.bz2
Introduces the Ant property dynamic.linking (for lack of better words) which controls the bundling of dependent libraries (for OSGi bundles which choose to support it).
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml30
1 files changed, 19 insertions, 11 deletions
diff --git a/build.xml b/build.xml
index 92b62e3..7470e48 100644
--- a/build.xml
+++ b/build.xml
@@ -1309,19 +1309,27 @@
</target>
<!--BUNDLE-LIBJITSI -->
- <target name="bundle-libjitsi">
- <jar
- compress="false"
- destfile="${bundles.dest}/libjitsi.jar"
- manifest="${src}/net/java/sip/communicator/impl/libjitsi/libjitsi.manifest.mf">
-
+ <target name="bundle-libjitsi"
+ depends="bundle-libjitsi-dynamically,bundle-libjitsi-statically" />
+ <target name="bundle-libjitsi-dynamically" if="dynamic.linking">
+ <jar compress="false" destfile="${bundles.dest}/libjitsi.jar"
+ manifest="${src}/net/java/sip/communicator/impl/libjitsi/libjitsi.manifest.mf">
+ <zipfileset dir="${dest}/net/java/sip/communicator/impl/libjitsi"
+ prefix="net/java/sip/communicator/impl/libjitsi" />
+ <zipfileset src="${lib.noinst}/libjitsi.jar" prefix="" />
+ </jar>
+ </target>
+ <target name="bundle-libjitsi-statically" unless="dynamic.linking">
+ <jar compress="false" destfile="${bundles.dest}/libjitsi.jar"
+ manifest="${src}/net/java/sip/communicator/impl/libjitsi/libjitsi.manifest.mf">
<zipfileset dir="${dest}/net/java/sip/communicator/impl/libjitsi"
- prefix="net/java/sip/communicator/impl/libjitsi"/>
+ prefix="net/java/sip/communicator/impl/libjitsi" />
<zipfileset src="${lib.noinst}/bcpkix-jdk15on-151.jar" prefix=""
- excludes="META-INF/BCKEY.*"/>
- <zipfileset src="${lib.noinst}/fmj.jar" prefix=""/>
- <zipfileset src="${lib.noinst}/jitsi-lgpl-dependencies.jar" prefix=""/>
- <zipfileset src="${lib.noinst}/libjitsi.jar" prefix=""/>
+ excludes="META-INF/BCKEY.*" />
+ <zipfileset src="${lib.noinst}/fmj.jar" prefix="" />
+ <zipfileset src="${lib.noinst}/jitsi-lgpl-dependencies.jar"
+ prefix="" />
+ <zipfileset src="${lib.noinst}/libjitsi.jar" prefix="" />
</jar>
</target>