remm 01/02/28 17:30:14
Modified: jasper/src/bin jasper.bat jasper.sh
Log:
- Fix Jasper scripts to reflect the changes in the directory structure.
Also add fix to run on Cygwin.
Patch submitted by Steve Downey <steve.downey at netfolio.com>
Revision Changes Path
1.3 +3 -1 jakarta-tomcat-4.0/jasper/src/bin/jasper.bat
Index: jasper.bat
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/bin/jasper.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jasper.bat 2000/09/05 01:04:54 1.2
+++ jasper.bat 2001/03/01 01:30:13 1.3
@@ -11,7 +11,7 @@
rem JAVA_HOME
rem Must point at your Java Development Kit installation.
rem
-rem $Id: jasper.bat,v 1.2 2000/09/05 01:04:54 craigmcc Exp $
+rem $Id: jasper.bat,v 1.3 2001/03/01 01:30:13 remm Exp $
rem ---------------------------------------------------------------------------
rem ----- Save Environment Variables That May Change --------------------------
@@ -41,6 +41,8 @@
rem FIXME below
set CLASSPATH=%JASPER_HOME%\classes
for %%i in (%JASPER_HOME%\lib\*.jar) do call %JASPER_HOME%\bin\jpappend.bat %%i
+for %%i in (%JASPER_HOME%\jasper\*.jar) do call %JASPER_HOME%\bin\jpappend.bat %%i
+set CLASSPATH=%CLASSPATH%;%JASPER_HOME%\bin\servlet.jar
echo Using CLASSPATH: %CLASSPATH%
rem ----- Execute The Requested Command ---------------------------------------
1.2 +29 -4 jakarta-tomcat-4.0/jasper/src/bin/jasper.sh
Index: jasper.sh
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/bin/jasper.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jasper.sh 2000/08/12 00:52:05 1.1
+++ jasper.sh 2001/03/01 01:30:13 1.2
@@ -13,14 +13,33 @@
# JAVA_HOME
# Must point at your Java Development Kit installation.
#
-# $Id: jasper.sh,v 1.1 2000/08/12 00:52:05 pierred Exp $
+# $Id: jasper.sh,v 1.2 2001/03/01 01:30:13 remm Exp $
# -----------------------------------------------------------------------------
# ----- Verify and Set Required Environment Variables -------------------------
-if [ "$JASPER_HOME" = "" ] ; then
- JASPER_HOME=`pwd`
+if [ -z "$JASPER_HOME" ] ; then
+ ## resolve links - $0 may be a link to home
+ PRG=$0
+ progname=`basename $0`
+
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '.*/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname $PRG`/$link"
+ fi
+ done
+
+ JASPER_HOME_1=`dirname "$PRG"`/..
+ echo "Guessing JASPER_HOME from catalina.sh to ${JASPER_HOME_1}"
+ if [ -d ${JASPER_HOME_1}/conf ] ; then
+ JASPER_HOME=${JASPER_HOME_1}
+ echo "Setting JASPER_HOME to $JASPER_HOME"
+ fi
fi
if [ "$JASPER_OPTS" = "" ] ; then
@@ -37,9 +56,15 @@
# FIXME CP=$JASPER_HOME/dummy
# FIXME below
CP=$CP:$JASPER_HOME/classes
-for i in $JASPER_HOME/lib/*.jar ; do
+for i in $JASPER_HOME/lib/*.jar $JASPER_HOME/jasper/*.jar ; do
CP=$CP:$i
done
+
+# convert the existing path to windows
+if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] ; then
+ CP=`cygpath --path --windows "$CP"`
+ JASPER_HOME=`cygpath --path --windows "$JASPER_HOME"`
+fi
echo Using CLASSPATH: $CP
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
