Adds building irc-api and its dependencies to debian src package. Adds dependency to libphonenumber6-java package that is now available in the repository.

11 years ago · 25ff1e12ca
parent 9bc82801d0
commit 25ff1e12ca
4 changed files with 130 additions and 26 deletions
--- a/resources/install/README.Debian
+++ b/resources/install/README.Debian
@ -2,6 +2,7 @@ To create debian source package you need some other projects sources that
 jitsi depends on. In the same folder where jitsi is checked out do:
 git clone https://github.com/jitsi/otr4j.git
 git clone https://github.com/jitsi/libsrc.git
+svn checkout http://irc-api.googlecode.com/svn/trunk/ irc-api
 And then in jitsi do: ant deb-src -Dlabel=4444
 This will create orig.tar.gz debian sources that can be used to debuild
 debian package.
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@ -2458,9 +2458,6 @@
            and libsrc
        -->

-        <unzip src="${sc.basedir}/../libsrc/libphonenumber-6.3-SNAPSHOT-sources.jar"
-               dest="${debian.src.dir}/lib/src/libphonenumber/src"/>
-
        <!-- jdic_misc -->
        <unzip src="${sc.basedir}/../libsrc/jdic_misc.zip"
               dest="${debian.src.dir}/lib/src/">
@ -2524,6 +2521,14 @@
            </fileset>
        </copy>

+        <!-- irc-api -->
+        <copy todir="${debian.src.dir}/lib/src/irc-api">
+            <fileset dir="${sc.basedir}/../irc-api">
+                <include name="src/main/**"/>
+                <exclude name="**/.svn/**"/>
+            </fileset>
+        </copy>
+
        <!-- myspell-->
        <unzip src="${sc.basedir}/../libsrc/jmyspell-core-src.zip"
               dest="${debian.src.dir}/lib/src/jmyspell"/>
@ -2658,26 +2663,7 @@
        <property name="debian.src.dir"
            value="${debian.tmp.dir}/${package.name}-${sip-communicator.version}" />

-        <!--TODO
        <symlink resource="/usr/share/java/libphonenumber.jar"
-                 overwrite="true"
-                 link="${debian.src.dir}/lib/installer-exclude/"/>
-        -->
-        <mkdir dir="${debian.src.dir}/lib/src/libphonenumber/classes"/>
-        <javac debug="true"
-               deprecation="true" destdir="${debian.src.dir}/lib/src/libphonenumber/classes"
-               nowarn="false"
-               source="1.6" target="1.6" fork="true">
-            <src path="${debian.src.dir}/lib/src/libphonenumber/src"/>
-            <include name="**/*.java" />
-        </javac>
-        <jar compress="true" destfile="${debian.src.dir}/lib/src/libphonenumber/libphonenumber.jar">
-            <zipfileset dir="${debian.src.dir}/lib/src/libphonenumber/classes"/>
-            <zipfileset dir="${debian.src.dir}/lib/src/libphonenumber/src">
-                <include name="com/google/i18n/phonenumbers/data/*"/>
-            </zipfileset>
-        </jar>
-        <symlink resource="${debian.src.dir}/lib/src/libphonenumber/libphonenumber.jar"
                 overwrite="true"
                 link="${debian.src.dir}/lib/installer-exclude/libphonenumber-5.9.jar"/>

@ -2898,7 +2884,8 @@
            <fileset dir="${debian.src.dir}/lib/src/otr4j/lib" includes="**/*.jar" />
        </path>
        <mkdir dir="${debian.src.dir}/lib/src/otr4j/bin/classes" />
-        <javac target="1.6" srcdir="${debian.src.dir}/lib/src/otr4j/src"
+        <javac target="1.6" source="1.6"
+               srcdir="${debian.src.dir}/lib/src/otr4j/src"
               destdir="${debian.src.dir}/lib/src/otr4j/bin/classes"
               classpathref="otr4j-classpath"
               debug="On" />
@ -2908,6 +2895,68 @@
                 overwrite="true"
                 link="${debian.src.dir}/lib/installer-exclude"/>

+        <!-- irc-api -->
+        <path id="irc-api-classpath">
+            <fileset dir="/usr/share/java" includes="slf4j-api.jar" />
+        </path>
+        <mkdir dir="${debian.src.dir}/lib/src/irc-api/classes" />
+        <javac target="1.6" source="1.6"
+               srcdir="${debian.src.dir}/lib/src/irc-api/src"
+               destdir="${debian.src.dir}/lib/src/irc-api/classes"
+               classpathref="irc-api-classpath"
+               debug="On" />
+        <jar destfile="${debian.src.dir}/lib/src/irc-api/irc-api-1.0.jar"
+             basedir="${debian.src.dir}/lib/src/irc-api/classes">
+            <manifest>
+                <attribute name="Bundle-Name" value="IRC API"/>
+                <attribute name="Bundle-Description"
+                           value="A Java implementation of the irc api"/>
+                <attribute name="Bundle-SymbolicName"
+                           value="com.ircclouds.irc.api"/>
+                <attribute name="Bundle-Version" value="1.0.0.0015-SNAPSHOT"/>
+
+                <attribute name="Import-Package"
+                           value="javax.net.ssl,org.slf4j"/>
+                <attribute name="Export-Package"
+                           value="com.ircclouds.irc.api;uses:=&quot;com.ircclouds.irc.api.commands,
+com.ircclouds.irc.api.comms,com.ircclouds.irc.api.ctcp,com.ircclouds.irc.api.domain,
+com.ircclouds.irc.api.domain.messages.interfaces,com.ircclouds.irc.api.filters,
+com.ircclouds.irc.api.listeners,com.ircclouds.irc.api.state&quot;;version=&quot;1.0.0&quot;,
+com.ircclouds.irc.api.commands;uses:=&quot;com.ircclouds.irc.api,
+com.ircclouds.irc.api.domain.messages&quot;version=&quot;1.0.0&quot;,
+com.ircclouds.irc.api.comms;uses:=&quot;javax.net.ssl&quot;;version=&quot;1.0.0&quot;,
+com.ircclouds.irc.api.ctcp;uses:=&quot;com.ircclouds.irc.api&quot;;version=&quot;1.0.0&quot;,
+com.ircclouds.irc.api.domain;uses:=&quot;com.ircclouds.irc.api.domain.messages.interfaces,
+javax.net.ssl&quot;;version=&quot;1.0.0&quot;,
+com.ircclouds.irc.api.domain.messages;uses:=&quot;com.ircclouds.irc.api.domain,
+com.ircclouds.irc.api.domain.messages.interfaces&quot;;version=&quot;1.0.0&quot;,
+com.ircclouds.irc.api.domain.messages.interfaces;uses:=&quot;com.ircclouds.irc.api.domain&quot;;version=&quot;1.0.0&quot;,
+com.ircclouds.irc.api.filters;uses:=&quot;com.ircclouds.irc.api.domain.messages.interfaces,
+com.ircclouds.irc.api.listeners&quot;;version=&quot;1.0.0&quot;,
+com.ircclouds.irc.api.listeners;uses:=&quot;com.ircclouds.irc.api,
+com.ircclouds.irc.api.domain,com.ircclouds.irc.api.domain.messages,
+com.ircclouds.irc.api.domain.messages.interfaces,
+com.ircclouds.irc.api.state&quot;;version=&quot;1.0.0&quot;,
+com.ircclouds.irc.api.om;uses:=&quot;com.ircclouds.irc.api.domain,
+com.ircclouds.irc.api.domain.messages,
+com.ircclouds.irc.api.domain.messages.interfaces&quot;;version=&quot;1.0.0&quot;,
+com.ircclouds.irc.api.state;uses:=&quot;com.ircclouds.irc.api.domain,
+com.ircclouds.irc.api.domain.messages,
+com.ircclouds.irc.api.listeners&quot;;version=&quot;1.0.0&quot;,
+com.ircclouds.irc.api.utils;uses:=&quot;com.ircclouds.irc.api.domain,
+com.ircclouds.irc.api.domain.messages.interfaces&quot;;version=&quot;1.0.0&quot;"/>
+            </manifest>
+        </jar>
+        <symlink resource="../src/irc-api/irc-api-1.0.jar"
+                 overwrite="true"
+                 link="${debian.src.dir}/lib/installer-exclude"/>
+        <symlink resource="/usr/share/java/slf4j-api.jar"
+                 overwrite="true"
+                 link="${debian.src.dir}/lib/installer-exclude/slf4j-api-1.7.5.jar"/>
+        <symlink resource="/usr/share/java/slf4j-jdk14.jar"
+                 overwrite="true"
+                 link="${debian.src.dir}/lib/installer-exclude/slf4j-jdk14-1.7.5.jar"/>
+
        <!-- jmyspell -->
        <mkdir dir="${debian.src.dir}/lib/src/jmyspell/classes"/>
        <javac debug="true"
@ -3857,4 +3906,54 @@
            <replacevalue>reference:file:/usr/share/jitsi-common/ui-service.jar</replacevalue>
        </replace>
    </target>
+    <target name="deb-bundle-slf4j">
+        <delete file="${debian.bundles.dest}/slf4j-api-1.7.5.jar" failonerror="false"/>
+        <mkdir dir="${debian.bundles.dest}/slf4j-api-1.7.5.jar/META-INF"/>
+        <symlink resource="../../../../share/java/slf4j-api.jar"
+                 link="${debian.bundles.dest}/slf4j-api-1.7.5.jar/slf4j-api.jar"/>
+        <manifest
+            file="${debian.bundles.dest}/slf4j-api-1.7.5.jar/META-INF/MANIFEST.MF">
+            <attribute name="Bundle-Name"
+                       value="slf4j-api"/>
+            <attribute name="Bundle-Description"
+                       value="The slf4j API"/>
+            <attribute name="Bundle-SymbolicName"
+                       value="slf4j.api"/>
+            <attribute name="Bundle-Version"
+                       value="1.7.5"/>
+            <attribute name="System-Bundle"
+                       value="yes"/>
+            <attribute name="Export-Package"
+                       value="org.slf4j, org.slf4j.spi, org.slf4j.helpers"/>
+            <attribute name="Import-Package"
+                       value="org.slf4j.impl"/>
+            <attribute name="Bundle-ClassPath"
+                       value=".,slf4j-api.jar"/>
+        </manifest>
+
+        <delete file="${debian.bundles.dest}/slf4j-jdk14-1.7.5.jar" failonerror="false"/>
+        <mkdir dir="${debian.bundles.dest}/slf4j-jdk14-1.7.5.jar/META-INF"/>
+        <symlink resource="../../../../share/java/slf4j-jdk14.jar"
+                 link="${debian.bundles.dest}/slf4j-jdk14-1.7.5.jar/slf4j-jdk14.jar"/>
+        <manifest
+            file="${debian.bundles.dest}/slf4j-jdk14-1.7.5.jar/META-INF/MANIFEST.MF">
+            <attribute name="Bundle-Name"
+                       value="slf4j-jdk14"/>
+            <attribute name="Bundle-Description"
+                       value="SLF4J JDK14 Binding"/>
+            <attribute name="Bundle-SymbolicName"
+                       value="slf4j.jdk14"/>
+            <attribute name="Bundle-Version"
+                       value="1.7.5"/>
+            <attribute name="System-Bundle"
+                       value="yes"/>
+            <attribute name="Export-Package"
+                       value="org.slf4j.impl"/>
+            <attribute name="Import-Package"
+                       value="org.slf4j, org.slf4j.spi, org.slf4j.helpers"/>
+            <attribute name="Bundle-ClassPath"
+                       value=".,slf4j-jdk14.jar"/>
+        </manifest>
+    </target>
+
 </project>
--- a/resources/install/debian/control-src.tmpl
+++ b/resources/install/debian/control-src.tmpl
@ -48,7 +48,9 @@ Build-Depends: debhelper (>= 9), javahelper,
               glassfish-activation,
               glassfish-mail,
               libbcpkix-java,
-               libjcalendar-java
+               libjcalendar-java,
+               libphonenumber6-java,
+               libslf4j-java
 Standards-Version: 3.9.5

 Package: _PACKAGE_NAME_
@ -80,7 +82,9 @@ Depends: ${misc:Depends},
         libguava-java,
         libhsqldb-java,
         libjson-simple-java (>= 1.1.1),
-         libjcalendar-java
+         libjcalendar-java,
+         libphonenumber6-java,
+         libslf4j-java
 Recommends: ${java:Recommends}
 Description: VoIP and Instant Messaging client
 _APP_NAME_ is an application that allows you to do audio/video
--- a/resources/install/debian/rules.tmpl
+++ b/resources/install/debian/rules.tmpl
@ -21,7 +21,7 @@ override_dh_install-indep:
 # make and install the debian specific bundles
 # use the prebuild and installed bundles to extract/modify and use the
 # exising debian java packages
-	$(ANT) -file build.xml -Ddebian.bundles.dest=debian/$(PACKAGE_NAME)/usr/share/$(PACKAGE_NAME)/sc-bundles -Ddebian.bundles.common.dest=debian/$(PACKAGE_NAME)-common/usr/share/$(PACKAGE_NAME)-common deb-bundle-jna deb-bundle-util deb-bundle-sysactivitynotifications deb-bundle-swing-ui deb-bundle-json deb-bundle-smacklib deb-bundle-jmdnslib deb-bundle-desktoputil deb-bundle-bouncycastle deb-bundle-plugin-accountinfo deb-bundle-commons-lang deb-bundle-hsqldb deb-libjitsi-deps deb-bundle-httpmime deb-bundle-common
+	$(ANT) -file build.xml -Ddebian.bundles.dest=debian/$(PACKAGE_NAME)/usr/share/$(PACKAGE_NAME)/sc-bundles -Ddebian.bundles.common.dest=debian/$(PACKAGE_NAME)-common/usr/share/$(PACKAGE_NAME)-common deb-bundle-jna deb-bundle-util deb-bundle-sysactivitynotifications deb-bundle-swing-ui deb-bundle-json deb-bundle-smacklib deb-bundle-jmdnslib deb-bundle-desktoputil deb-bundle-bouncycastle deb-bundle-plugin-accountinfo deb-bundle-commons-lang deb-bundle-hsqldb deb-libjitsi-deps deb-bundle-httpmime deb-bundle-common deb-bundle-slf4j

 override_dh_install-arch:
 ifeq ($(DEB_HOST_ARCH),amd64)