diff --git a/Makefile b/Makefile index 0077a9008a62490efb12e4fba606c7cb8477d572..01d241923961a541018d1ab4c7ca09d62e73f095 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # This is a GNU Makefile for Artemis -# $Header: //tmp/pathsoft/artemis/Makefile,v 1.46 2009-08-10 08:09:56 tjc Exp $ +# $Header: //tmp/pathsoft/artemis/Makefile,v 1.47 2009-09-21 15:32:03 tjc Exp $ SHELL=/bin/sh @@ -8,7 +8,7 @@ SHELL=/bin/sh JAVAC := javac -source 1.5 -target 1.5 $(OPT_FLAGS) $(EXTRA_FLAGS) -REAL_CLASSPATH := CLASSPATH=lib/biojava.jar:lib/jemAlign.jar:lib/j2ssh/j2ssh-core.jar:lib/ibatis/ibatis-2.3.4.726.jar:lib/ibatis/log4j-1.2.14.jar:lib/chado-14-interface.jar:lib/postgresql-8.4-701.jdbc3.jar:. +REAL_CLASSPATH := CLASSPATH=lib/biojava.jar:lib/jemAlign.jar:lib/j2ssh/j2ssh-core.jar:lib/ibatis/ibatis-2.3.4.726.jar:lib/ibatis/log4j-1.2.14.jar:lib/chado-14-interface.jar:lib/postgresql-8.4-701.jdbc3.jar:lib/picard/picard-1.04.jar:lib/picard/sam-1.04.jar:. NAMES:= \ uk/ac/sanger/artemis/OptionChangeListener \ diff --git a/art b/art index 8109b847245797b926039c49ff4a5a9e46e362eb..a9be46198937b663662e64272fff3cff9b822b45 100755 --- a/art +++ b/art @@ -6,7 +6,7 @@ # necessary a symbolic link can be made to this script from # /usr/local/bin/ or elsewhere. -# $Header: //tmp/pathsoft/artemis/art,v 1.24 2009-08-10 08:12:21 tjc Exp $ +# $Header: //tmp/pathsoft/artemis/art,v 1.25 2009-09-21 15:34:45 tjc Exp $ # resolve links - $0 may be a link PRG=$0 @@ -37,6 +37,10 @@ CLASSPATH=$CLASSPATH:$ARTEMIS_HOME/lib/j2ssh/commons-logging.jar:$ARTEMIS_HOME/l CLASSPATH=$CLASSPATH:$ARTEMIS_HOME/lib/ibatis/ibatis-2.3.4.726.jar:$ARTEMIS_HOME/lib/ibatis/:$ARTEMIS_HOME/lib/ibatis/log4j-1.2.14.jar:$ARTEMIS_HOME/lib/ibatis/cglib-nodep-2.2.jar:$ARTEMIS_HOME/lib/retrotranslator-runtime-1.1.0.jar export CLASSPATH +# picard jars +CLASSPATH=$CLASSPATH:lib/picard/sam-1.04.jar:lib/picard/picard-1.04.jar +export CLASSPATH + ARTEMIS_PROPERTIES="-Dartemis.environment=UNIX"