# HG changeset patch # User devteam # Date 1389635144 18000 # Node ID 739bf5324d631d5ecd8ca12bdc64ccd3c8857deb # Parent b5b253a92efeed02c7cc7fd4fec6e33c9658ab1d# Parent 55f937f289b2626693cd4bbfe58db3e1ceef756e Merge heads at 34:55f937f289b2 and 45:b5b253a92efe which were created as a result of a recently fixed bug. diff -r 55f937f289b2 -r 739bf5324d63 jars/protein_generator.jar Binary file jars/protein_generator.jar has changed diff -r 55f937f289b2 -r 739bf5324d63 jars/results_analyser.jar Binary file jars/results_analyser.jar has changed diff -r 55f937f289b2 -r 739bf5324d63 jars/samifier.jar Binary file jars/samifier.jar has changed diff -r 55f937f289b2 -r 739bf5324d63 jars/virtual_protein_merger.jar Binary file jars/virtual_protein_merger.jar has changed diff -r 55f937f289b2 -r 739bf5324d63 protein_generator.jar Binary file protein_generator.jar has changed diff -r 55f937f289b2 -r 739bf5324d63 protein_generator.sh --- a/protein_generator.sh Wed May 01 11:10:55 2013 +1000 +++ b/protein_generator.sh Mon Jan 13 12:45:44 2014 -0500 @@ -19,7 +19,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -jar_path="${DIR}/jars/${1}" +jar_path="${DIR}/${1}" shift java -Xmx3072M -jar $jar_path $@ diff -r 55f937f289b2 -r 739bf5324d63 protein_merger.sh --- a/protein_merger.sh Wed May 01 11:10:55 2013 +1000 +++ b/protein_merger.sh Mon Jan 13 12:45:44 2014 -0500 @@ -19,7 +19,7 @@ # Locate the jar directory DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -jar_path="${DIR}/jars/${1}" +jar_path="${DIR}/${1}" shift # Untar the chromosome file into a temporary directory diff -r 55f937f289b2 -r 739bf5324d63 protein_merger.xml diff -r 55f937f289b2 -r 739bf5324d63 result_analyser.sh --- a/result_analyser.sh Wed May 01 11:10:55 2013 +1000 +++ b/result_analyser.sh Mon Jan 13 12:45:44 2014 -0500 @@ -19,7 +19,7 @@ # Locate the jar directory DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -jar_path="${DIR}/jars/${1}" +jar_path="${DIR}/${1}" shift # Untar the chromosome file into a temporary directory diff -r 55f937f289b2 -r 739bf5324d63 results_analyser.jar Binary file results_analyser.jar has changed diff -r 55f937f289b2 -r 739bf5324d63 samifier.jar Binary file samifier.jar has changed diff -r 55f937f289b2 -r 739bf5324d63 samifier.sh --- a/samifier.sh Wed May 01 11:10:55 2013 +1000 +++ b/samifier.sh Mon Jan 13 12:45:44 2014 -0500 @@ -19,7 +19,7 @@ # Locate the jar directory DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -jar_path="${DIR}/jars/${1}" +jar_path="${DIR}/${1}" shift # Untar the chromosome file into a temporary directory diff -r 55f937f289b2 -r 739bf5324d63 samifier.xml diff -r 55f937f289b2 -r 739bf5324d63 virtual_protein_merger.jar Binary file virtual_protein_merger.jar has changed