From 00dc12a8517f76e24de2ed8207473fa6d925a444 Mon Sep 17 00:00:00 2001
From: langella <langella@b8ef2a07-7df7-436f-90b9-41648038564b>
Date: Tue, 30 Apr 2013 14:53:25 +0000
Subject: [PATCH] possibility to configure a beta version for xtamdempipeline
launched by jnlp
git-svn-id: https://subversion.renater.fr/xtandempipeline/trunk@367 b8ef2a07-7df7-436f-90b9-41648038564b
---
xtandempipeline/CMakeLists.txt | 10 ++++++++++
.../share/xtandempipeline/xtandempipeline.jnlp | 6 ++++--
.../share/xtandempipeline/xtandempipeline.jnlp.cmake | 4 ++--
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/xtandempipeline/CMakeLists.txt b/xtandempipeline/CMakeLists.txt
index a8d7bbe4d..7ca035859 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 a27d6f023..4cedaeea8 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 fac932e25..6b631e9b6 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>
--
GitLab