diff options
| author | damencho <damencho@jitsi.org> | 2017-01-31 10:17:07 -0600 |
|---|---|---|
| committer | damencho <damencho@jitsi.org> | 2017-01-31 10:17:07 -0600 |
| commit | bc3f0942854004a228ecb8aa7678496ec0b3e14e (patch) | |
| tree | ef615b72b2c3967eea88b56de4657722948c26a0 | |
| parent | 695cc916086284c23626b11657f8271a96cf46ab (diff) | |
| download | jitsi-bc3f0942854004a228ecb8aa7678496ec0b3e14e.zip jitsi-bc3f0942854004a228ecb8aa7678496ec0b3e14e.tar.gz jitsi-bc3f0942854004a228ecb8aa7678496ec0b3e14e.tar.bz2 | |
Splits jitsi-lgpl-dependencies into two jars.
| -rw-r--r-- | build.xml | 1 | ||||
| -rw-r--r-- | lib/felix.client.run.properties | 3 | ||||
| -rw-r--r-- | lib/felix.unit.test.properties | 3 | ||||
| -rw-r--r-- | lib/installer-exclude/jitsi-gpl-dependencies-1.0-SNAPSHOT.jar | bin | 0 -> 7862639 bytes | |||
| -rw-r--r-- | lib/installer-exclude/jitsi-lgpl-dependencies-1.0-SNAPSHOT.jar | bin | 7903428 -> 46467 bytes |
5 files changed, 5 insertions, 2 deletions
@@ -981,6 +981,7 @@ <copy file="${lib.noinst}/libjitsi-1.0-20170110.164740-224.jar" tofile="${bundles.dest}/libjitsi.jar"/> <copy file="${lib.noinst}/fmj-1.0-SNAPSHOT.jar" tofile="${bundles.dest}/fmj.jar"/> <copy file="${lib.noinst}/jitsi-lgpl-dependencies-1.0-SNAPSHOT.jar" tofile="${bundles.dest}/jitsi-lgpl-dependencies.jar"/> + <copy file="${lib.noinst}/jitsi-gpl-dependencies-1.0-SNAPSHOT.jar" tofile="${bundles.dest}/jitsi-gpl-dependencies.jar"/> <copy file="${lib.noinst}/guava-15.0.jar" tofile="${bundles.dest}/guava.jar"/> <copy file="${lib.noinst}/hsqldb.jar" tofile="${bundles.dest}/hsqldb.jar"/> <copy file="${lib.noinst}/irc-api-1.0.jar" tofile="${bundles.dest}/irc-api-1.0.jar"/> diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties index d5d8889..c9cb60b 100644 --- a/lib/felix.client.run.properties +++ b/lib/felix.client.run.properties @@ -39,7 +39,8 @@ felix.auto.start.5=reference:file:sc-bundles/splash-screen.jar felix.auto.install.10= \ reference:file:sc-bundles/fmj.jar \ reference:file:sc-bundles/slf4j-jdk14.jar \ - reference:file:sc-bundles/jitsi-lgpl-dependencies.jar + reference:file:sc-bundles/jitsi-lgpl-dependencies.jar \ + reference:file:sc-bundles/jitsi-gpl-dependencies.jar felix.auto.start.10= \ reference:file:lib/bundle/org.apache.felix.bundlerepository-1.6.4.jar \ diff --git a/lib/felix.unit.test.properties b/lib/felix.unit.test.properties index e8df121..e97d3b1 100644 --- a/lib/felix.unit.test.properties +++ b/lib/felix.unit.test.properties @@ -51,7 +51,8 @@ org.osgi.framework.system.packages.extra= \ felix.auto.install.10= \ reference:file:sc-bundles/fmj.jar \ reference:file:sc-bundles/slf4j-jdk14.jar \ - reference:file:sc-bundles/jitsi-lgpl-dependencies.jar + reference:file:sc-bundles/jitsi-lgpl-dependencies.jar \ + reference:file:sc-bundles/jitsi-gpl-dependencies.jar felix.auto.start.10= \ reference:file:lib/bundle/junit.jar \ diff --git a/lib/installer-exclude/jitsi-gpl-dependencies-1.0-SNAPSHOT.jar b/lib/installer-exclude/jitsi-gpl-dependencies-1.0-SNAPSHOT.jar Binary files differnew file mode 100644 index 0000000..39091c8 --- /dev/null +++ b/lib/installer-exclude/jitsi-gpl-dependencies-1.0-SNAPSHOT.jar diff --git a/lib/installer-exclude/jitsi-lgpl-dependencies-1.0-SNAPSHOT.jar b/lib/installer-exclude/jitsi-lgpl-dependencies-1.0-SNAPSHOT.jar Binary files differindex 36202ae..07d4ec4 100644 --- a/lib/installer-exclude/jitsi-lgpl-dependencies-1.0-SNAPSHOT.jar +++ b/lib/installer-exclude/jitsi-lgpl-dependencies-1.0-SNAPSHOT.jar |