diff --git a/xtandempipeline/CMakeLists.txt b/xtandempipeline/CMakeLists.txt
index bb2302bbc9cb4b43ccea2b18fecd771d9acbe002..01afd636dc3265eec97023a6a3365f46445d02ea 100644
--- a/xtandempipeline/CMakeLists.txt
+++ b/xtandempipeline/CMakeLists.txt
@@ -159,5 +159,6 @@ INSTALL(FILES share/xtandempipeline/xtandempipeline.jnlp DESTINATION share/xtand
INSTALL(FILES share/xtandempipeline/XtandemPipeline.jar DESTINATION share/xtandempipeline)
INSTALL(FILES share/xtandempipeline/libproteomicsvg.jar DESTINATION share/xtandempipeline)
INSTALL(FILES share/xtandempipeline/libodsstream.jar DESTINATION share/xtandempipeline)
+INSTALL(FILES share/xtandempipeline/PPClient.jar DESTINATION share/xtandempipeline)
INSTALL(FILES share/xtandempipeline/xtandempipeline_icon.svg DESTINATION share/xtandempipeline)
diff --git a/xtandempipeline/build_ubuntu.xml b/xtandempipeline/build_ubuntu.xml
index 579eaa3e0e58683e5b0dfec3c1fdabd8739b39c9..e2f70b3dacda36c82b290ba8d47a6c9f63dc8c9a 100644
--- a/xtandempipeline/build_ubuntu.xml
+++ b/xtandempipeline/build_ubuntu.xml
@@ -4,7 +4,7 @@
</description>
<!-- set global properties for this build -->
-
+
<property name="lib" location="/usr/share/java" />
<property name="share" location="share" />
<property name="resources" location="src/resources" />
@@ -21,12 +21,12 @@
<mkdir dir="build" />
<mkdir dir="dist" />
<mkdir dir="conf" />
-
+
<!--
<copy file="lib/libproteomicsvg.jar" tofile="${share}/xtandempipeline/libproteomicsvg.jar" overwrite="true" />
<copy file="lib/libodsstream.jar" tofile="${share}/xtandempipeline/libodsstream.jar" overwrite="true" />
-->
- </target>
+ </target>
<target name="init" depends="reset">
@@ -35,27 +35,28 @@
</target>
<path id="classpath">
- <!--xml-apis-ext.jar xml-apis.jar xercesImpl.jar xalan2.jar swt.jar batik.jar liblog4j1.2-java -->
+ <!--xml-apis-ext.jar xml-apis.jar xercesImpl.jar xalan2.jar swt.jar batik.jar liblog4j1.2-java -->
<fileset dir="${lib}" includes="commons-httpclient.jar commons-codec.jar commons-logging.jar log4j-1.2.jar xml-apis-ext.jar xml-apis.jar xercesImpl.jar xalan2.jar swt.jar batik.jar" />
<fileset dir="${share}/xtandempipeline" includes="libproteomicsvg.jar" />
<fileset dir="${share}/xtandempipeline" includes="libodsstream.jar" />
+ <fileset dir="${share}/xtandempipeline" includes="PPClient.jar" />
</path>
<target name="compile" depends="init" description="compile the source and put in build directory">
<!-- Compile the java code from ${src} into ${build} -->
<javac srcdir="${src}" destdir="${build}" target="1.6" source="1.6" classpathref="classpath" includeantruntime="false">
- <compilerarg line="-encoding utf-8"/>
+ <compilerarg line="-encoding utf-8" />
<classpath>
<pathelement location="${build}/fr/inra/pappso/xtandempipeline/XtandemPipelineMain.class" />
</classpath>
</javac>
</target>
-
+
<target name="jarWithClasspath" depends="compile" description="generates the jar file for Ubuntu">
-
+
<mkdir dir="${build}/conf" />
<copy todir="${build}/conf" overwrite="true">
<fileset dir="${confDir}" includes="*" />
@@ -70,17 +71,23 @@
<!--<fileset file=".classpath" />-->
<manifest>
<attribute name="Main-Class" value="fr.inra.pappso.xtandempipeline.XtandemPipelineMain" />
- <attribute name="Class-Path" value="/usr/share/java/commons-httpclient.jar /usr/share/java/commons-codec.jar /usr/share/java/commons-logging.jar /usr/share/java/log4j-1.2.jar /usr/share/java/xml-apis-ext.jar /usr/share/java/xml-apis.jar /usr/share/java/xercesImpl.jar /usr/share/java/xalan2.jar /usr/share/java/swt.jar /usr/share/java/batik.jar /usr/share/xtandempipeline/libproteomicsvg.jar /usr/share/xtandempipeline/libodsstream.jar" />
+ <attribute name="Class-Path" value="/usr/share/java/commons-httpclient.jar /usr/share/java/commons-codec.jar /usr/share/java/commons-logging.jar /usr/share/java/log4j-1.2.jar /usr/share/java/xml-apis-ext.jar /usr/share/java/xml-apis.jar /usr/share/java/xercesImpl.jar /usr/share/java/xalan2.jar /usr/share/java/swt.jar /usr/share/java/batik.jar /usr/share/xtandempipeline/libproteomicsvg.jar /usr/share/xtandempipeline/libodsstream.jar /usr/share/xtandempipeline/PPClient.jar" />
</manifest>
</jar>
<!-- cd bin; jar -cf client.jar; -->
<!-- <jar jarfile="client.jar" basedir="bin"/> -->
</target>
-
+
<target name="clean" depends="jarWithClasspath">
<delete dir="jnlp" />
<delete dir="build" />
<delete dir="dist" />
</target>
+
+ <target name="copyInShare" description="copies jar needed by the ubuntu package into the share directory">
+ <copy file="./lib/libproteomicsvg.jar" todir="${share}/xtandempipeline" overwrite="true"/>
+ <copy file="./lib/libodsstream.jar" todir="${share}/xtandempipeline" overwrite="true"/>
+ <copy file="./lib/PPClient.jar" todir="${share}/xtandempipeline" overwrite="true"/>
+ </target>
</project>
\ No newline at end of file
diff --git a/xtandempipeline/debian/changelog b/xtandempipeline/debian/changelog
index b676bc03711b98ccb75bcf33ccfb84141cf74242..0adc23a92862cf11902e9a07438928baf191362f 100644
--- a/xtandempipeline/debian/changelog
+++ b/xtandempipeline/debian/changelog
@@ -1,3 +1,9 @@
+xtandempipeline (3.1.4-3) oneiric; urgency=low
+
+ * added PPClient.jar in the package
+
+ -- Olivier Langella <Olivier.Langella@moulon.inra.fr> Mon, 7 Nov 2011 10:18:51 +0200
+
xtandempipeline (3.1.4-2) oneiric; urgency=low
* added required dependencies to common java http library
diff --git a/xtandempipeline/share/xtandempipeline/PPClient.jar b/xtandempipeline/share/xtandempipeline/PPClient.jar
new file mode 100644
index 0000000000000000000000000000000000000000..da8cb3820d228ad9a15df79ae8cd82baf686fa76
Binary files /dev/null and b/xtandempipeline/share/xtandempipeline/PPClient.jar differ
diff --git a/xtandempipeline/share/xtandempipeline/libodsstream.jar b/xtandempipeline/share/xtandempipeline/libodsstream.jar
index 8298ee5c5c8c5112270c11ae060fbe41c3b26790..cd62062339eaf86e2db21f72d7950ab99249ae02 100644
Binary files a/xtandempipeline/share/xtandempipeline/libodsstream.jar and b/xtandempipeline/share/xtandempipeline/libodsstream.jar differ
diff --git a/xtandempipeline/share/xtandempipeline/libproteomicsvg.jar b/xtandempipeline/share/xtandempipeline/libproteomicsvg.jar
index 2033b00598ebcddf431c9d898ba25adcdb69b474..b5e227c21de43569b890fcaf0b1325cc062b7756 100644
Binary files a/xtandempipeline/share/xtandempipeline/libproteomicsvg.jar and b/xtandempipeline/share/xtandempipeline/libproteomicsvg.jar differ