From 22a75fefbcac66e3e5990c985fdff427f1321336 Mon Sep 17 00:00:00 2001 From: langella <langella@b8ef2a07-7df7-436f-90b9-41648038564b> Date: Sun, 8 May 2011 17:24:03 +0000 Subject: [PATCH] xtandempipeline (3.1.1-2) git-svn-id: https://subversion.renater.fr/xtandempipeline/trunk@98 b8ef2a07-7df7-436f-90b9-41648038564b --- xtandempipeline/debian/changelog | 6 ++++++ .../share/xtandempipeline/xtandempipeline.sh.cmake | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/xtandempipeline/debian/changelog b/xtandempipeline/debian/changelog index 0900b2698..d477c19f4 100644 --- a/xtandempipeline/debian/changelog +++ b/xtandempipeline/debian/changelog @@ -1,3 +1,9 @@ +xtandempipeline (3.1.1-2) natty; urgency=low + + * test for 32 or 64 architecture to set maximum java heap memory + + -- Olivier Langella <Olivier.Langella@moulon.inra.fr> Sun, 8 May 2011 9:18:51 +0200 + xtandempipeline (3.1.1-1) natty; urgency=low * FDR computation are now compatible with reverse option of X!Tandem. diff --git a/xtandempipeline/share/xtandempipeline/xtandempipeline.sh.cmake b/xtandempipeline/share/xtandempipeline/xtandempipeline.sh.cmake index 705b9d75a..062656f56 100644 --- a/xtandempipeline/share/xtandempipeline/xtandempipeline.sh.cmake +++ b/xtandempipeline/share/xtandempipeline/xtandempipeline.sh.cmake @@ -1,3 +1,9 @@ #!/bin/bash -@CMAKE_Java_COMPILER@ -Xmx3000m -Xms256m -jar @CMAKE_INSTALL_PREFIX@/share/xtandempipeline/XtandemPipeline.jar +if [ $(uname -m) == "x86_64" ]; then + @CMAKE_Java_COMPILER@ -Xmx3000m -Xms256m -jar @CMAKE_INSTALL_PREFIX@/share/xtandempipeline/XtandemPipeline.jar +else + @CMAKE_Java_COMPILER@ -Xmx1500m -Xms256m -jar @CMAKE_INSTALL_PREFIX@/share/xtandempipeline/XtandemPipeline.jar +fi + + -- GitLab