From 5f582fe1adafda5df440d1d1b3955b2bca7fbc88 Mon Sep 17 00:00:00 2001 From: pvtroshin Date: Fri, 7 Jan 2011 14:14:40 +0000 Subject: [PATCH] Make muscle executable compilation not static to fix problem on Macs Remove one more digit from the head of non repeatable number to prevent it going beyond long on Mac VMs git-svn-id: link to svn.lifesci.dundee.ac.uk/svn/barton/ptroshin/JABA2@3585 e3abac25-378b-4346-85de-24260fe3988d --- binaries/src/muscle/Makefile | 4 ++-- engine/compbio/engine/conf/DirectoryManager.java | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/binaries/src/muscle/Makefile b/binaries/src/muscle/Makefile index dc1cdc1..fb62886 100644 --- a/binaries/src/muscle/Makefile +++ b/binaries/src/muscle/Makefile @@ -10,8 +10,8 @@ # this is fixed by deleting "-static" from the LDLIBS line. CFLAGS = -O3 -funroll-loops -Winline -DNDEBUG=1 -LDLIBS = -lm -static -# LDLIBS = -lm +# LDLIBS = -lm -static +LDLIBS = -lm OBJ = .o EXE = diff --git a/engine/compbio/engine/conf/DirectoryManager.java b/engine/compbio/engine/conf/DirectoryManager.java index 10427dd..adceacc 100644 --- a/engine/compbio/engine/conf/DirectoryManager.java +++ b/engine/compbio/engine/conf/DirectoryManager.java @@ -41,7 +41,7 @@ public class DirectoryManager { // to make sure that the resulting number fits into long value String longNum = new Long(System.nanoTime()).toString(); return Long.parseLong(Util.getRandomNumber(100, 999) - + longNum.substring(3)); + + longNum.substring(4)); } public static Class> getClass(String taskId) { @@ -55,8 +55,9 @@ public class DirectoryManager { try { return (Class>) Class.forName(className); } catch (ClassNotFoundException e) { - log.error("Could not parse taskId " + taskId + " Message " - + e.getLocalizedMessage(), e.getCause()); + log.error( + "Could not parse taskId " + taskId + " Message " + + e.getLocalizedMessage(), e.getCause()); } return null; } -- 1.7.10.2