You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2002/01/03 14:43:20 UTC
cvs commit: jakarta-tomcat-4.0/tester/src/bin tester.sh
remm 02/01/03 05:43:20
Modified: tester/src/bin tester.sh
Log:
- Add some path fixes for Cygwin.
Revision Changes Path
1.4 +28 -2 jakarta-tomcat-4.0/tester/src/bin/tester.sh
Index: tester.sh
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/src/bin/tester.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tester.sh 21 Feb 2001 21:39:50 -0000 1.3
+++ tester.sh 3 Jan 2002 13:43:20 -0000 1.4
@@ -12,7 +12,7 @@
#
# JAVA_HOME Must point at your Java Development Kit installation.
#
-# $Id: tester.sh,v 1.3 2001/02/21 21:39:50 craigmcc Exp $
+# $Id: tester.sh,v 1.4 2002/01/03 13:43:20 remm Exp $
# -----------------------------------------------------------------------------
@@ -35,12 +35,38 @@
exit 1
fi
+# ----- Cygwin Unix Paths Setup -----------------------------------------------
+
+# Cygwin support. $cygwin _must_ be set to either true or false.
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ *) cygwin=false ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$CATALINA_HOME" ] &&
+ CATALINA_HOME=`cygpath --unix "$CATALINA_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$ANT_HOME" ] &&
+ ANT_HOME=`cygpath --unix "$ANT_HOME"`
+fi
+
# ----- Set Up The System Classpath -------------------------------------------
CP=$CATALINA_HOME/webapps/tester/WEB-INF/lib/tester.jar:$CATALINA_HOME/server/lib/jaxp.jar:$CATALINA_HOME/server/lib/crimson.jar:$ANT_HOME/lib/ant.jar
-echo Using CLASSPATH: $CP
+# ----- Cygwin Windows Paths Setup --------------------------------------------
+# convert the existing path to windows
+if $cygwin ; then
+ CP=`cygpath --path --windows "$CP"`
+ CATALINA_HOME=`cygpath --path --windows "$CATALINA_HOME"`
+ JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+fi
+
+echo Using CLASSPATH: $CP
# ----- Execute The Requested Command -----------------------------------------
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>