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

diff --git a/binaries/src/muscle/Makefile b/binaries/src/muscle/Makefile
index dc1cdc1..fb62886 100644 (file)
--- 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 (file)
--- 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\r
                String longNum = new Long(System.nanoTime()).toString();\r
                return Long.parseLong(Util.getRandomNumber(100, 999)\r
-                               + longNum.substring(3));\r
+                               + longNum.substring(4));\r
        }\r
 \r
        public static Class<Executable<?>> getClass(String taskId) {\r
@@ -55,8 +55,9 @@ public class DirectoryManager {
                try {\r
                        return (Class<Executable<?>>) Class.forName(className);\r
                } catch (ClassNotFoundException e) {\r
-                       log.error("Could not parse taskId " + taskId + " Message "\r
-                                       + e.getLocalizedMessage(), e.getCause());\r
+                       log.error(\r
+                                       "Could not parse taskId " + taskId + " Message "\r
+                                                       + e.getLocalizedMessage(), e.getCause());\r
                }\r
                return null;\r
        }\r