Separates a package named jitsi-common, contains bundles that are com…

…mon for jitsi-videobridge and jitsi, when building deb-src package.
jitsi · Jul 18, 2014 · 4064c28 · 4064c28
1 parent f21dedc
commit 4064c28
Show file tree

Hide file tree

Showing 5 changed files with 159 additions and 53 deletions.
diff --git a/resources/install/build.xml b/resources/install/build.xml
@@ -2296,8 +2296,11 @@
                  token="/usr/share/java/org.apache.felix.framework.jar:/usr/share/java/org.apache.felix.main.jar"
                  value="$LIBPATH/felix.jar"/>
         <replace file="${debianize.dir}/sh/${package.name}"
-                 token="$SCDIR/sc-bundles/util.jar/launchutils.jar"
-                 value="$SCDIR/sc-bundles/util.jar"/>
+                 token="-common"
+                 value="/sc-bundles"/>
+        <replace file="${debianize.dir}/sh/${package.name}"
+                 token="util.jar/launchutils.jar"
+                 value="util.jar"/>
         <replace file="${debianize.dir}/sh/${package.name}"
                  token="/usr/lib/jni"
                  value="$SCDIR/lib/native"/>
@@ -3237,21 +3240,21 @@
           </patternset>
         </unzip>
         <delete file="${debian.bundles.dest}/util.jar"/>
-        <mkdir dir="${debian.bundles.dest}/util.jar/META-INF"/>
-        <symlink resource="../../../../share/java/dnsjava.jar"
-                 link="${debian.bundles.dest}/util.jar/dnsjava.jar"/>
+        <mkdir dir="${debian.bundles.common.dest}/util.jar/META-INF"/>
+        <symlink resource="../../../share/java/dnsjava.jar"
+                 link="${debian.bundles.common.dest}/util.jar/dnsjava.jar"/>
 
         <!-- Create the util.jar-->
         <jar compress="false"
-             destfile="${debian.bundles.dest}/util.jar/util.jar">
+             destfile="${debian.bundles.common.dest}/util.jar/util.jar">
             <zipfileset dir="${dest}/net/java/sip/communicator/util"
                 prefix="net/java/sip/communicator/util">
                 <exclude name="dns/**"/>
             </zipfileset>
         </jar>
         <!-- Create the launchutils.jar-->
         <jar compress="false"
-             destfile="${debian.bundles.dest}/util.jar/launchutils.jar">
+             destfile="${debian.bundles.common.dest}/util.jar/launchutils.jar">
             <zipfileset
                 dir="${dest}/net/java/sip/communicator/util/launchutils"
                 prefix="net/java/sip/communicator/util/launchutils"/>
@@ -3264,16 +3267,17 @@
             </zipfileset>
         </jar>
         <move file="${debian.bundles.dest}/META-INF/MANIFEST.MF"
-              todir="${debian.bundles.dest}/util.jar/META-INF"/>
+              todir="${debian.bundles.common.dest}/util.jar/META-INF"/>
         <delete dir="${debian.bundles.dest}/META-INF"/>
+        <delete dir="${debian.bundles.dest}/util.jar"/>
         <!-- Removes the last empty line -->
         <replaceregexp
-            file="${debian.bundles.dest}/util.jar/META-INF/MANIFEST.MF"
+            file="${debian.bundles.common.dest}/util.jar/META-INF/MANIFEST.MF"
             match="^\r\n$"
             flags="m"
             replace=""/>
         <concat
-            destfile="${debian.bundles.dest}/util.jar/META-INF/MANIFEST.MF"
+            destfile="${debian.bundles.common.dest}/util.jar/META-INF/MANIFEST.MF"
             append="true"
             eol="crlf"
             fixlastline="true">Bundle-ClassPath: .,util.jar,dnsjava.jar&#013;&#010;&#013;&#010;</concat>
@@ -3282,6 +3286,11 @@
         <echo file="${debian.bundles.dest}/../lib/felix.client.run.properties"
             append="true">felix.auto.start.14= reference:file:/usr/share/java/dnsjava.jar
         </echo>
+        <replace file="${debian.bundles.dest}/../lib/felix.client.run.properties"
+                 token="reference:file:sc-bundles/util.jar">
+            <replacevalue>reference:file:/usr/share/jitsi-common/util.jar</replacevalue>
+        </replace>
+
     </target>
 
     <!-- target to rebuild the util bundle reusing debian package -->
@@ -3416,36 +3425,42 @@
           </patternset>
         </unzip>
         <delete file="${debian.bundles.dest}/smacklib.jar"/>
-        <mkdir dir="${debian.bundles.dest}/smacklib.jar/META-INF"/>
+        <mkdir dir="${debian.bundles.common.dest}/smacklib.jar/META-INF"/>
 
-        <symlink resource="../../../../share/java/xpp3-min.jar"
-             link="${debian.bundles.dest}/smacklib.jar/xpp3.jar"/>
-        <symlink resource="../../../../share/java/jzlib.jar"
-             link="${debian.bundles.dest}/smacklib.jar/jzlib.jar"/>
+        <symlink resource="../../../share/java/xpp3-min.jar"
+             link="${debian.bundles.common.dest}/smacklib.jar/xpp3.jar"/>
+        <symlink resource="../../../share/java/jzlib.jar"
+             link="${debian.bundles.common.dest}/smacklib.jar/jzlib.jar"/>
 
         <!-- Create the smacklib .jar-->
         <jar compress="false"
-            destfile="${debian.bundles.dest}/smacklib.jar/smacklib.jar"
+            destfile="${debian.bundles.common.dest}/smacklib.jar/smacklib.jar"
             manifest="lib/installer-exclude/smack.manifest.mf">
             <zipfileset src="lib/installer-exclude/smackx-debug.jar" prefix=""/>
             <zipfileset src="lib/installer-exclude/smack.jar" prefix=""/>
             <zipfileset src="lib/installer-exclude/smackx.jar" prefix=""/>
             <zipfileset src="lib/installer-exclude/jnsapi.jar" prefix=""/>
         </jar>
         <move file="${debian.bundles.dest}/META-INF/MANIFEST.MF"
-              todir="${debian.bundles.dest}/smacklib.jar/META-INF"/>
+              todir="${debian.bundles.common.dest}/smacklib.jar/META-INF"/>
         <delete dir="${debian.bundles.dest}/META-INF"/>
+        <delete dir="${debian.bundles.dest}/smacklib.jar"/>
         <!-- Removes the last empty line -->
         <replaceregexp
-            file="${debian.bundles.dest}/smacklib.jar/META-INF/MANIFEST.MF"
+            file="${debian.bundles.common.dest}/smacklib.jar/META-INF/MANIFEST.MF"
             match="^\r\n$"
             flags="m"
             replace=""/>
         <concat
-            destfile="${debian.bundles.dest}/smacklib.jar/META-INF/MANIFEST.MF"
+            destfile="${debian.bundles.common.dest}/smacklib.jar/META-INF/MANIFEST.MF"
             append="true"
             eol="crlf"
             fixlastline="true">Bundle-ClassPath: .,smacklib.jar,xpp3.jar,jzlib.jar&#013;&#010;&#013;&#010;</concat>
+        <replace file="${debian.bundles.dest}/../lib/felix.client.run.properties"
+                 token="reference:file:sc-bundles/smacklib.jar">
+            <replacevalue>reference:file:/usr/share/jitsi-common/smacklib.jar</replacevalue>
+        </replace>
+
     </target>
 
     <!-- target to rebuild the jmdnslib bundle reusing debian package -->
@@ -3503,7 +3518,7 @@
             eol="crlf"
             fixlastline="true">Bundle-ClassPath: .,bcprov.jar&#013;&#010;&#013;&#010;</concat>
     </target>
-    
+
     <!-- target to rebuild the account info bundle reusing debian package -->
     <target name="deb-bundle-plugin-accountinfo">
 
@@ -3579,35 +3594,40 @@
             </patternset>
         </unzip>
         <delete file="${debian.bundles.dest}/libjitsi.jar"/>
-        <mkdir dir="${debian.bundles.dest}/libjitsi.jar/META-INF"/>
-        <symlink resource="../../../../share/java/bcpkix.jar"
-                 link="${debian.bundles.dest}/libjitsi.jar/"/>
-        <symlink resource="../../../../share/libjitsi/libjitsi.jar"
-                 link="${debian.bundles.dest}/libjitsi.jar/"/>
-        <symlink resource="../../../../share/libjitsi/lib/fmj.jar"
-                 link="${debian.bundles.dest}/libjitsi.jar/"/>
+        <mkdir dir="${debian.bundles.common.dest}/libjitsi.jar/META-INF"/>
+        <symlink resource="../../../share/java/bcpkix.jar"
+                 link="${debian.bundles.common.dest}/libjitsi.jar/"/>
+        <symlink resource="../../../share/libjitsi/libjitsi.jar"
+                 link="${debian.bundles.common.dest}/libjitsi.jar/"/>
+        <symlink resource="../../../share/libjitsi/lib/fmj.jar"
+                 link="${debian.bundles.common.dest}/libjitsi.jar/"/>
 
         <!-- Create the sys .jar-->
         <jar compress="false"
-             destfile="${debian.bundles.dest}/libjitsi.jar/libjitsi-impl.jar">
+             destfile="${debian.bundles.common.dest}/libjitsi.jar/libjitsi-impl.jar">
             <zipfileset dir="${dest}/net/java/sip/communicator/impl/libjitsi"
                         prefix="net/java/sip/communicator/impl/libjitsi"/>
         </jar>
         <move file="${debian.bundles.dest}/META-INF/MANIFEST.MF"
-              todir="${debian.bundles.dest}/libjitsi.jar/META-INF"/>
+              todir="${debian.bundles.common.dest}/libjitsi.jar/META-INF"/>
         <delete dir="${debian.bundles.dest}/META-INF"/>
+        <delete dir="${debian.bundles.dest}/libjitsi.jar"/>
 
         <!-- Removes the last empty line -->
         <replaceregexp
-            file="${debian.bundles.dest}/libjitsi.jar/META-INF/MANIFEST.MF"
+            file="${debian.bundles.common.dest}/libjitsi.jar/META-INF/MANIFEST.MF"
             match="^\r\n$"
             flags="m"
             replace=""/>
         <concat
-            destfile="${debian.bundles.dest}/libjitsi.jar/META-INF/MANIFEST.MF"
+            destfile="${debian.bundles.common.dest}/libjitsi.jar/META-INF/MANIFEST.MF"
             append="true"
             eol="crlf"
             fixlastline="true">Bundle-ClassPath: .,libjitsi-impl.jar,fmj.jar,libjitsi.jar,bcpkix.jar&#013;&#010;&#013;&#010;</concat>
+        <replace file="${debian.bundles.dest}/../lib/felix.client.run.properties"
+                 token="reference:file:sc-bundles/libjitsi.jar">
+            <replacevalue>reference:file:/usr/share/jitsi-common/libjitsi.jar</replacevalue>
+        </replace>
 
         <!--bundle-netaddr-->
         <unzip src="${debian.bundles.dest}/netaddr.jar"
@@ -3617,35 +3637,40 @@
             </patternset>
         </unzip>
         <delete file="${debian.bundles.dest}/netaddr.jar"/>
-        <mkdir dir="${debian.bundles.dest}/netaddr.jar/META-INF"/>
-        <symlink resource="../../../../share/libjitsi/lib/ice4j.jar"
-                 link="${debian.bundles.dest}/netaddr.jar/"/>
-        <symlink resource="../../../../share/java/weupnp.jar"
-                 link="${debian.bundles.dest}/netaddr.jar/"/>
+        <mkdir dir="${debian.bundles.common.dest}/netaddr.jar/META-INF"/>
+        <symlink resource="../../../share/libjitsi/lib/ice4j.jar"
+                 link="${debian.bundles.common.dest}/netaddr.jar/"/>
+        <symlink resource="../../../share/java/weupnp.jar"
+                 link="${debian.bundles.common.dest}/netaddr.jar/"/>
 
         <!-- Create the sys .jar-->
         <jar compress="false"
-             destfile="${debian.bundles.dest}/netaddr.jar/netaddr.jar">
+             destfile="${debian.bundles.common.dest}/netaddr.jar/netaddr.jar">
             <zipfileset dir="${dest}/net/java/sip/communicator/service/netaddr"
                         prefix="net/java/sip/communicator/service/netaddr"/>
             <zipfileset dir="${dest}/net/java/sip/communicator/impl/netaddr"
                         prefix="net/java/sip/communicator/impl/netaddr"/>
         </jar>
         <move file="${debian.bundles.dest}/META-INF/MANIFEST.MF"
-              todir="${debian.bundles.dest}/netaddr.jar/META-INF"/>
+              todir="${debian.bundles.common.dest}/netaddr.jar/META-INF"/>
         <delete dir="${debian.bundles.dest}/META-INF"/>
+        <delete dir="${debian.bundles.dest}/netaddr.jar"/>
 
         <!-- Removes the last empty line -->
         <replaceregexp
-            file="${debian.bundles.dest}/netaddr.jar/META-INF/MANIFEST.MF"
+            file="${debian.bundles.common.dest}/netaddr.jar/META-INF/MANIFEST.MF"
             match="^\r\n$"
             flags="m"
             replace=""/>
         <concat
-            destfile="${debian.bundles.dest}/netaddr.jar/META-INF/MANIFEST.MF"
+            destfile="${debian.bundles.common.dest}/netaddr.jar/META-INF/MANIFEST.MF"
             append="true"
             eol="crlf"
             fixlastline="true">Bundle-ClassPath: .,netaddr.jar,ice4j.jar,weupnp.jar&#013;&#010;&#013;&#010;</concat>
+        <replace file="${debian.bundles.dest}/../lib/felix.client.run.properties"
+                 token="reference:file:sc-bundles/netaddr.jar">
+            <replacevalue>reference:file:/usr/share/jitsi-common/netaddr.jar</replacevalue>
+        </replace>
 
         <!--zrtp4j /usr/share/libjitsi/lib/zrtp4j-light.jar -->
         <unzip src="${debian.bundles.dest}/zrtp4j.jar"
@@ -3762,5 +3787,76 @@
             <attribute name="Bundle-ClassPath" value=".,httpmime.jar"/>
         </manifest>
     </target>
+    <target name="deb-bundle-common">
+
+        <move file="${debian.bundles.dest}/protocol-jabber.jar"
+              tofile="${debian.bundles.common.dest}/protocol-jabber.jar"/>
+        <replace file="${debian.bundles.dest}/../lib/felix.client.run.properties"
+                 token="reference:file:sc-bundles/protocol-jabber.jar">
+            <replacevalue>reference:file:/usr/share/jitsi-common/protocol-jabber.jar</replacevalue>
+        </replace>
+
+        <move file="${debian.bundles.dest}/protocol-media.jar"
+              tofile="${debian.bundles.common.dest}/protocol-media.jar"/>
+        <replace file="${debian.bundles.dest}/../lib/felix.client.run.properties"
+                 token="reference:file:sc-bundles/protocol-media.jar">
+            <replacevalue>reference:file:/usr/share/jitsi-common/protocol-media.jar</replacevalue>
+        </replace>
+
+        <move file="${debian.bundles.dest}/protocol.jar"
+              tofile="${debian.bundles.common.dest}/protocol.jar"/>
+        <replace file="${debian.bundles.dest}/../lib/felix.client.run.properties"
+                 token="reference:file:sc-bundles/protocol.jar">
+            <replacevalue>reference:file:/usr/share/jitsi-common/protocol.jar</replacevalue>
+        </replace>
 
+        <move file="${debian.bundles.dest}/configuration.jar"
+              tofile="${debian.bundles.common.dest}/configuration.jar"/>
+        <replace file="${debian.bundles.dest}/../lib/felix.client.run.properties"
+                 token="reference:file:sc-bundles/configuration.jar">
+            <replacevalue>reference:file:/usr/share/jitsi-common/configuration.jar</replacevalue>
+        </replace>
+
+        <move file="${debian.bundles.dest}/dns.jar"
+              tofile="${debian.bundles.common.dest}/dns.jar"/>
+        <replace file="${debian.bundles.dest}/../lib/felix.client.run.properties"
+                 token="reference:file:sc-bundles/dns.jar">
+            <replacevalue>reference:file:/usr/share/jitsi-common/dns.jar</replacevalue>
+        </replace>
+
+        <move file="${debian.bundles.dest}/dnsservice.jar"
+              tofile="${debian.bundles.common.dest}/dnsservice.jar"/>
+        <replace file="${debian.bundles.dest}/../lib/felix.client.run.properties"
+                 token="reference:file:sc-bundles/dnsservice.jar">
+            <replacevalue>reference:file:/usr/share/jitsi-common/dnsservice.jar</replacevalue>
+        </replace>
+
+        <move file="${debian.bundles.dest}/fileaccess.jar"
+              tofile="${debian.bundles.common.dest}/fileaccess.jar"/>
+        <replace file="${debian.bundles.dest}/../lib/felix.client.run.properties"
+                 token="reference:file:sc-bundles/fileaccess.jar">
+            <replacevalue>reference:file:/usr/share/jitsi-common/fileaccess.jar</replacevalue>
+        </replace>
+
+        <move file="${debian.bundles.dest}/packetlogging.jar"
+              tofile="${debian.bundles.common.dest}/packetlogging.jar"/>
+        <replace file="${debian.bundles.dest}/../lib/felix.client.run.properties"
+                 token="reference:file:sc-bundles/packetlogging.jar">
+            <replacevalue>reference:file:/usr/share/jitsi-common/packetlogging.jar</replacevalue>
+        </replace>
+
+        <move file="${debian.bundles.dest}/resourcemanager.jar"
+              tofile="${debian.bundles.common.dest}/resourcemanager.jar"/>
+        <replace file="${debian.bundles.dest}/../lib/felix.client.run.properties"
+                 token="reference:file:sc-bundles/resourcemanager.jar">
+            <replacevalue>reference:file:/usr/share/jitsi-common/resourcemanager.jar</replacevalue>
+        </replace>
+
+        <move file="${debian.bundles.dest}/ui-service.jar"
+              tofile="${debian.bundles.common.dest}/ui-service.jar"/>
+        <replace file="${debian.bundles.dest}/../lib/felix.client.run.properties"
+                 token="reference:file:sc-bundles/ui-service.jar">
+            <replacevalue>reference:file:/usr/share/jitsi-common/ui-service.jar</replacevalue>
+        </replace>
+    </target>
 </project>
diff --git a/resources/install/debian/control-src.tmpl b/resources/install/debian/control-src.tmpl
@@ -72,14 +72,14 @@ Package: _PACKAGE_NAME_
 Architecture: all
 Depends: ${misc:Depends},
          _PACKAGE_NAME_-jni (>= ${source:Version}),
+         _PACKAGE_NAME_-common (>= ${source:Version}),
          libjitsi (>= 415-0),
          libjitsi-jni (>= 415-0),
          default-jre | java6-runtime,
          libunixsocket-java,
          libhttpcore-java,
          liblog4j1.2-java,
          libjmdns-java,
-         libdnsjava-java,
          libmac-widgets-java,
          libfelix-main-java,
          libfelix-framework-java,
@@ -90,10 +90,7 @@ Depends: ${misc:Depends},
          libcommons-lang3-java,
          liblaf-widget-java,
          libdbus-java,
-         libxpp3-java,
-         libjzlib-java,
          libbcprov-java,
-         libbcpkix-java,
          libweupnp-java,
          libjna-java,
          libjgoodies-forms-java,
@@ -119,3 +116,15 @@ Description: _APP_NAME_ JNI library
  Native binaries used to render the video and detect network configuration
  changes. Binaries for audio codecs like opus and g722. Global shortcuts,
  notifications and hid devices control.
+
+Package: _PACKAGE_NAME_-common
+Section: libs
+Architecture: all
+Depends: ${misc:Depends}, ${shlibs:Depends},
+         libdnsjava-java,
+         libxpp3-java,
+         libjzlib-java,
+         libbcpkix-java
+Description: _APP_NAME_ JNI library
+ These are the common files for  _APP_NAME_ the Java VoIP
+ and Instant Messaging client.
diff --git a/resources/install/debian/jitsi.sh.tmpl b/resources/install/debian/jitsi.sh.tmpl
@@ -28,8 +28,9 @@ fi
 javabin=`which java`
 
 SCDIR=/usr/share/_PACKAGE_NAME_
+JITSI_COMMON_DIR=/usr/share/_PACKAGE_NAME_-common
 LIBPATH=$SCDIR/lib
-CLASSPATH=/usr/share/java/org.apache.felix.framework.jar:/usr/share/java/org.apache.felix.main.jar:$SCDIR/sc-bundles/sc-launcher.jar:$SCDIR/sc-bundles/util.jar/launchutils.jar:$LIBPATH
+CLASSPATH=/usr/share/java/org.apache.felix.framework.jar:/usr/share/java/org.apache.felix.main.jar:$SCDIR/sc-bundles/sc-launcher.jar:$JITSI_COMMON_DIR/util.jar/launchutils.jar:$LIBPATH
 FELIX_CONFIG=$LIBPATH/felix.client.run.properties
 LOG_CONFIG=$LIBPATH/logging.properties
 COMMAND="$javabin $CLIENTARGS -classpath $CLASSPATH -Djna.library.path=/usr/lib/jni -Dfelix.config.properties=file:$FELIX_CONFIG -Djava.util.logging.config.file=$LOG_CONFIG $SPLASH_ARG net.java.sip.communicator.launcher.SIPCommunicator"

diff --git a/resources/install/debian/package.install.tmpl b/resources/install/debian/package.install.tmpl
@@ -1,9 +1,9 @@
-debian/_PACKAGE_NAME_-32.xpm usr/share/pixmaps/
-debian/_PACKAGE_NAME_-16.xpm usr/share/pixmaps/
-debian/_PACKAGE_NAME_.svg usr/share/pixmaps/
-debian/_PACKAGE_NAME_.desktop usr/share/applications/
-resources/install/logging.properties usr/share/_PACKAGE_NAME_/lib/
-lib/felix.client.run.properties usr/share/_PACKAGE_NAME_/lib/
-lib/jitsi-defaults.properties  usr/share/_PACKAGE_NAME_/lib/
+debian/_PACKAGE_NAME_-32.xpm usr/share/pixmaps
+debian/_PACKAGE_NAME_-16.xpm usr/share/pixmaps
+debian/_PACKAGE_NAME_.svg usr/share/pixmaps
+debian/_PACKAGE_NAME_.desktop usr/share/applications
+resources/install/logging.properties usr/share/_PACKAGE_NAME_/lib
+lib/felix.client.run.properties usr/share/_PACKAGE_NAME_/lib
+lib/jitsi-defaults.properties  usr/share/_PACKAGE_NAME_/lib
 sc-bundles/*.jar usr/share/_PACKAGE_NAME_/sc-bundles
 debian/sh/_PACKAGE_NAME_ usr/bin