xtandempipeline (3.1.4-3) oneiric

git-svn-id: https://subversion.renater.fr/xtandempipeline/trunk@174 b8ef2a07-7df7-436f-90b9-41648038564b

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)
 

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

xtandempipeline/debian/changelog

+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