[MOBY-guts] biomoby commit

[Martin Senger]

senger
Thu May 19 06:56:05 EDT 2005
Update of /home/repository/moby/moby-live/Java
In directory pub.open-bio.org:/tmp/cvs-serv2887

Modified Files:
	build-dev.bat build-dev.sh build.bat build.sh 
Log Message:


moby-live/Java build-dev.bat,1.3,1.4 build-dev.sh,1.3,1.4 build.bat,1.3,1.4 build.sh,1.3,1.4
===================================================================
RCS file: /home/repository/moby/moby-live/Java/build-dev.bat,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- /home/repository/moby/moby-live/Java/build-dev.bat	2003/11/08 00:27:23	1.3
+++ /home/repository/moby/moby-live/Java/build-dev.bat	2005/05/19 10:56:05	1.4
@@ -18,11 +18,9 @@
 goto end
 :javadone
 
-REM Set-up and check ANT_HOME
-REM -------------------------
-if NOT "%ANT_HOME%"=="" goto antdone
+REM Set-up ANT_HOME
+REM ---------------
 set ANT_HOME=.\lib\ant_home
-:antdone
 
 REM Put Ant libraries in CLASSPATH
 REM ------------------------------

===================================================================
RCS file: /home/repository/moby/moby-live/Java/build-dev.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- /home/repository/moby/moby-live/Java/build-dev.sh	2003/11/08 00:27:23	1.3
+++ /home/repository/moby/moby-live/Java/build-dev.sh	2005/05/19 10:56:05	1.4
@@ -16,8 +16,6 @@
 #
 #  This script can make use of the following environment variables:
 #
-#     ANT_HOME ... pointing to a directory with Ant libraries.
-#              Default (used if variable is not set): ./lib/ant_home
 #     JAVA_HOME ... pointing to a directory with your Java JDK.
 #              If not set the script tries to find it anyway.
 
@@ -35,16 +33,9 @@
 fi
 #echo "Using Java from: $JAVA_HOME."
 
-# --- setup and check ANT_HOME
-if [ -z "$ANT_HOME" ] ; then
-    ANT_HOME=./lib/ant_home
-    export ANT_HOME
-fi
-if [ ! -d "$ANT_HOME" ] ; then
-    echo "ANT_HOME is set to '$ANT_HOME' which is not an existing directory."
-    echo "Please set your ANT_HOME."
-    exit 1
-fi
+# --- setup ANT_HOME
+ANT_HOME=./lib/ant_home
+export ANT_HOME
 #echo "Using Ant libraries from: $ANT_HOME/lib."
 
 # --- put Ant libraries in CLASSPATH

===================================================================
RCS file: /home/repository/moby/moby-live/Java/build.bat,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- /home/repository/moby/moby-live/Java/build.bat	2003/11/08 00:27:23	1.3
+++ /home/repository/moby/moby-live/Java/build.bat	2005/05/19 10:56:05	1.4
@@ -19,11 +19,9 @@
 goto end
 :javadone
 
-REM Set-up and check ANT_HOME
-REM -------------------------
-if NOT "%ANT_HOME%"=="" goto antdone
+REM Set-up ANT_HOME
+REM ---------------
 set ANT_HOME=.\lib\ant_home
-:antdone
 
 REM Put Ant libraries in CLASSPATH
 REM ------------------------------

===================================================================
RCS file: /home/repository/moby/moby-live/Java/build.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- /home/repository/moby/moby-live/Java/build.sh	2003/11/08 00:27:23	1.3
+++ /home/repository/moby/moby-live/Java/build.sh	2005/05/19 10:56:05	1.4
@@ -12,8 +12,6 @@
 #
 #  This script can make use of the following environment variables:
 #
-#     ANT_HOME ... pointing to a directory with Ant libraries.
-#              Default (used if variable is not set): ./lib/ant_home
 #     JAVA_HOME ... pointing to a directory with your Java JDK.
 #              If not set the script tries to find it anyway.
 
@@ -31,16 +29,9 @@
 fi
 #echo "Using Java from: $JAVA_HOME."
 
-# --- setup and check ANT_HOME
-if [ -z "$ANT_HOME" ] ; then
-    ANT_HOME=./lib/ant_home
-    export ANT_HOME
-fi
-if [ ! -d "$ANT_HOME" ] ; then
-    echo "ANT_HOME is set to '$ANT_HOME' which is not an existing directory."
-    echo "Please set your ANT_HOME."
-    exit 1
-fi
+# --- setup ANT_HOME
+ANT_HOME=./lib/ant_home
+export ANT_HOME
 #echo "Using Ant libraries from: $ANT_HOME/lib."
 
 # --- put Ant libraries in CLASSPATH