Builds irc-api for debian src using mvn-debian.

4 files changed, 122 insertions, 57 deletions

diff --git a/resources/install/README.Debian b/resources/install/README.Debian
index f75ea28..9feca2b 100644
--- a/resources/install/README.Debian
+++ b/resources/install/README.Debian
@@ -2,7 +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
+svn clone https://github.com/migzai/irc-api.git
 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.
\ No newline at end of file
diff --git a/resources/install/build.xml b/resources/install/build.xml
index 2188ebf..3922296 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -2674,8 +2674,8 @@
         <!-- irc-api -->
         <copy todir="${debian.src.dir}/lib/src/irc-api">
             <fileset dir="${sc.basedir}/../irc-api">
-                <include name="src/main/**"/>
-                <exclude name="**/.svn/**"/>
+                <include name="**"/>
+                <exclude name="**/.git/**"/>
             </fileset>
         </copy>
 
@@ -3016,61 +3016,19 @@
                  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-ManifestVersion" value="2"/>
-                <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"
+        <exec   dir="${debian.src.dir}/lib/src/irc-api"
+                executable="mvn-debian"
+                resolveexecutable="true"
+                failonerror="true">
+            <arg value="-f" />
+            <arg value="pom.xml" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-Dpackaging=bundle" />
+            <arg value="package" />
+        </exec>
+        <symlink resource="../src/irc-api/target/irc-api-1.0-0015-SNAPSHOT.jar"
                  overwrite="true"
-                 link="${debian.src.dir}/lib/installer-exclude"/>
+                 link="${debian.src.dir}/lib/installer-exclude/irc-api-1.0.jar"/>
         <symlink resource="/usr/share/java/slf4j-api.jar"
                  overwrite="true"
                  link="${debian.src.dir}/lib/installer-exclude/slf4j-api-1.7.5.jar"/>
diff --git a/resources/install/debian/patches/irc-api.patch b/resources/install/debian/patches/irc-api.patch
new file mode 100644
index 0000000..42a842a
--- /dev/null
+++ b/resources/install/debian/patches/irc-api.patch
@@ -0,0 +1,106 @@
+Index: jitsi/lib/src/irc-api/pom.xml
+Description: Updates pom.xml or irc api to be able to mvn-debian build.
+===================================================================
+--- jitsi.orig/lib/src/irc-api/pom.xml
++++ jitsi/lib/src/irc-api/pom.xml
+@@ -8,11 +8,11 @@
+ 	<name>IRC API</name>
+ 	<description>Open source Java IRC API</description>
+ 	<packaging>jar</packaging>
+-	<parent>
++	<!--parent>
+ 		<groupId>org.sonatype.oss</groupId>
+ 		<artifactId>oss-parent</artifactId>
+ 		<version>7</version>
+-	</parent>
++	</parent-->
+ 
+ 	<properties>
+ 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+@@ -33,7 +33,7 @@
+ 	</scm>
+ 
+ 	<dependencies>
+-		<dependency>
++		<!--dependency>
+ 			<groupId>com.googlecode.jmockit</groupId>
+ 			<artifactId>jmockit</artifactId>
+ 			<version>0.999.12</version>
+@@ -42,18 +42,18 @@
+ 		<dependency>
+ 			<groupId>junit</groupId>
+ 			<artifactId>junit</artifactId>
+-			<version>4.9</version>
++			<version>debian</version>
+ 			<scope>test</scope>
+-		</dependency>
++		</dependency-->
+ 		<dependency>
+ 			<groupId>org.slf4j</groupId>
+ 			<artifactId>slf4j-api</artifactId>
+-			<version>1.6.1</version>
++			<version>debian</version>
+ 		</dependency>
+ 		<dependency>
+ 			<groupId>commons-codec</groupId>
+ 			<artifactId>commons-codec</artifactId>
+-			<version>1.4</version>
++			<version>debian</version>
+ 		</dependency>
+ 	</dependencies>
+ 
+@@ -76,18 +76,17 @@
+ 			</resource>
+ 		</resources>
+ 		<plugins>
+-			<plugin>
++			<!--plugin>
+ 				<groupId>org.apache.maven.plugins</groupId>
+ 				<artifactId>maven-eclipse-plugin</artifactId>
+ 				<version>2.8</version>
+ 				<configuration>
+ 					<useProjectReferences>false</useProjectReferences>
+ 				</configuration>
+-			</plugin>
++			</plugin-->
+ 			<plugin>
+ 				<groupId>org.apache.maven.plugins</groupId>
+ 				<artifactId>maven-compiler-plugin</artifactId>
+-				<version>2.3.2</version>
+ 				<configuration>
+ 					<source>1.6</source>
+ 					<target>1.6</target>
+@@ -98,7 +97,6 @@
+ 			<plugin>
+ 			    <groupId>org.apache.maven.plugins</groupId>
+ 				<artifactId>maven-jar-plugin</artifactId>
+-				<version>2.3.2</version>
+ 				<configuration>
+ 					<archive>
+ 						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+@@ -108,6 +106,7 @@
+ 			<plugin>
+ 				<groupId>org.apache.felix</groupId>
+ 				<artifactId>maven-bundle-plugin</artifactId>
++				<version>2.3.7</version>
+ 				<executions>
+ 					<execution>
+ 						<id>bundle-manifest</id>
+@@ -124,7 +123,7 @@
+ 					</instructions>
+ 				</configuration>
+ 			</plugin>
+-			<plugin>
++			<!--plugin>
+ 				<groupId>org.apache.maven.plugins</groupId>
+ 				<artifactId>maven-surefire-plugin</artifactId>
+ 				<version>2.11</version>
+@@ -139,7 +138,7 @@
+ 				<groupId>org.apache.maven.plugins</groupId>
+ 				<artifactId>maven-javadoc-plugin</artifactId>
+ 				<version>2.9</version>
+-			</plugin>
++			</plugin-->
+ 		</plugins>
+ 		<pluginManagement>
+ 			<plugins>
diff --git a/resources/install/debian/patches/series b/resources/install/debian/patches/series
index 3287fa1..0acb2eb 100644
--- a/resources/install/debian/patches/series
+++ b/resources/install/debian/patches/series
@@ -2,3 +2,4 @@ bcprov-upgrade-1.48
 removes-gdata-deps
 encoding.patch
 bouncycastle-1.51.patch
+irc-api.patch
\ No newline at end of file