diff --git a/xtandempipeline/CMakeLists.txt b/xtandempipeline/CMakeLists.txt index a8d7bbe4d5e83ba9e1f333d887cb3f4e4af24d55..7ca035859ddcd25991f7829e89cfc8be5e3a75e2 100644 --- a/xtandempipeline/CMakeLists.txt +++ b/xtandempipeline/CMakeLists.txt @@ -10,6 +10,16 @@ SET (ANT_EXECUTABLE "/usr/bin/ant") SET (MASCOT_DAT_FILE_JAR "mascotdatfile-3.3.jar") +SET (JNLP_HREF "http://pappso.inra.fr/bioinfo/xtandempipeline/xtandempipeline.jnlp") +SET (JNLP_CODEBASE "http://pappso.inra.fr/downloads/xtandem_pipeline/") + +#cmake -DBETA_VERSION=TRUE . + +if (BETA_VERSION) + SET (JNLP_HREF "http://pappso.inra.fr/downloads/langella/beta/xtandempipeline/xtandempipeline.jnlp") + SET (JNLP_CODEBASE "http://pappso.inra.fr/downloads/langella/beta/xtandempipeline/") +endif (BETA_VERSION) + FIND_PACKAGE( Java REQUIRED ) diff --git a/xtandempipeline/share/xtandempipeline/xtandempipeline.jnlp b/xtandempipeline/share/xtandempipeline/xtandempipeline.jnlp index a27d6f0230b9d80484285c650b12fdb3b199df6d..4cedaeea818de16268b482acd9357901b40e17e0 100644 --- a/xtandempipeline/share/xtandempipeline/xtandempipeline.jnlp +++ b/xtandempipeline/share/xtandempipeline/xtandempipeline.jnlp @@ -1,8 +1,8 @@ <?xml version='1.0' encoding='UTF-8'?> -<jnlp codebase="http://pappso.inra.fr/downloads/xtandem_pipeline/" href="http://pappso.inra.fr/bioinfo/xtandempipeline/xtandempipeline.jnlp"> +<jnlp codebase="http://pappso.inra.fr/downloads/langella/beta/xtandempipeline/" href="http://pappso.inra.fr/downloads/langella/beta/xtandempipeline/xtandempipeline.jnlp"> <information> <title>X!Tandem Pipeline</title> - <vendor>Benoit Valot</vendor> + <vendor>PAPPSO</vendor> <homepage href="http://pappso.inra.fr/bioinfo/xtandempipeline"/> <description>X!Tandem Pipeline</description> <description kind="short">Logiciel to analyse, filters, view and export X!Tandem results</description> @@ -61,6 +61,8 @@ <jar href="lib/libproteomicsvg.jar" main="false" download="eager" /> <jar href="lib/libodsstream.jar" main="false" download="eager" /> + <jar href="lib/javacsv.jar" main="false" download="eager" /> + <jar href="lib/ods2csv.jar" main="false" download="eager" /> </resources> <resources os="Windows" arch="x86"> diff --git a/xtandempipeline/share/xtandempipeline/xtandempipeline.jnlp.cmake b/xtandempipeline/share/xtandempipeline/xtandempipeline.jnlp.cmake index fac932e25391a1f70e3e8221acfa7da224cbf4a5..6b631e9b66260079b977398acee5f095c82955b8 100644 --- a/xtandempipeline/share/xtandempipeline/xtandempipeline.jnlp.cmake +++ b/xtandempipeline/share/xtandempipeline/xtandempipeline.jnlp.cmake @@ -1,8 +1,8 @@ <?xml version='1.0' encoding='UTF-8'?> -<jnlp codebase="http://pappso.inra.fr/downloads/xtandem_pipeline/" href="http://pappso.inra.fr/bioinfo/xtandempipeline/xtandempipeline.jnlp"> +<jnlp codebase="@JNLP_CODEBASE@" href="@JNLP_HREF@"> <information> <title>X!Tandem Pipeline</title> - <vendor>Benoit Valot</vendor> + <vendor>PAPPSO</vendor> <homepage href="http://pappso.inra.fr/bioinfo/xtandempipeline"/> <description>X!Tandem Pipeline</description> <description kind="short">Logiciel to analyse, filters, view and export X!Tandem results</description>