You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by je...@apache.org on 2002/11/24 19:18:55 UTC
cvs commit: jakarta-slide/src/webdav/client/bin run.bat run.sh
jericho 2002/11/24 10:18:55
Modified: src/webdav/client/bin run.bat run.sh
Log:
- Support to set the classpath for the binary distribution, source
build and source distribution versions.
Reported by Michael Wang <mwang at mindspring.com> and
Kevin Moran <gridplan at yahoo.com>
Revision Changes Path
1.12 +67 -25 jakarta-slide/src/webdav/client/bin/run.bat
Index: run.bat
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/bin/run.bat,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- run.bat 17 Jul 2002 21:22:16 -0000 1.11
+++ run.bat 24 Nov 2002 18:18:55 -0000 1.12
@@ -6,40 +6,82 @@
rem ---------------------------------------------------------------------------
set _SLIDE_HOME=%SLIDE_HOME%
-if not "%SLIDE_HOME%" == "" goto gotHome
+set CP=%CLASSPATH%
+set CP=%CP%;.\classes\;..\classes
+
+if "%SLIDE_HOME%" == "" goto getHome
+else goto gotHome
+
+:getHome
+set SLIDE_HOME=.
+if exist "%SLIDE_HOME%\client\lib\slide-client.jar" goto binaryDist
+set SLIDE_HOME=..
+if exist "%SLIDE_HOME%\client\lib\slide-client.jar" goto binaryDist
+set SLIDE_HOME=..\..
+if exist "%SLIDE_HOME%\client\lib\slide-client.jar" goto binaryDist
+set SLIDE_HOME=..\..\..
+if exist "%SLIDE_HOME%\client\lib\slide-client.jar" goto binaryDist
+set SLIDE_HOME=..\..\..\..
+if exist "%SLIDE_HOME%\client\lib\slide-client.jar" goto binaryDist
+set SLIDE_HOME=.
+if exist "%SLIDE_HOME%\dist\client\lib\slide-client.jar" goto sourceDist
+set SLIDE_HOME=..
+if exist "%SLIDE_HOME%\dist\client\lib\slide-client.jar" goto sourceDist
+set SLIDE_HOME=..\..
+if exist "%SLIDE_HOME%\dist\client\lib\slide-client.jar" goto sourceDist
+set SLIDE_HOME=..\..\..
+if exist "%SLIDE_HOME%\dist\client\lib\slide-client.jar" goto sourceDist
+set SLIDE_HOME=..\..\..\..
+if exist "%SLIDE_HOME%\dist\client\lib\slide-client.jar" goto sourceDist
set SLIDE_HOME=.
-if exist "%SLIDE_HOME%\lib\slide-client.jar" goto gotHome
+if exist "%SLIDE_HOME%\build\client\lib\slide-client.jar" goto sourceBuild
set SLIDE_HOME=..
-if exist "%SLIDE_HOME%\lib\slide-client.jar" goto gotHome
+if exist "%SLIDE_HOME%\build\client\lib\slide-client.jar" goto sourceBuild
+set SLIDE_HOME=..\..
+if exist "%SLIDE_HOME%\build\cleint\lib\slide-client.jar" goto sourceBuild
+set SLIDE_HOME=..\..\..
+if exist "%SLIDE_HOME%\build\cleint\lib\slide-client.jar" goto sourceBuild
+set SLIDE_HOME=..\..\..\..
+if exist "%SLIDE_HOME%\build\cleint\lib\slide-client.jar" goto sourceBuild
+:unableTo
echo Unable to determine the value of SLIDE_HOME
goto cleanup
:gotHome
-set MAINCLASS=org.apache.webdav.cmd.Slide
-set CP=%CLASSPATH%
-set CP=%CP%;./classes/;../classes/
+if not exist "%SLIDE_HOME%\client\lib\slide-client.jar" goto getHome
+
+:binaryDist
rem It's for the Slide binary distribution
-set CP=%CP%;%SLIDE_HOME%/client/lib/slide-client.jar
-set CP=%CP%;%SLIDE_HOME%/client/lib/slide-webdavlib.jar
-set CP=%CP%;%SLIDE_HOME%/client/lib/commons-httpclient.jar
-set CP=%CP%;%SLIDE_HOME%/client/lib/antlr.jar
-set CP=%CP%;%SLIDE_HOME%/client/lib/jaxp.jar
-set CP=%CP%;%SLIDE_HOME%/client/lib/crimson.jar
+set CP=%CP%;%SLIDE_HOME%\client\lib\slide-client.jar
+set CP=%CP%;%SLIDE_HOME%\client\lib\slide-webdavlib.jar
+set CP=%CP%;%SLIDE_HOME%\client\lib\commons-httpclient.jar
+set CP=%CP%;%SLIDE_HOME%\client\lib\antlr.jar
+set CP=%CP%;%SLIDE_HOME%\client\lib\jaxp.jar
+set CP=%CP%;%SLIDE_HOME%\client\lib\crimson.jar
+goto execution
+
+:sourceDist
rem It's for distribution from the Slide sources
-set CP=%CP%;%SLIDE_HOME%/dist/client/lib/slide-client.jar
-set CP=%CP%;%SLIDE_HOME%/dist/client/lib/slide-webdavlib.jar
-set CP=%CP%;%SLIDE_HOME%/dist/client/lib/commons-httpclient.jar
-set CP=%CP%;%SLIDE_HOME%/dist/client/lib/antlr.jar
-set CP=%CP%;%SLIDE_HOME%/dist/client/lib/jaxp.jar
-set CP=%CP%;%SLIDE_HOME%/dist/client/lib/crimson.jar
+set CP=%CP%;%SLIDE_HOME%\dist\client\lib\slide-client.jar
+set CP=%CP%;%SLIDE_HOME%\dist\client\lib\slide-webdavlib.jar
+set CP=%CP%;%SLIDE_HOME%\dist\client\lib\commons-httpclient.jar
+set CP=%CP%;%SLIDE_HOME%\dist\client\lib\antlr.jar
+set CP=%CP%;%SLIDE_HOME%\dist\client\lib\jaxp.jar
+set CP=%CP%;%SLIDE_HOME%\dist\client\lib\crimson.jar
+goto execution
+
+:sourceBuild
rem It's for build from the Slide sources
-set CP=%CP%;%SLIDE_HOME%/build/client/lib/slide-client.jar
-set CP=%CP%;%SLIDE_HOME%/build/client/lib/slide-webdavlib.jar
-set CP=%CP%;%SLIDE_HOME%/build/client/lib/commons-httpclient.jar
-set CP=%CP%;%SLIDE_HOME%/build/client/lib/antlr.jar
-set CP=%CP%;%SLIDE_HOME%/build/client/lib/jaxp.jar
-set CP=%CP%;%SLIDE_HOME%/build/client/lib/crimson.jar
+set CP=%CP%;%SLIDE_HOME%\build\client\lib\slide-client.jar
+set CP=%CP%;%SLIDE_HOME%\build\client\lib\slide-webdavlib.jar
+set CP=%CP%;%SLIDE_HOME%\build\client\lib\commons-httpclient.jar
+set CP=%CP%;%SLIDE_HOME%\build\client\lib\antlr.jar
+set CP=%CP%;%SLIDE_HOME%\build\client\lib\jaxp.jar
+set CP=%CP%;%SLIDE_HOME%\build\client\lib\crimson.jar
+goto execution
+:execution
+set MAINCLASS=org.apache.webdav.cmd.Slide
java -classpath %CP% %MAINCLASS% %1 %2 %3 %4 %5 %6 %7 %8 %9
:cleanup
1.11 +83 -32 jakarta-slide/src/webdav/client/bin/run.sh
Index: run.sh
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/bin/run.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- run.sh 17 Jul 2002 21:22:16 -0000 1.10
+++ run.sh 24 Nov 2002 18:18:55 -0000 1.11
@@ -5,42 +5,93 @@
# $Id$
# ---------------------------------------------------------------------------
-if [ "${SLIDE_HOME}" == "" ] ; then
- SLIDE_HOME=.
- if [ ! -f ${SLIDE_HOME}/lib/slide-client.jar ] ; then
- SLIDE_HOME=..
- fi
+if [ -z "${SLIDE_HOME}" ] ; then
+ SLIDE_HOME=.
+ if [ ! -f ${SLIDE_HOME}/client/lib/slide-client.jar ] ; then
+ if [ ! -f ${SLIDE_HOME}/dist/client/lib/slide-client.jar ] ; then
+ if [ ! -d ${SLIDE_HOME}/build/client/classes ] ; then
+ SLIDE_HOME=..
+ fi
+ fi
+ fi
+ if [ ! -f ${SLIDE_HOME}/client/lib/slide-client.jar ] ; then
+ if [ ! -f ${SLIDE_HOME}/dist/client/lib/slide-client.jar ] ; then
+ if [ ! -d ${SLIDE_HOME}/build/client/classes ] ; then
+ SLIDE_HOME=../..
+ fi
+ fi
+ fi
+ if [ ! -f ${SLIDE_HOME}/client/lib/slide-client.jar ] ; then
+ if [ ! -f ${SLIDE_HOME}/dist/client/lib/slide-client.jar ] ; then
+ if [ ! -d ${SLIDE_HOME}/build/client/classes ] ; then
+ SLIDE_HOME=../../..
+ fi
+ fi
+ fi
+ if [ ! -f ${SLIDE_HOME}/client/lib/slide-client.jar ] ; then
+ if [ ! -f ${SLIDE_HOME}/dist/client/lib/slide-client.jar ] ; then
+ if [ ! -d ${SLIDE_HOME}/build/client/classes ] ; then
+ SLIDE_HOME=../../../..
+ fi
+ fi
+ fi
fi
-if [ ! -f ${SLIDE_HOME}/lib/slide-client.jar ] ; then
- echo Unable to determine the value of SLIDE_HOME
- exit 1
+if [ ! -f ${SLIDE_HOME}/client/lib/slide-client.jar ] ; then
+ if [ ! -f ${SLIDE_HOME}/dist/client/lib/slide-client.jar ] ; then
+ if [ ! -d ${SLIDE_HOME}/build/client/classes ] ; then
+ echo Unable to determine the value of SLIDE_HOME
+ exit 1
+ fi
+ fi
+ fi
fi
-MAINCLASS=org.apache.webdav.cmd.Slide
+# consider classpath for the both source and binary distribution
CP=${CLASSPATH}
-CP=${CP}:./classes/:../classes/
-# It's for the Slide binary distribution
-CP=${CP}:${SLIDE_HOME}/client/lib/slide-client.jar
-CP=${CP}:${SLIDE_HOME}/client/lib/slide-webdavlib.jar
-CP=${CP}:${SLIDE_HOME}/client/lib/commons-httpclient.jar
-CP=${CP}:${SLIDE_HOME}/client/lib/antlr.jar
-CP=${CP}:${SLIDE_HOME}/client/lib/jaxp.jar
-CP=${CP}:${SLIDE_HOME}/client/lib/crimson.jar
-# It's for distribution from the Slide sources
-CP=${CP}:${SLIDE_HOME}/dist/client/lib/slide-client.jar
-CP=${CP}:${SLIDE_HOME}/dist/client/lib/slide-webdavlib.jar
-CP=${CP}:${SLIDE_HOME}/dist/client/lib/commons-httpclient.jar
-CP=${CP}:${SLIDE_HOME}/dist/client/lib/antlr.jar
-CP=${CP}:${SLIDE_HOME}/dist/client/lib/jaxp.jar
-CP=${CP}:${SLIDE_HOME}/dist/client/lib/crimson.jar
-# It's for build from the Slide sources
-CP=${CP}:${SLIDE_HOME}/build/client/lib/slide-client.jar
-CP=${CP}:${SLIDE_HOME}/build/client/lib/slide-webdavlib.jar
-CP=${CP}:${SLIDE_HOME}/build/client/lib/commons-httpclient.jar
-CP=${CP}:${SLIDE_HOME}/build/client/lib/antlr.jar
-CP=${CP}:${SLIDE_HOME}/build/client/lib/jaxp.jar
-CP=${CP}:${SLIDE_HOME}/build/client/lib/crimson.jar
+CP=${CP}:./classes:../classes
+
+if [ -d ${SLIDE_HOME}/classes ] ; then
+ CP=${CP}:${SLIDE_HOME}/classes
+ CP=${CP}:${SLIDE_HOME}/client/classes
+elif [ -d ${SLIDE_HOME}/dist/classes ] ; then
+ CP=${CP}:${SLIDE_HOME}/dist/classes
+ CP=${CP}:${SLIDE_HOME}/dist/client/classes
+elif [ -d ${SLIDE_HOME}/build/classes ] ; then
+ CP=${CP}:${SLIDE_HOME}/build/classes
+ CP=${CP}:${SLIDE_HOME}/build/client/classes
+fi
+if [ -f ${SLIDE_HOME}/client/lib/slide-client.jar ] ; then
+ CP=${CP}:${SLIDE_HOME}/client/lib/slide-client.jar
+ CP=${CP}:${SLIDE_HOME}/client/lib/slide-webdavlib.jar
+ CP=${CP}:${SLIDE_HOME}/client/lib/commons-httpclient.jar
+ CP=${CP}:${SLIDE_HOME}/client/lib/antlr.jar
+ CP=${CP}:${SLIDE_HOME}/client/lib/jaxp.jar
+ CP=${CP}:${SLIDE_HOME}/client/lib/crimson.jar
+elif [ -f ${SLIDE_HOME}/dist/client/lib/slide-client.jar ] ; then
+ CP=${CP}:${SLIDE_HOME}/dist/client/lib/slide-client.jar
+ CP=${CP}:${SLIDE_HOME}/dist/client/lib/slide-webdavlib.jar
+ CP=${CP}:${SLIDE_HOME}/dist/client/lib/commons-httpclient.jar
+ CP=${CP}:${SLIDE_HOME}/dist/client/lib/antlr.jar
+ CP=${CP}:${SLIDE_HOME}/dist/client/lib/jaxp.jar
+ CP=${CP}:${SLIDE_HOME}/dist/client/lib/crimson.jar
+elif [ -f ${SLIDE_HOME}/build/lib/slide-client.jar ] ; then
+ CP=${CP}:${SLIDE_HOME}/build/lib/slide-client.jar
+ CP=${CP}:${SLIDE_HOME}/build/lib/slide-webdavlib.jar
+ CP=${CP}:${SLIDE_HOME}/build/lib/slide-client.jar
+ CP=${CP}:${SLIDE_HOME}/build/lib/antlr.jar
+ CP=${CP}:${SLIDE_HOME}/build/lib/jaxp.jar
+ CP=${CP}:${SLIDE_HOME}/build/lib/crimson.jar
+elif [ -f ${SLIDE_HOME}/lib/slide-client.jar ] ; then
+ CP=${CP}:${SLIDE_HOME}/lib/slide-client.jar
+ CP=${CP}:${SLIDE_HOME}/lib/slide-webdavlib.jar
+ CP=${CP}:${SLIDE_HOME}/lib/slide-client.jar
+ CP=${CP}:${SLIDE_HOME}/lib/antlr.jar
+ CP=${CP}:${SLIDE_HOME}/lib/jaxp.jar
+ CP=${CP}:${SLIDE_HOME}/lib/crimson.jar
+fi
+
+MAINCLASS=org.apache.webdav.cmd.Slide
java -classpath ${CP} ${MAINCLASS} $*
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
Re: cvs commit: jakarta-slide/src/webdav/client/bin run.bat run.sh
Posted by Sung-Gu <je...@apache.org>.
As following your comment, I fixed the execution files.
I think most system would support the traditional Borne shell.
So I made on it. But it seems not to work on cygwin... :(
If you have time, could you please look into it?
Sung-Gu
----- Original Message -----
From: <je...@apache.org>
To: <ja...@apache.org>
Sent: Monday, November 25, 2002 3:18 AM
Subject: cvs commit: jakarta-slide/src/webdav/client/bin run.bat run.sh
> jericho 2002/11/24 10:18:55
>
> Modified: src/webdav/client/bin run.bat run.sh
> Log:
> - Support to set the classpath for the binary distribution, source
> build and source distribution versions.
>
> Reported by Michael Wang <mwang at mindspring.com> and
> Kevin Moran <gridplan at yahoo.com>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>